diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-06-11 20:14:43 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-06-11 20:14:43 +0000 |
| commit | 0dbd19748a058c88f9a693ed08ddabf223d0524d (patch) | |
| tree | ac88e4c3a085acacbaf8eac7e393b6e00dd568b6 /src/widgets/stroke-marker-selector.cpp | |
| parent | Change marker layout in stroke-widget so they are all on one line. (diff) | |
| download | inkscape-0dbd19748a058c88f9a693ed08ddabf223d0524d.tar.gz inkscape-0dbd19748a058c88f9a693ed08ddabf223d0524d.zip | |
Fix new bug with No-Marker having no icon, use Stock GTK::Remove icon for No-Marker.
(bzr r12364)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 <gtkmm/icontheme.h> #include <gtkmm/adjustment.h> #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<Gtk::IconTheme> 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<Gtk::IconTheme> 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; } |