diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-01-07 09:19:48 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-01-07 09:19:48 +0000 |
| commit | 568dab6fba413360b1ca2cbf5205bdde8eb9a13b (patch) | |
| tree | 7783c453b3624e97517c09dfbeed25dc14ef621a /src/widgets/desktop-widget.cpp | |
| parent | a better truncation detection, suggested by Richard Hughes (diff) | |
| download | inkscape-568dab6fba413360b1ca2cbf5205bdde8eb9a13b.tar.gz inkscape-568dab6fba413360b1ca2cbf5205bdde8eb9a13b.zip | |
Added UXManager. Cleaning up toolbox creation.
(bzr r8951)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index b63992afe..6c330b5f3 100644 --- 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 ); |