summaryrefslogtreecommitdiffstats
path: root/src/inkscape-window.cpp
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2019-01-19 13:58:54 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2019-01-19 13:58:54 +0000
commit199c3dd0acac8c7a7cc835067e07ad6c4c069015 (patch)
treecf6f24a57943858136ffc41366de6502d28c9d65 /src/inkscape-window.cpp
parentderive all toolbars from Inkscape::Toolbar (diff)
parentDisable app menu (deprecated in GTK 3.32). (diff)
downloadinkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.tar.gz
inkscape-199c3dd0acac8c7a7cc835067e07ad6c4c069015.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/inkscape-window.cpp')
-rw-r--r--src/inkscape-window.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 7227993cf..e6f488215 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -18,12 +18,26 @@
#include "inkscape-window.h"
#include "inkscape.h" // SP_ACTIVE_DESKTOP
#include "shortcuts.h"
+#include "inkscape-application.h"
#include "widgets/desktop-widget.h"
InkscapeWindow::InkscapeWindow(SPDocument* document)
: _document(document)
{
+ if (!_document) {
+ std::cerr << "InkscapeWindow::InkscapeWindow: null document!" << std::endl;
+ return;
+ }
+
+ Glib::RefPtr<Gio::Application> gio_app = Gio::Application::get_default();
+ Glib::RefPtr<Gtk::Application> app = Glib::RefPtr<Gtk::Application>::cast_dynamic(gio_app);
+ if (app) {
+ set_application(app); // Same as Gtk::Application::add_window()
+ } else {
+ std::cerr << "InkscapeWindow::InkscapeWindow:: Didn't get app!" << std::endl;
+ }
+
set_resizable(true);
// Callbacks