summaryrefslogtreecommitdiff
path: root/oldXMenu/Activate.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-07-03 22:57:11 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-07-03 22:57:11 -0700
commitb782e2d7f36a742156e5b13d43efdcf620356bc0 (patch)
tree2c34b178184f880183bf64db7553be73c2c1c8e7 /oldXMenu/Activate.c
parentc3174d16e2a91d19313afd8109c31ad8695a87c6 (diff)
downloademacs-b782e2d7f36a742156e5b13d43efdcf620356bc0.tar.gz
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.
Diffstat (limited to 'oldXMenu/Activate.c')
-rw-r--r--oldXMenu/Activate.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 2e1996e7287..55bfca510b9 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -103,32 +103,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* 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. */