From 0dbd19748a058c88f9a693ed08ddabf223d0524d Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 11 Jun 2013 16:14:43 -0400 Subject: Fix new bug with No-Marker having no icon, use Stock GTK::Remove icon for No-Marker. (bzr r12364) --- src/widgets/stroke-marker-selector.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 5ac6d5f34..dd00ed703 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -38,6 +38,7 @@ #include "helper/stock-items.h" #include "gradient-vector.h" +#include #include #include "ui/widget/spinbutton.h" #include "stroke-style.h" @@ -151,7 +152,8 @@ MarkerComboBox::init_combo() Gtk::TreeModel::Row row = *(marker_store->append()); row[marker_columns.label] = _("No document selected"); row[marker_columns.marker] = g_strdup("None"); - row[marker_columns.image] = NULL; + Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); + row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); row[marker_columns.stock] = false; row[marker_columns.history] = false; row[marker_columns.separator] = false; @@ -386,7 +388,8 @@ void MarkerComboBox::add_markers (GSList *marker_list, SPDocument *source, gbool row[marker_columns.label] = _("None"); row[marker_columns.stock] = false; row[marker_columns.marker] = g_strdup("None"); - row[marker_columns.image] = NULL; + Glib::RefPtr iconTheme = Gtk::IconTheme::get_default(); + row[marker_columns.image] = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); row[marker_columns.history] = true; row[marker_columns.separator] = false; } -- cgit v1.2.3