diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2008-10-26 20:09:54 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-10-26 20:09:54 +0000 |
| commit | 812ecb21c3eb5c2c6af4257af5a2d3e81022cbdf (patch) | |
| tree | d0d0f7524c558586feb29a986a9fcb58cfda07f5 /gtk | |
| parent | f47b6450082a41264811a52db4405f78df08f17c (diff) | |
Tweak Mac IGE integration detection so that it can find the functions not
only in the Gtk+ OS X framework, but also in the separate igemacintegration
library. Also add call to ite_mac_menu_set_menu_bar() to synchronize the
OS X menu bar with the Gtk menu bar in Wireshark. The Gtk menu bar in
Wireshark will remain there.
svn path=/trunk/; revision=26560
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/main_menu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gtk/main_menu.c b/gtk/main_menu.c index bc62754977..cde567d31b 100644 --- a/gtk/main_menu.c +++ b/gtk/main_menu.c @@ -90,6 +90,9 @@ #include "gtk/main_toolbar.h" #include "gtk/main_welcome.h" +#ifdef HAVE_IGE_MAC_INTEGRATION +#include <igemacintegration/ige-mac-menu.h> +#endif typedef struct _menu_item { char *name; @@ -1047,6 +1050,10 @@ main_menu_new(GtkAccelGroup ** table) { if (table) *table = grp; +#ifdef HAVE_IGE_MAC_INTEGRATION + ige_mac_menu_set_menu_bar(GTK_MENU_SHELL(menubar)); +#endif + return menubar; } |