diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/widgets/button.h | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/widgets/button.h')
| -rw-r--r-- | src/widgets/button.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/button.h b/src/widgets/button.h index 2bceb5e97..94a956de3 100644 --- a/src/widgets/button.h +++ b/src/widgets/button.h @@ -42,7 +42,7 @@ struct SPBChoiceData { struct SPButton { GtkToggleButton widget; SPButtonType type; - Inkscape::IconSize lsize; + GtkIconSize lsize; unsigned int psize; SPAction *action; SPAction *doubleclick_action; @@ -59,11 +59,11 @@ struct SPButtonClass { GType sp_button_get_type (void); -GtkWidget *sp_button_new (Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action); +GtkWidget *sp_button_new (GtkIconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action); void sp_button_toggle_set_down (SPButton *button, gboolean down); -GtkWidget *sp_button_new_from_data (Inkscape::IconSize size, +GtkWidget *sp_button_new_from_data (GtkIconSize size, SPButtonType type, Inkscape::UI::View::View *view, const gchar *name, |