summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-03-15 00:44:05 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2013-03-15 00:44:05 +0000
commit947e710daa96049ff0e825fcc6392de6b39ac124 (patch)
tree23f6fa66560475642b8fd81c13c85b73426ece35 /src
parentFix even more forward declaration tags (diff)
downloadinkscape-947e710daa96049ff0e825fcc6392de6b39ac124.tar.gz
inkscape-947e710daa96049ff0e825fcc6392de6b39ac124.zip
Fix table layout in fill and stroke dialog in Gtk+ 2
(bzr r12207)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/fill-and-stroke.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 8de2da18b..19b873d54 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -132,14 +132,24 @@ void
FillAndStroke::_layoutPageFill()
{
fillWdgt = manage(sp_fill_style_widget_new());
+
+#if WITH_GTKMM_3_0
_page_fill->table().attach(*fillWdgt, 0, 0, 1, 1);
+#else
+ _page_fill->table().attach(*fillWdgt, 0, 1, 0, 1);
+#endif
}
void
FillAndStroke::_layoutPageStrokePaint()
{
strokeWdgt = manage(sp_stroke_style_paint_widget_new());
+
+#if WITH_GTKMM_3_0
_page_stroke_paint->table().attach(*strokeWdgt, 0, 0, 1, 1);
+#else
+ _page_stroke_paint->table().attach(*strokeWdgt, 0, 1, 0, 1);
+#endif
}
void
@@ -148,7 +158,12 @@ FillAndStroke::_layoutPageStrokeStyle()
//Gtk::Widget *strokeStyleWdgt = manage(Glib::wrap(sp_stroke_style_line_widget_new()));
//Gtk::Widget *strokeStyleWdgt = static_cast<Gtk::Widget *>(sp_stroke_style_line_widget_new());
strokeStyleWdgt = sp_stroke_style_line_widget_new();
+
+#if WITH_GTKMM_3_0
_page_stroke_style->table().attach(*strokeStyleWdgt, 0, 0, 1, 1);
+#else
+ _page_stroke_style->table().attach(*strokeStyleWdgt, 0, 1, 0, 1);
+#endif
}
void