diff options
| author | Josh Andler <scislac@gmail.com> | 2012-02-08 01:31:52 +0000 |
|---|---|---|
| committer | Josh Andler <scislac@gmail.com> | 2012-02-08 01:31:52 +0000 |
| commit | 5b54070a4238ab276272709794838028a464cf3c (patch) | |
| tree | f5c378bf00c44e7cf916ee5d675fc822d6feb95b /src/widgets/desktop-widget.cpp | |
| parent | add missing files in cmake (diff) | |
| download | inkscape-5b54070a4238ab276272709794838028a464cf3c.tar.gz inkscape-5b54070a4238ab276272709794838028a464cf3c.zip | |
Patch from lp 721448 to make OSX Aqua builds more stable
(bzr r10950)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 1b5912196..725277a55 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1277,13 +1277,11 @@ void SPDesktopWidget::layoutWidgets() pref_root = "/window/"; } -#ifndef GDK_WINDOWING_QUARTZ if (!prefs->getBool(pref_root + "menu/state", true)) { gtk_widget_hide (dtw->menubar); } else { gtk_widget_show_all (dtw->menubar); } -#endif if (!prefs->getBool(pref_root + "commands/state", true)) { gtk_widget_hide (dtw->commands_toolbox); @@ -1478,10 +1476,8 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview) dtw->layer_selector->setDesktop(dtw->desktop); dtw->menubar = sp_ui_main_menubar (dtw->desktop); -#ifndef GDK_WINDOWING_QUARTZ gtk_widget_show_all (dtw->menubar); gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0); -#endif dtw->layoutWidgets(); |