summaryrefslogtreecommitdiffstats
path: root/src/widgets/desktop-widget.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2012-12-21 08:35:32 +0000
committerJabiertxo Arraiza Cenoz <jtx@jtx.marker.es>2012-12-21 08:35:32 +0000
commit39309b4a709fad3beed6f02f7ce0289020835efd (patch)
tree0ecc19c6309bfa70f30f075a46d87774040cfb8a /src/widgets/desktop-widget.cpp
parentnot working (diff)
parentfix crasher (diff)
downloadinkscape-39309b4a709fad3beed6f02f7ce0289020835efd.tar.gz
inkscape-39309b4a709fad3beed6f02f7ce0289020835efd.zip
not working, merge from branch
(bzr r11950.1.4)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
-rw-r--r--src/widgets/desktop-widget.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 3791ec73c..0fd8fd010 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -578,7 +578,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
if (create_dock) {
dtw->dock = new Inkscape::UI::Widget::Dock();
+#if WITH_GTKMM_3_0
+ Gtk::Paned *paned = new Gtk::Paned();
+#else
Gtk::HPaned *paned = new Gtk::HPaned();
+#endif
+
paned->pack1(*Glib::wrap(canvas_tbl));
paned->pack2(dtw->dock->getWidget(), Gtk::FILL);