diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2003-11-16 16:05:24 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2003-11-16 16:05:24 +0000 |
| commit | 810f2256ba03de93679ae73c02512f0da0fd1c7b (patch) | |
| tree | 7d140900a63b082cbfb00d296c3b5eb30e398080 /src/xmenu.c | |
| parent | 0bdd0f79978c5f7e6a94cde0e5fc94040de3ca66 (diff) | |
| download | emacs-810f2256ba03de93679ae73c02512f0da0fd1c7b.tar.gz | |
Implement multiple display handling for GTK.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 14f7485759b..3e99a1c506d 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -610,7 +610,7 @@ single_menu_item (key, item, dummy, skp_v) #endif /* not HAVE_BOXES */ #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) - if (!NILP(map)) + if (!NILP (map)) /* Indicate visually that this is a submenu. */ item_string = concat2 (item_string, build_string (" >")); #endif @@ -696,7 +696,7 @@ list_of_items (pane) the scroll bar or the edit window. Fx_popup_menu needs to be sure it is the edit window. */ static void -mouse_position_for_popup(f, x, y) +mouse_position_for_popup (f, x, y) FRAME_PTR f; int *x; int *y; @@ -1217,7 +1217,8 @@ x_activate_menubar (f) return; #ifdef USE_GTK - if (! xg_win_to_widget (f->output_data.x->saved_menu_event->xany.window)) + if (! xg_win_to_widget (FRAME_X_DISPLAY (f), + f->output_data.x->saved_menu_event->xany.window)) return; #endif |