diff options
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 3d76070c336..cbb5a3dc77e 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1411,11 +1411,9 @@ popup_selection_callback (GtkWidget *widget, gpointer client_data) static Lisp_Object pop_down_menu (Lisp_Object arg) { - struct Lisp_Save_Value *p = XSAVE_VALUE (arg); - popup_activated_flag = 0; block_input (); - gtk_widget_destroy (GTK_WIDGET (p->pointer)); + gtk_widget_destroy (GTK_WIDGET (XSAVE_POINTER (arg))); unblock_input (); return Qnil; } @@ -1612,11 +1610,7 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, static Lisp_Object cleanup_widget_value_tree (Lisp_Object arg) { - struct Lisp_Save_Value *p = XSAVE_VALUE (arg); - widget_value *wv = p->pointer; - - free_menubar_widget_value_tree (wv); - + free_menubar_widget_value_tree ((widget_value *) XSAVE_POINTER (arg)); return Qnil; } @@ -2242,11 +2236,8 @@ menu_help_callback (char const *help_string, int pane, int item) static Lisp_Object pop_down_menu (Lisp_Object arg) { - struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg)); - struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg)); - - FRAME_PTR f = p1->pointer; - XMenu *menu = p2->pointer; + FRAME_PTR f = XSAVE_POINTER (Fcar (arg)); + XMenu *menu = XSAVE_POINTER (Fcdr (arg)); block_input (); #ifndef MSDOS |