diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-06-11 22:55:31 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-06-11 22:55:31 +0000 |
| commit | 2f7a1c5a360c192e60fa25adcb8b838fd33c4d40 (patch) | |
| tree | bc64c87fcf5655b32cb86fe6ef6f5ca08b1b3324 /src/widgets | |
| parent | Fix bug where symbols weren't identified as such (diff) | |
| download | inkscape-2f7a1c5a360c192e60fa25adcb8b838fd33c4d40.tar.gz inkscape-2f7a1c5a360c192e60fa25adcb8b838fd33c4d40.zip | |
Change back to using NULL and fix windows theme error by checking
(bzr r12367)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index dd00ed703..82cd81e9f 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -60,7 +60,12 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer)); gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL); - empty_image = new Gtk::Image(); + Glib::RefPtr<Gtk::IconTheme> iconTheme = Gtk::IconTheme::get_default(); + if(iconTheme->has_icon("gtk-remove")) { + empty_image = new Gtk::Image( iconTheme->load_icon("gtk-remove", 22) ); + } else { + empty_image = new Gtk::Image(); + } sandbox = ink_markers_preview_doc (); desktop = inkscape_active_desktop(); @@ -152,8 +157,7 @@ MarkerComboBox::init_combo() Gtk::TreeModel::Row row = *(marker_store->append()); row[marker_columns.label] = _("No document selected"); row[marker_columns.marker] = g_strdup("None"); - 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.image] = NULL; row[marker_columns.stock] = false; row[marker_columns.history] = false; row[marker_columns.separator] = false; @@ -388,8 +392,7 @@ 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"); - 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.image] = NULL; row[marker_columns.history] = true; row[marker_columns.separator] = false; } |