diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-19 13:58:54 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-01-19 13:58:54 +0000 |
| commit | 199c3dd0acac8c7a7cc835067e07ad6c4c069015 (patch) | |
| tree | cf6f24a57943858136ffc41366de6502d28c9d65 /src/inkscape-application.cpp | |
| parent | derive all toolbars from Inkscape::Toolbar (diff) | |
| parent | Disable app menu (deprecated in GTK 3.32). (diff) | |
| download | inkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.tar.gz inkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/inkscape-application.cpp')
| -rw-r--r-- | src/inkscape-application.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/inkscape-application.cpp b/src/inkscape-application.cpp index 54deedbbc..ec7ab7826 100644 --- a/src/inkscape-application.cpp +++ b/src/inkscape-application.cpp @@ -197,6 +197,8 @@ ConcreteInkscapeApplication<Gtk::Application>::on_startup2() Inkscape::UI::Widget::Panel::prep(); // ========================= Builder ========================== + // App menus deprecated in 3.32. This whole block of code should be + // removed after confirming this code isn't required. _builder = Gtk::Builder::create(); Glib::ustring app_builder_file = get_filename(UIS, "inkscape-application.xml"); @@ -215,7 +217,7 @@ ConcreteInkscapeApplication<Gtk::Application>::on_startup2() if (!menu) { std::cerr << "InkscapeApplication: failed to load application menu!" << std::endl; } else { - set_app_menu(menu); + // set_app_menu(menu); } } @@ -340,9 +342,6 @@ ConcreteInkscapeApplication<Gtk::Application>::create_window(const Glib::RefPtr< _active_document = desktop->getDocument(); // _documents.push_back(desktop->getDocument()); - // Add Gtk::Window to app window list. - add_window(*desktop->getToplevel()); - return (desktop); // Temp: Need to track desktop for shell mode. } |