summaryrefslogtreecommitdiffstats
path: root/src/widgets/star-toolbar.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-06-29 13:28:54 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2017-06-29 13:28:54 +0000
commit88e5cefd2b64d56aa00009f91d9c481c9b8c3c74 (patch)
tree901357ee4a10db7a130c7c591e2fe85ee32bc931 /src/widgets/star-toolbar.cpp
parentglade WIP (diff)
parentHackfest icon work: restore selected menu icons and make theming easier (diff)
downloadinkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.tar.gz
inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/widgets/star-toolbar.cpp')
-rw-r--r--src/widgets/star-toolbar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp
index 8f667a656..657b38f18 100644
--- a/src/widgets/star-toolbar.cpp
+++ b/src/widgets/star-toolbar.cpp
@@ -436,7 +436,7 @@ static void star_toolbox_watch_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBase*
void sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder)
{
- Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
+ GtkIconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
{
EgeOutputAction* act = ege_output_action_new( "StarStateAction", _("<b>New:</b>"), "", 0 );
@@ -562,7 +562,7 @@ void sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
_("Defaults"),
_("Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)"),
INKSCAPE_ICON("edit-clear"),
- Inkscape::ICON_SIZE_SMALL_TOOLBAR);
+ GTK_ICON_SIZE_SMALL_TOOLBAR);
g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_stb_defaults), holder );
gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
gtk_action_set_sensitive( GTK_ACTION(inky), TRUE );