Added UXManager. Cleaning up toolbox creation.

[inkscape.git] / src / widgets / desktop-widget.cpp

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index b63992afe9a8ff22d0528533ffc0326f20646251..6c330b5f3d7a99d4b545ddb0cb18b1875652b1a2 100644 (file)
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -55,6 +55,7 @@
 #include "ui/widget/dock.h"
 #include "ui/widget/layer-selector.h"
 #include "ui/widget/selected-style.h"
+#include "ui/uxmanager.h"
 #include "widgets/button.h"
 #include "widgets/ruler.h"
 #include "widgets/spinbutton-events.h"
@@ -67,6 +68,10 @@
 using Inkscape::round;
 #endif
 
+
+using Inkscape::UI::UXManager;
+
+
 #ifdef WITH_INKBOARD
 #endif
 
@@ -1374,10 +1379,12 @@ sp_desktop_widget_new (SPNamedView *namedview)
 
     sp_desktop_widget_layout (dtw);
 
-    sp_tool_toolbox_set_desktop (dtw->tool_toolbox, dtw->desktop);
-    sp_aux_toolbox_set_desktop (dtw->aux_toolbox, dtw->desktop);
-    sp_commands_toolbox_set_desktop (dtw->commands_toolbox, dtw->desktop);
-    sp_snap_toolbox_set_desktop (dtw->snap_toolbox, dtw->desktop);
+    std::vector<GtkWidget *> toolboxes;
+    toolboxes.push_back(dtw->tool_toolbox);
+    toolboxes.push_back(dtw->aux_toolbox);
+    toolboxes.push_back(dtw->commands_toolbox);
+    toolboxes.push_back(dtw->snap_toolbox);
+    UXManager::getInstance()->connectToDesktop( toolboxes, dtw->desktop );
 
     dtw->panels->setDesktop( dtw->desktop );