diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
| commit | 88e5cefd2b64d56aa00009f91d9c481c9b8c3c74 (patch) | |
| tree | 901357ee4a10db7a130c7c591e2fe85ee32bc931 /src/live_effects/parameter/togglebutton.h | |
| parent | glade WIP (diff) | |
| parent | Hackfest icon work: restore selected menu icons and make theming easier (diff) | |
| download | inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.tar.gz inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/live_effects/parameter/togglebutton.h')
| -rw-r--r-- | src/live_effects/parameter/togglebutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index d6ca15e75..02b9d5127 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -34,7 +34,7 @@ public: const Glib::ustring& inactive_label = "", char const * icon_active = NULL, char const * icon_inactive = NULL, - Inkscape::IconSize icon_size = Inkscape::ICON_SIZE_SMALL_TOOLBAR); + GtkIconSize icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR); virtual ~ToggleButtonParam(); virtual Gtk::Widget * param_newWidget(); @@ -64,7 +64,7 @@ private: const Glib::ustring inactive_label; const char * _icon_active; const char * _icon_inactive; - Inkscape::IconSize _icon_size; + GtkIconSize _icon_size; Inkscape::UI::Widget::RegisteredToggleButton * checkwdg; sigc::signal<void> _signal_toggled; |