summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-06-20 13:20:52 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-06-20 13:20:52 +0000
commitaf32f53a859d8bc0dc5c07d644a8158f8c950cdc (patch)
tree0ed9599288b92de7441e624630659a9faee4ab3b /src/extension
parentMerge branch 'copypasta' of gitlab.com:nathanal/inkscape (diff)
parentRemove deprecated usage of custom Gtk::IconSize (diff)
downloadinkscape-af32f53a859d8bc0dc5c07d644a8158f8c950cdc.tar.gz
inkscape-af32f53a859d8bc0dc5c07d644a8158f8c950cdc.zip
Merge branch 'gtk3-deprecated' of gitlab.com:Qantas94Heavy/inkscape
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/extension.cpp3
-rw-r--r--src/extension/param/description.cpp4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index a373e5ec0..77a171487 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -796,7 +796,8 @@ Extension::get_help_widget()
if (_help == nullptr) {
Gtk::Label * content = Gtk::manage(new Gtk::Label(_("Currently there is no help available for this Extension. Please look on the Inkscape website or ask on the mailing lists if you have questions regarding this extension.")));
- content->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_START);
+ content->set_xalign(0);
+ content->set_yalign(0);
retval->pack_start(*content, true, true, 4);
content->set_line_wrap(true);
content->show();
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index 154c172df..60e2d02c8 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -108,11 +108,7 @@ ParamDescription::get_widget (SPDocument * /*doc*/, Inkscape::XML::Node * /*node
label->set_text(newtext);
}
label->set_line_wrap();
-#if (GTKMM_MAJOR_VERSION == 3 && GTKMM_MINOR_VERSION >= 16)
label->set_xalign(0);
-#else
- label->set_alignment(Gtk::ALIGN_START);
-#endif
// TODO: Ugly "fix" for gtk3 width/height calculation of labels.
// - If not applying any limits long labels will make the window grow horizontally until it uses up