diff oldXMenu/Activate.c @ 109124:5cc91198ffb2

Convert function definitions in oldXMenu to standard C. * oldXMenu/Activate.c: Convert function definitions to standard C. * oldXMenu/AddPane.c: * oldXMenu/AddSel.c: * oldXMenu/ChgPane.c: * oldXMenu/ChgSel.c: * oldXMenu/Create.c: * oldXMenu/DelPane.c: * oldXMenu/DelSel.c: * oldXMenu/Destroy.c: * oldXMenu/Error.c: * oldXMenu/EvHand.c: * oldXMenu/FindPane.c: * oldXMenu/FindSel.c: * oldXMenu/InsPane.c: * oldXMenu/InsSel.c: * oldXMenu/Internal.c: * oldXMenu/Locate.c: * oldXMenu/Post.c: * oldXMenu/Recomp.c: * oldXMenu/SetAEQ.c: * oldXMenu/SetFrz.c: * oldXMenu/SetPane.c: * oldXMenu/SetSel.c: * oldXMenu/X10.h: * oldXMenu/XCrAssoc.c: * oldXMenu/XDelAssoc.c: * oldXMenu/XDestAssoc.c: * oldXMenu/XLookAssoc.c: * oldXMenu/XMakeAssoc.c: * oldXMenu/XMenu.h: * oldXMenu/XMenuInt.h: * oldXMenu/insque.c: Likewise.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 03 Jul 2010 22:57:11 -0700
parents 1d1d5d9bd884
children 417b1e4d63cd
line wrap: on
line diff
--- a/oldXMenu/Activate.c	Sat Jul 03 22:47:55 2010 -0700
+++ b/oldXMenu/Activate.c	Sat Jul 03 22:57:11 2010 -0700
@@ -103,32 +103,27 @@
 /* For debug, set this to 0 to not grab the keyboard on menu popup */
 int x_menu_grab_keyboard = 1;
 
-typedef void (*Wait_func)();
-
 static Wait_func wait_func;
 static void* wait_data;
 
 void
-XMenuActivateSetWaitFunction (func, data)
-     Wait_func func;
-     void *data;
+XMenuActivateSetWaitFunction (Wait_func func, void *data)
 {
   wait_func = func;
   wait_data = data;
 }
 
 int
-XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
-	      help_callback)
-    register Display *display;		/* Display to put menu on. */
-    register XMenu *menu;		/* Menu to activate. */
-    int *p_num;				/* Pane number selected. */
-    int *s_num;				/* Selection number selected. */
-    int x_pos;				/* X coordinate of menu position. */
-    int y_pos;				/* Y coordinate of menu position. */
-    unsigned int event_mask;		/* Mouse button event mask. */
-    char **data;			/* Pointer to return data value. */
-    void (* help_callback) ();		/* Help callback.  */
+XMenuActivate(
+    register Display *display,		/* Display to put menu on. */
+    register XMenu *menu,		/* Menu to activate. */
+    int *p_num,				/* Pane number selected. */
+    int *s_num,				/* Selection number selected. */
+    int x_pos,				/* X coordinate of menu position. */
+    int y_pos,				/* Y coordinate of menu position. */
+    unsigned int event_mask,		/* Mouse button event mask. */
+    char **data,			/* Pointer to return data value. */
+    void (* help_callback) (char *, int, int)) /* Help callback.  */
 {
     int status;				/* X routine call status. */
     int orig_x;				/* Upper left menu origin X coord. */