diff options
| author | Dan Nicolaescu | 2010-07-03 22:57:11 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-03 22:57:11 -0700 |
| commit | b782e2d7f36a742156e5b13d43efdcf620356bc0 (patch) | |
| tree | 2c34b178184f880183bf64db7553be73c2c1c8e7 /oldXMenu/Activate.c | |
| parent | c3174d16e2a91d19313afd8109c31ad8695a87c6 (diff) | |
| download | emacs-b782e2d7f36a742156e5b13d43efdcf620356bc0.tar.gz emacs-b782e2d7f36a742156e5b13d43efdcf620356bc0.zip | |
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.c | 27 |
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/>. */ | |||
| 103 | /* For debug, set this to 0 to not grab the keyboard on menu popup */ | 103 | /* For debug, set this to 0 to not grab the keyboard on menu popup */ |
| 104 | int x_menu_grab_keyboard = 1; | 104 | int x_menu_grab_keyboard = 1; |
| 105 | 105 | ||
| 106 | typedef void (*Wait_func)(); | ||
| 107 | |||
| 108 | static Wait_func wait_func; | 106 | static Wait_func wait_func; |
| 109 | static void* wait_data; | 107 | static void* wait_data; |
| 110 | 108 | ||
| 111 | void | 109 | void |
| 112 | XMenuActivateSetWaitFunction (func, data) | 110 | XMenuActivateSetWaitFunction (Wait_func func, void *data) |
| 113 | Wait_func func; | ||
| 114 | void *data; | ||
| 115 | { | 111 | { |
| 116 | wait_func = func; | 112 | wait_func = func; |
| 117 | wait_data = data; | 113 | wait_data = data; |
| 118 | } | 114 | } |
| 119 | 115 | ||
| 120 | int | 116 | int |
| 121 | XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data, | 117 | XMenuActivate( |
| 122 | help_callback) | 118 | register Display *display, /* Display to put menu on. */ |
| 123 | register Display *display; /* Display to put menu on. */ | 119 | register XMenu *menu, /* Menu to activate. */ |
| 124 | register XMenu *menu; /* Menu to activate. */ | 120 | int *p_num, /* Pane number selected. */ |
| 125 | int *p_num; /* Pane number selected. */ | 121 | int *s_num, /* Selection number selected. */ |
| 126 | int *s_num; /* Selection number selected. */ | 122 | int x_pos, /* X coordinate of menu position. */ |
| 127 | int x_pos; /* X coordinate of menu position. */ | 123 | int y_pos, /* Y coordinate of menu position. */ |
| 128 | int y_pos; /* Y coordinate of menu position. */ | 124 | unsigned int event_mask, /* Mouse button event mask. */ |
| 129 | unsigned int event_mask; /* Mouse button event mask. */ | 125 | char **data, /* Pointer to return data value. */ |
| 130 | char **data; /* Pointer to return data value. */ | 126 | void (* help_callback) (char *, int, int)) /* Help callback. */ |
| 131 | void (* help_callback) (); /* Help callback. */ | ||
| 132 | { | 127 | { |
| 133 | int status; /* X routine call status. */ | 128 | int status; /* X routine call status. */ |
| 134 | int orig_x; /* Upper left menu origin X coord. */ | 129 | int orig_x; /* Upper left menu origin X coord. */ |