summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/preferences-widget.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-07-05 21:39:08 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-07-05 21:39:08 +0000
commit9abd33133650d77714fccf09d0c9ff27c9b75a78 (patch)
treee450b556c03d2335a40b85c5945f7ab5b0c8b5e2 /src/ui/widget/preferences-widget.cpp
parentPatch for bug #728081 (Keyboard shortcut - Lock current layer). (diff)
downloadinkscape-9abd33133650d77714fccf09d0c9ff27c9b75a78.tar.gz
inkscape-9abd33133650d77714fccf09d0c9ff27c9b75a78.zip
Drop GTK+ 2.20 support.
Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529)
Diffstat (limited to 'src/ui/widget/preferences-widget.cpp')
-rw-r--r--src/ui/widget/preferences-widget.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index a7b51d535..8ce7c63db 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -73,11 +73,7 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &
if (label != "")
{
Gtk::Label* label_widget;
-#if WITH_GTKMM_2_22
label_widget = Gtk::manage(new Gtk::Label(label , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
- label_widget = Gtk::manage(new Gtk::Label(label , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
label_widget->set_mnemonic_widget(widget);
if (indent)
{
@@ -107,11 +103,7 @@ void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &
if (suffix != "")
{
-#if WITH_GTKMM_2_22
Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
- Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
if (expand_widget)
this->attach(*suffix_widget, 2, 3, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
else
@@ -130,13 +122,9 @@ void DialogPage::add_group_header(Glib::ustring name)
int row = this->property_n_rows();
if (name != "")
{
-#if WITH_GTKMM_2_22
Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(Glib::ustring(/*"<span size='large'>*/"<b>") + name +
Glib::ustring("</b>"/*</span>"*/) , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true));
-#else
- Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(Glib::ustring(/*"<span size='large'>*/"<b>") + name +
- Glib::ustring("</b>"/*</span>"*/) , Gtk::ALIGN_LEFT , Gtk::ALIGN_CENTER, true));
-#endif
+
label_widget->set_use_markup(true);
this->attach(*label_widget , 0, 4, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0);
if (row != 1)