summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/document-properties.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2014-03-31 12:11:30 +0000
committerJabiertxof <jtx@jtx.marker.es>2014-03-31 12:11:30 +0000
commit00ea3a2ecf217ccd1889b6036054018b6b69105e (patch)
treed611ddc875f766f4e32af29f5ac764037dcd0983 /src/ui/dialog/document-properties.cpp
parentFixed bug in LPE Bspline widget, on apply selected nodes, because a rounding ... (diff)
parentFix Gtkmm 3.8 build issues on systems with Gtk+ 3.10 (diff)
downloadinkscape-00ea3a2ecf217ccd1889b6036054018b6b69105e.tar.gz
inkscape-00ea3a2ecf217ccd1889b6036054018b6b69105e.zip
update to trunk
(bzr r11950.1.319)
Diffstat (limited to 'src/ui/dialog/document-properties.cpp')
-rw-r--r--src/ui/dialog/document-properties.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 508fc52b1..67e788e21 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -613,7 +613,7 @@ void DocumentProperties::build_cms()
label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
_link_btn.set_tooltip_text(_("Link Profile"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_link_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_link = Gtk::manage(new Gtk::Image());
@@ -622,7 +622,7 @@ void DocumentProperties::build_cms()
#endif
_unlink_btn.set_tooltip_text(_("Unlink Profile"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_unlink_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_unlink = Gtk::manage(new Gtk::Image());
@@ -750,7 +750,7 @@ void DocumentProperties::build_scripting()
label_external->set_markup (_("<b>External script files:</b>"));
_external_add_btn.set_tooltip_text(_("Add the current file name or browse for a file"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_external_add_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_ext_add = Gtk::manage(new Gtk::Image());
@@ -759,7 +759,7 @@ void DocumentProperties::build_scripting()
#endif
_external_remove_btn.set_tooltip_text(_("Remove"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_external_remove_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_ext_rm = Gtk::manage(new Gtk::Image());
@@ -839,7 +839,7 @@ void DocumentProperties::build_scripting()
label_embedded->set_markup (_("<b>Embedded script files:</b>"));
_embed_new_btn.set_tooltip_text(_("New"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_embed_new_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_embed_new = Gtk::manage(new Gtk::Image());
@@ -848,7 +848,7 @@ void DocumentProperties::build_scripting()
#endif
_embed_remove_btn.set_tooltip_text(_("Remove"));
-#if GTK_CHECK_VERSION(3,10,0)
+#if WITH_GTKMM_3_10
_embed_remove_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
#else
Gtk::Image *image_embed_rm = Gtk::manage(new Gtk::Image());