diff options
| author | Milosz Derezynski <mderezynski@gmail.com> | 2009-02-06 01:36:23 +0000 |
|---|---|---|
| committer | miloszd <miloszd@users.sourceforge.net> | 2009-02-06 01:36:23 +0000 |
| commit | 889c579d3ecfe147457b65d73095f64cb23428e0 (patch) | |
| tree | 656ba528909c5e11bdf90f0cf01da860db755fd2 /src/widgets/desktop-widget.cpp | |
| parent | utility script for producing a swatchbook of all filters (diff) | |
| download | inkscape-889c579d3ecfe147457b65d73095f64cb23428e0.tar.gz inkscape-889c579d3ecfe147457b65d73095f64cb23428e0.zip | |
* src/widgets/desktop-widget.cpp: Minor fix for OS X menubar: Don't try to access NULL GtkWidget pointer
(bzr r7235)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index a64d53bb6..0751e5783 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1202,11 +1202,13 @@ sp_desktop_widget_layout (SPDesktopWidget *dtw) pref_root = "/window/"; } +#ifndef GDK_WINDOWING_QUARTZ if (!prefs->getBool(pref_root + "menu/state", true)) { gtk_widget_hide_all (dtw->menubar); } else { gtk_widget_show_all (dtw->menubar); } +#endif if (!prefs->getBool(pref_root + "commands/state", true)) { gtk_widget_hide_all (dtw->commands_toolbox); @@ -1318,7 +1320,7 @@ SPDesktopWidget::isToolboxButtonActive (const gchar* id) SPViewWidget * sp_desktop_widget_new (SPNamedView *namedview) { - SPDesktopWidget *dtw = (SPDesktopWidget*)gtk_type_new (SP_TYPE_DESKTOP_WIDGET); + SPDesktopWidget *dtw = (SPDesktopWidget*)g_object_new(SP_TYPE_DESKTOP_WIDGET, NULL); dtw->dt2r = 1.0 / namedview->doc_units->unittobase; @@ -1347,8 +1349,10 @@ sp_desktop_widget_new (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 sp_desktop_widget_layout (dtw); |