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/widgets/gradient-toolbar.cpp | |
| 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/widgets/gradient-toolbar.cpp')
| -rw-r--r-- | src/widgets/gradient-toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 8474327ca..196264315 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -1026,7 +1026,7 @@ static void gradient_toolbox_check_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBa */ void sp_gradient_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, GObject* holder) { - Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); + GtkIconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); /* New gradient linear or radial */ { @@ -1221,7 +1221,7 @@ void sp_gradient_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, _("Link gradients"), _("Link gradients to change all related gradients"), INKSCAPE_ICON("object-unlocked"), - Inkscape::ICON_SIZE_DECORATION ); + GTK_ICON_SIZE_MENU ); g_object_set( itact, "short_label", "Lock", NULL ); g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(gr_linked_changed), desktop) ; gtk_action_group_add_action( mainActions, GTK_ACTION(itact) ); |