/[emacs]/emacs/src/xmenu.c
ViewVC logotype

Diff of /emacs/src/xmenu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.283 by jhd, Thu Mar 24 18:53:43 2005 UTC revision 1.284 by ttn, Mon Apr 18 09:36:06 2005 UTC
# Line 2483  create_and_show_popup_menu (f, first_wv, Line 2483  create_and_show_popup_menu (f, first_wv,
2483          if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))          if (FRAME_X_DISPLAY_INFO (f)->grabbed & (1 << i))
2484            break;            break;
2485      }      }
2486      
2487    /* Display the menu.  */    /* Display the menu.  */
2488    gtk_widget_show_all (menu);    gtk_widget_show_all (menu);
2489    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);    gtk_menu_popup (GTK_MENU (menu), 0, 0, pos_func, &popup_x_y, i, 0);
# Line 2601  create_and_show_popup_menu (f, first_wv, Line 2601  create_and_show_popup_menu (f, first_wv,
2601    /* Display the menu.  */    /* Display the menu.  */
2602    lw_popup_menu (menu, (XEvent *) &dummy);    lw_popup_menu (menu, (XEvent *) &dummy);
2603    popup_activated_flag = 1;    popup_activated_flag = 1;
2604      
2605    {    {
2606      int fact = 4 * sizeof (LWLIB_ID);      int fact = 4 * sizeof (LWLIB_ID);
2607      int specpdl_count = SPECPDL_INDEX ();      int specpdl_count = SPECPDL_INDEX ();
# Line 3225  pop_down_menu (arg) Line 3225  pop_down_menu (arg)
3225  {  {
3226    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));    struct Lisp_Save_Value *p1 = XSAVE_VALUE (Fcar (arg));
3227    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));    struct Lisp_Save_Value *p2 = XSAVE_VALUE (Fcdr (arg));
3228      
3229    FRAME_PTR f = p1->pointer;    FRAME_PTR f = p1->pointer;
3230    XMenu *menu = p2->pointer;    XMenu *menu = p2->pointer;
3231    
# Line 3459  xmenu_show (f, x, y, for_click, keymaps, Line 3459  xmenu_show (f, x, y, for_click, keymaps,
3459  #ifndef MSDOS  #ifndef MSDOS
3460    XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f));    XMenuActivateSetWaitFunction (x_menu_wait_for_event, FRAME_X_DISPLAY (f));
3461  #endif  #endif
3462      
3463    record_unwind_protect (pop_down_menu,    record_unwind_protect (pop_down_menu,
3464                           Fcons (make_save_value (f, 0),                           Fcons (make_save_value (f, 0),
3465                                  make_save_value (menu, 0)));                                  make_save_value (menu, 0)));

Legend:
Removed from v.1.283  
changed lines
  Added in v.1.284

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26