From 7f5d2af69c85e840274dda25a20aa63031a26b2c Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 9 Jan 2019 11:35:17 +0100
Subject: First baby step in adding InkscapeWindow (Gtk::ApplicationWindow)

---
 src/ui/interface.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/ui/interface.cpp')

diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index b02186152..c68ee0d2d 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -32,6 +32,7 @@
 #include "file.h"
 #include "gradient-drag.h"
 #include "inkscape.h"
+#include "inkscape-window.h"
 #include "message-context.h"
 #include "message-stack.h"
 #include "preferences.h"
@@ -140,23 +141,14 @@ static void sp_ui_menu_item_set_name(GtkWidget *data,
                                      Glib::ustring const &name);
 static void sp_recent_open(GtkRecentChooser *, gpointer);
 
-static bool sp_on_window_key_press(GdkEventKey* event)
-{
-    unsigned shortcut = 0;
-    shortcut = sp_shortcut_get_for_event(event);
-    return sp_shortcut_invoke (shortcut, SP_ACTIVE_DESKTOP);
-}
-
 void
 sp_create_window(SPViewWidget *vw, bool editable)
 {
     g_return_if_fail(vw != nullptr);
     g_return_if_fail(SP_IS_VIEW_WIDGET(vw));
 
-    Gtk::Window *win = new Gtk::Window(Gtk::WINDOW_TOPLEVEL);
+    InkscapeWindow* win = new InkscapeWindow();
     win->set_resizable(true);
-    win->signal_key_press_event().connect(sigc::ptr_fun(&sp_on_window_key_press));
-
     gtk_container_add(GTK_CONTAINER(win->gobj()), GTK_WIDGET(vw));
     gtk_widget_show(GTK_WIDGET(vw));
 
@@ -200,6 +192,7 @@ sp_create_window(SPViewWidget *vw, bool editable)
         }
     }
 
+    // TODO Drop targets beglong on canvas, not window.
     if ( completeDropTargets == nullptr || completeDropTargetsCount == 0 )
     {
         std::vector<Glib::ustring> types;
-- 
cgit v1.2.3