diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-03 07:29:03 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-03 07:29:03 +0400 |
| commit | a10c82694e253f891cdfa220ba75b59f5ed50ab3 (patch) | |
| tree | 3dcdc0400f8fa190ac1e2408c38bb2b4e82f52ff /src/menu.c | |
| parent | 0372256bed8f8c1372579001ba42b21dbe5d2adb (diff) | |
| download | emacs-a10c82694e253f891cdfa220ba75b59f5ed50ab3.tar.gz | |
Drop FRAME_PTR typedef.
* composite.c, font.c, font.h, fontset.c, fontset.h, frame.c, frame.h:
* ftfont.c, ftxfont.c, gtkutil.c, gtkutil.h, image.c, keyboard.c:
* menu.c, menu.h, msdos.c, nsfns.m, nsfont.m, nsmenu.m, nsterm.h:
* nsterm.m, scroll.c, term.c, w32fns.c, w32font.c, w32font.h:
* w32inevt.c, w32inevt.h, w32menu.c, w32notify.c, w32term.c, w32term.h:
* w32uniscribe.c, w32xfns.c, widget.c, window.c, xdisp.c, xfaces.c:
* xfns.c, xfont.c, xftfont.c, xmenu.c, xselect.c, xterm.c:
All related users changed.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/menu.c b/src/menu.c index 6b4a22d3052..6fce5b91caf 100644 --- a/src/menu.c +++ b/src/menu.c @@ -867,7 +867,8 @@ update_submenu_strings (widget_value *first_wv) VECTOR is an array of menu events for the whole menu. */ void -find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object vector, void *client_data) +find_and_call_menu_selection (struct frame *f, int menu_bar_items_used, + Lisp_Object vector, void *client_data) { Lisp_Object prefix, entry; Lisp_Object *subprefix_stack; @@ -950,7 +951,7 @@ find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object /* As above, but return the menu selection instead of storing in kb buffer. If KEYMAPS, return full prefixes to selection. */ Lisp_Object -find_and_return_menu_selection (FRAME_PTR f, bool keymaps, void *client_data) +find_and_return_menu_selection (struct frame *f, bool keymaps, void *client_data) { Lisp_Object prefix, entry; int i; @@ -1060,7 +1061,7 @@ no quit occurs and `x-popup-menu' returns nil. */) Lisp_Object title; const char *error_name = NULL; Lisp_Object selection = Qnil; - FRAME_PTR f = NULL; + struct frame *f = NULL; Lisp_Object x, y, window; bool keymaps = 0; bool for_click = 0; @@ -1116,7 +1117,7 @@ no quit occurs and `x-popup-menu' returns nil. */) if (get_current_pos_p) { /* Use the mouse's current position. */ - FRAME_PTR new_f = SELECTED_FRAME (); + struct frame *new_f = SELECTED_FRAME (); #ifdef HAVE_X_WINDOWS /* Can't use mouse_position_hook for X since it returns coordinates relative to the window the mouse is in, |