diff options
| author | JiHO <jiho-sf@users.sourceforge.net> | 2008-01-10 23:25:07 +0000 |
|---|---|---|
| committer | jiho-sf <jiho-sf@users.sourceforge.net> | 2008-01-10 23:25:07 +0000 |
| commit | 495928a26342a8e40f938113e376cf5da110738c (patch) | |
| tree | e345a3dc1733112f9a1e1ed00d09adb6c5d41eac /src/interface.cpp | |
| parent | Fix for Bug #181663 (Font style errors / assert when changing style) (diff) | |
| download | inkscape-495928a26342a8e40f938113e376cf5da110738c.tar.gz inkscape-495928a26342a8e40f938113e376cf5da110738c.zip | |
Added part of a patch by Adam Strzelecki which makes GTK menu migrate to OS X menubar when GTK+quartz is used. This is taken from Gimp and should be safe enough at this stage since it really only affects OS X.
(bzr r4454)
Diffstat (limited to 'src/interface.cpp')
| -rw-r--r-- | src/interface.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/interface.cpp b/src/interface.cpp index f7a2bc47f..fbd57cdab 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -68,6 +68,11 @@ #include "event-context.h" #include "gradient-drag.h" +// Include Mac OS X menu synchronization on native OSX build +#ifdef GDK_WINDOWING_QUARTZ +#include "ige-mac-menu.h" +#endif + using Inkscape::IO::StringOutputStream; using Inkscape::IO::Base64OutputStream; @@ -945,9 +950,17 @@ sp_ui_main_menubar(Inkscape::UI::View::View *view) { GtkWidget *mbar = gtk_menu_bar_new(); +#ifdef GDK_WINDOWING_QUARTZ + ige_mac_menu_set_menu_bar(GTK_MENU_SHELL(mbar)); +#endif + sp_ui_build_dyn_menus(inkscape_get_menus(INKSCAPE), mbar, view); +#ifdef GDK_WINDOWING_QUARTZ + return NULL; +#else return mbar; +#endif } static void leave_group(GtkMenuItem *, SPDesktop *desktop) { |