diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2019-01-28 09:47:07 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2019-01-28 09:47:07 +0000 |
| commit | 6fb9157a3390c06ff8e1fc7fb04cc29042eb81b8 (patch) | |
| tree | 7001f01d2c4fdccca837b65bbc8eca1ea41cd775 /src | |
| parent | Format stilyng for icons section in preferences (diff) | |
| download | inkscape-6fb9157a3390c06ff8e1fc7fb04cc29042eb81b8.tar.gz inkscape-6fb9157a3390c06ff8e1fc7fb04cc29042eb81b8.zip | |
Temporary fix for crash on quit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/inkscape-window.cpp | 8 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 9 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.h | 1 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp index 08e8407c9..bf2213a88 100644 --- a/src/inkscape-window.cpp +++ b/src/inkscape-window.cpp @@ -68,15 +68,15 @@ InkscapeWindow::InkscapeWindow(SPDocument* document) _desktop = _desktop_widget->desktop; // Menu bar (must come after desktop widget creation as we need _desktop) - _menubar = build_menubar(_desktop); - _menubar->set_name("MenuBar"); - _menubar->show_all(); + // _menubar = build_menubar(_desktop); + // _menubar->set_name("MenuBar"); + // _menubar->show_all(); // Pallet // Status bar - _mainbox->pack_start(*_menubar, false, false); + // _mainbox->pack_start(*_menubar, false, false); gtk_box_pack_start(GTK_BOX(_mainbox->gobj()), GTK_WIDGET(_desktop_widget), true, true, 0); // Can't use Glib::wrap() // ================== Callbacks ================== diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index aa29294f5..f629c89f7 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -66,6 +66,9 @@ #include "ui/widget/selected-style.h" #include "ui/widget/unit-tracker.h" +// TEMP +#include "ui/desktop/menubar.h" + #include "util/ege-appear-time-tracker.h" #include "util/units.h" @@ -1666,6 +1669,12 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPDocument *document) dtw->layer_selector->setDesktop(dtw->desktop); + // TEMP + dtw->_menubar = build_menubar(dtw->desktop); + dtw->_menubar->set_name("MenuBar"); + dtw->_menubar->show_all(); + dtw->_vbox->pack_start(*dtw->_menubar, false, false); + dtw->layoutWidgets(); std::vector<GtkWidget *> toolboxes; diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h index 5d1be6398..8c3ce12fe 100644 --- a/src/widgets/desktop-widget.h +++ b/src/widgets/desktop-widget.h @@ -98,6 +98,7 @@ private: Gtk::Box *_hbox; + Gtk::MenuBar *_menubar; // TEMP Gtk::Box *_statusbar; Inkscape::UI::Dialog::SwatchesPanel *_panels; |