diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-06-29 11:43:56 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-06-29 11:43:56 +0000 |
| commit | 22d06152d0fabc7fe50bb6829f00b2bac4ed1796 (patch) | |
| tree | 9c6a9e59aedecd67f2a5e1a83d3c6c0b8541069a /src/widgets/paint-selector.cpp | |
| parent | Revert "color wheel: Temp fix for Gtk+ style properties" (diff) | |
| download | inkscape-22d06152d0fabc7fe50bb6829f00b2bac4ed1796.tar.gz inkscape-22d06152d0fabc7fe50bb6829f00b2bac4ed1796.zip | |
Remove old icon handling code
Diffstat (limited to 'src/widgets/paint-selector.cpp')
| -rw-r--r-- | src/widgets/paint-selector.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 855371ddd..27fe4b63a 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -27,7 +27,6 @@ #include "widgets/swatch-selector.h" #include "sp-pattern.h" #include <glibmm/i18n.h> -#include "widgets/icon.h" #include "widgets/widget-sizes.h" #include "xml/repr.h" @@ -236,7 +235,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_widget_set_tooltip_text(psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)")); g_object_set_data(G_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_EVENODD)); - w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("fill-rule-even-odd")); + w = gtk_image_new_from_icon_name("fill-rule-even-odd", GTK_ICON_SIZE_MENU); gtk_container_add(GTK_CONTAINER(psel->evenodd), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->evenodd, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(psel->evenodd), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel); @@ -247,7 +246,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_widget_set_tooltip_text(psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)")); g_object_set_data(G_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_NONZERO)); - w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("fill-rule-nonzero")); + w = gtk_image_new_from_icon_name("fill-rule-nonzero", GTK_ICON_SIZE_MENU); gtk_container_add(GTK_CONTAINER(psel->nonzero), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->nonzero, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(psel->nonzero), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel); @@ -316,7 +315,7 @@ static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data(G_OBJECT(b), "mode", GUINT_TO_POINTER(mode)); - w = sp_icon_new(Inkscape::ICON_SIZE_BUTTON, pixmap); + w = gtk_image_new_from_icon_name(pixmap, GTK_ICON_SIZE_BUTTON); gtk_widget_show(w); gtk_container_add(GTK_CONTAINER(b), w); |