diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 02:03:38 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 02:03:38 +0000 |
| commit | 0d5bb885dee83f041830dc950d3be6f21a37f08b (patch) | |
| tree | 88a0ae7a15ed496ddad1f83f43547783b88843ac /src/widgets/ege-adjustment-action.cpp | |
| parent | Bug fixes (diff) | |
| parent | Add Mac CI build config (diff) | |
| download | inkscape-0d5bb885dee83f041830dc950d3be6f21a37f08b.tar.gz inkscape-0d5bb885dee83f041830dc950d3be6f21a37f08b.zip | |
update to trunk
Diffstat (limited to 'src/widgets/ege-adjustment-action.cpp')
| -rw-r--r-- | src/widgets/ege-adjustment-action.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp index 6678d1e5a..e4f041bd1 100644 --- a/src/widgets/ege-adjustment-action.cpp +++ b/src/widgets/ege-adjustment-action.cpp @@ -42,7 +42,6 @@ #include <cmath> #include <string.h> -#include "widgets/icon.h" #include <gdk/gdkkeysyms.h> #include "icon-size.h" @@ -115,7 +114,7 @@ struct _EgeAdjustmentActionPrivate GList* descriptions; gchar* appearance; gchar* iconId; - Inkscape::IconSize iconSize; + GtkIconSize iconSize; Inkscape::UI::Widget::UnitTracker *unitTracker; }; @@ -232,9 +231,9 @@ static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass ) g_param_spec_int( "iconSize", "Icon Size", "The size the icon", - (int)Inkscape::ICON_SIZE_MENU, - (int)Inkscape::ICON_SIZE_DECORATION, - (int)Inkscape::ICON_SIZE_SMALL_TOOLBAR, + (int)GTK_ICON_SIZE_MENU, + (int)GTK_ICON_SIZE_DIALOG, + (int)GTK_ICON_SIZE_SMALL_TOOLBAR, (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) ); g_object_class_install_property( objClass, @@ -272,7 +271,7 @@ static void ege_adjustment_action_init( EgeAdjustmentAction* action ) action->private_data->descriptions = 0; action->private_data->appearance = 0; action->private_data->iconId = 0; - action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR; + action->private_data->iconSize = GTK_ICON_SIZE_SMALL_TOOLBAR; action->private_data->unitTracker = NULL; } @@ -463,7 +462,7 @@ void ege_adjustment_action_set_property( GObject* obj, guint propId, const GValu case PROP_ICON_SIZE: { - action->private_data->iconSize = (Inkscape::IconSize)g_value_get_int( value ); + action->private_data->iconSize = (GtkIconSize)g_value_get_int( value ); } break; @@ -857,7 +856,7 @@ static GtkWidget* create_tool_item( GtkAction* action ) /* Use an icon if available or use short-label */ if ( act->private_data->iconId && strcmp( act->private_data->iconId, "" ) != 0 ) { - GtkWidget* icon = sp_icon_new( act->private_data->iconSize, act->private_data->iconId ); + GtkWidget* icon = gtk_image_new_from_icon_name( act->private_data->iconId, act->private_data->iconSize ); gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 ); } else { GtkWidget* lbl = gtk_label_new( g_value_get_string( &value ) ? g_value_get_string( &value ) : "wwww" ); |