Dockable dialogs patch applied

(https://sourceforge.net/tracker/?func=detail&atid=604308&aid=1688508&group_id=93438)

(bzr r3613)

3 files changed, 16 insertions, 2 deletions

diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 8e388529e..c8219b7b2 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -18,9 +18,10 @@
 
 #include "libnr/nr-point.h"
 #include "message.h"
-
 #include <gtkmm/window.h>
 
+namespace Inkscape { namespace UI { namespace Widget { class Dock; } } }
+
 namespace Inkscape {
 namespace UI {
 namespace View {
@@ -135,6 +136,8 @@ struct EditWidgetInterface
     
     /// Open yes/no dialog with warning text and confirmation question.
     virtual bool warnDialog (gchar*) = 0;
+
+    virtual Inkscape::UI::Widget::Dock* getDock () = 0;
 };
 
 } // namespace View
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index b87250e47..066d4d0ba 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -65,6 +65,8 @@
 #include "interface.h"
 #include "extension/db.h"
 
+#include "ui/dialog/dialog-manager.h"
+
 using namespace Inkscape::UI;
 using namespace Inkscape::UI::Widget;
 
@@ -152,7 +154,6 @@ EditWidget::initLayout()
     _viewport_table.attach(_svg_canvas.widget(), 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
     _svg_canvas.widget().show_all();
 
-
     // The statusbar comes last and appears at the bottom of _main_window_table
     initStatusbar();
 
@@ -1532,6 +1533,12 @@ EditWidget::warnDialog (gchar* msg)
 }
 
 
+Inkscape::UI::Widget::Dock*
+EditWidget::getDock ()
+{
+    return &_dock;
+}
+
 void EditWidget::_namedview_modified (SPObject *obj, guint flags) {
     SPNamedView *nv = static_cast<SPNamedView *>(obj);
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
diff --git a/src/ui/view/edit-widget.h b/src/ui/view/edit-widget.h
index 443b10ac8..4341f667c 100644
--- a/src/ui/view/edit-widget.h
+++ b/src/ui/view/edit-widget.h
@@ -27,6 +27,7 @@
 
 #include "ui/dialog/dialog-manager.h"
 #include "ui/view/edit-widget-interface.h"
+#include "ui/widget/dock.h"
 #include "ui/widget/selected-style.h"
 #include "ui/widget/ruler.h"
 #include "ui/widget/toolbox.h"
@@ -132,6 +133,8 @@ public:
     virtual void setMessage (Inkscape::MessageType type, gchar const* msg);
     virtual bool warnDialog (gchar*);
 
+    virtual Inkscape::UI::Widget::Dock* getDock ();
+
 protected:
     void _namedview_modified(SPObject *namedview, guint);
 
@@ -157,6 +160,7 @@ protected:
     Gtk::ToggleButton    _sticky_zoom;
     UI::Widget::SVGCanvas _svg_canvas;
     Gtk::HBox            _statusbar;
+    UI::Widget::Dock _dock;
     UI::Widget::SelectedStyle _selected_style_status;
     UI::Widget::ZoomStatus _zoom_status;
     Inkscape::Widgets::LayerSelector _layer_selector;