summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-05-21 10:01:41 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-05-21 10:01:41 +0000
commita89dd0f5f45c3df19c3d6756fef83ab06f3d5356 (patch)
treeee629d7f9aefd38bccf3e5092830d6ca81e1ab1d /src/ui/widget
parentExtended control resizing to node editing. Fixes half of bug #172059. (diff)
downloadinkscape-a89dd0f5f45c3df19c3d6756fef83ab06f3d5356.tar.gz
inkscape-a89dd0f5f45c3df19c3d6756fef83ab06f3d5356.zip
More size-request GTK+ 3 fixes
(bzr r11391)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/dock-item.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 238e93b0b..0f93968e5 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -168,10 +168,14 @@ DockItem::set_size_request(int width, int height)
getWidget().set_size_request(width, height);
}
-void
-DockItem::size_request(Gtk::Requisition& requisition)
+void DockItem::size_request(Gtk::Requisition& requisition)
{
+#if WITH_GTKMM_3_0
+ Gtk::Requisition req_natural;
+ getWidget().get_preferred_size(req_natural, requisition);
+#else
requisition = getWidget().size_request();
+#endif
}
void