summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/message.cpp
diff options
context:
space:
mode:
authorSylvain Chiron <chironsylvain@orange.fr>2017-12-26 15:36:00 +0000
committerSylvain Chiron <chironsylvain@orange.fr>2017-12-26 15:36:00 +0000
commit9e2b00e466609666d0995c91d84a0713db7dd96e (patch)
tree54ad33896147841f6e72ffe6fabd1937cf12eb8c /src/live_effects/parameter/message.cpp
parentFormat connector code (diff)
parentLPE message Gtkmm deprecation fixes (diff)
downloadinkscape-9e2b00e466609666d0995c91d84a0713db7dd96e.tar.gz
inkscape-9e2b00e466609666d0995c91d84a0713db7dd96e.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/live_effects/parameter/message.cpp')
-rw-r--r--src/live_effects/parameter/message.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index 0e19c07e1..1e2c9ec50 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -70,8 +70,15 @@ MessageParam::param_newWidget()
{
Gtk::Frame * frame = new Gtk::Frame (param_label);
Gtk::Widget * widg_frame = frame->get_label_widget();
+
+#if GTKMM_CHECK_VERSION(3,12,0)
+ widg_frame->set_margin_end(5);
+ widg_frame->set_margin_start(5);
+#else
widg_frame->set_margin_right(5);
widg_frame->set_margin_left(5);
+#endif
+
_label = new Gtk::Label (message, Gtk::ALIGN_END);
_label->set_use_underline (true);
_label->set_use_markup();
@@ -80,8 +87,14 @@ MessageParam::param_newWidget()
Gtk::Widget* widg_label = dynamic_cast<Gtk::Widget *> (_label);
widg_label->set_margin_top(8);
widg_label->set_margin_bottom(10);
+
+#if GTKMM_CHECK_VERSION(3,12,0)
+ widg_label->set_margin_end(6);
+ widg_label->set_margin_start(6);
+#else
widg_label->set_margin_right(6);
widg_label->set_margin_left(6);
+#endif
frame->add(*widg_label);
return dynamic_cast<Gtk::Widget *> (frame);