callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkToolPalette: Use G_PARAM_EXPLICIT_NOTIFY

Browse Source
This commit is contained in:
Matthias Clasen 2014-06-09 11:49:22 -04:00
parent cf6274c979
commit 71ac4d626e
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtktoolpalette.c
View File

@ -246,35 +246,39 @@ gtk_tool_palette_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_ICON_SIZE: case PROP_ICON_SIZE:
if ((guint) g_value_get_enum (value) != palette->priv->icon_size) if (palette->priv->icon_size != g_value_get_enum (value))
{ {
palette->priv->icon_size = g_value_get_enum (value); palette->priv->icon_size = g_value_get_enum (value);
gtk_tool_palette_reconfigured (palette); gtk_tool_palette_reconfigured (palette);
g_object_notify_by_pspec (object, pspec);
} }
break; break;
case PROP_ICON_SIZE_SET: case PROP_ICON_SIZE_SET:
if ((guint) g_value_get_enum (value) != palette->priv->icon_size) if (palette->priv->icon_size_set != g_value_get_boolean (value))
{ {
palette->priv->icon_size_set = g_value_get_enum (value); palette->priv->icon_size_set = g_value_get_boolean (value);
gtk_tool_palette_reconfigured (palette); gtk_tool_palette_reconfigured (palette);
g_object_notify_by_pspec (object, pspec);
} }
break; break;
case PROP_ORIENTATION: case PROP_ORIENTATION:
if ((guint) g_value_get_enum (value) != palette->priv->orientation) if (palette->priv->orientation != g_value_get_enum (value))
{ {
palette->priv->orientation = g_value_get_enum (value); palette->priv->orientation = g_value_get_enum (value);
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (palette)); _gtk_orientable_set_style_classes (GTK_ORIENTABLE (palette));
gtk_tool_palette_reconfigured (palette); gtk_tool_palette_reconfigured (palette);
g_object_notify_by_pspec (object, pspec);
} }
break; break;
case PROP_TOOLBAR_STYLE: case PROP_TOOLBAR_STYLE:
if ((guint) g_value_get_enum (value) != palette->priv->style) if (palette->priv->style != g_value_get_enum (value))
{ {
palette->priv->style = g_value_get_enum (value); palette->priv->style = g_value_get_enum (value);
gtk_tool_palette_reconfigured (palette); gtk_tool_palette_reconfigured (palette);
g_object_notify_by_pspec (object, pspec);
} }
break; break;
@ -287,13 +291,21 @@ gtk_tool_palette_set_property (GObject *object,
break; break;
case PROP_HSCROLL_POLICY: case PROP_HSCROLL_POLICY:
palette->priv->hscroll_policy = g_value_get_enum (value); if (palette->priv->hscroll_policy != g_value_get_enum (value))
gtk_widget_queue_resize (GTK_WIDGET (palette)); {
palette->priv->hscroll_policy = g_value_get_enum (value);
gtk_widget_queue_resize (GTK_WIDGET (palette));
g_object_notify_by_pspec (object, pspec);
}
break; break;
case PROP_VSCROLL_POLICY: case PROP_VSCROLL_POLICY:
palette->priv->vscroll_policy = g_value_get_enum (value); if (palette->priv->vscroll_policy != g_value_get_enum (value))
gtk_widget_queue_resize (GTK_WIDGET (palette)); {
palette->priv->vscroll_policy = g_value_get_enum (value);
gtk_widget_queue_resize (GTK_WIDGET (palette));
g_object_notify_by_pspec (object, pspec);
}
break; break;
default: default:
@ -943,7 +955,7 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls)
P_("Size of icons in this tool palette"), P_("Size of icons in this tool palette"),
GTK_TYPE_ICON_SIZE, GTK_TYPE_ICON_SIZE,
DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkToolPalette:icon-size-set: * GtkToolPalette:icon-size-set:
@ -955,10 +967,10 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls)
g_object_class_install_property (oclass, g_object_class_install_property (oclass,
PROP_ICON_SIZE_SET, PROP_ICON_SIZE_SET,
g_param_spec_boolean ("icon-size-set", g_param_spec_boolean ("icon-size-set",
P_("Icon size set"), P_("Icon size set"),
P_("Whether the icon-size property has been set"), P_("Whether the icon-size property has been set"),
FALSE, FALSE,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkToolPalette:toolbar-style: * GtkToolPalette:toolbar-style:
@ -973,7 +985,7 @@ gtk_tool_palette_class_init (GtkToolPaletteClass *cls)
P_("Style of items in the tool palette"), P_("Style of items in the tool palette"),
GTK_TYPE_TOOLBAR_STYLE, GTK_TYPE_TOOLBAR_STYLE,
DEFAULT_TOOLBAR_STYLE, DEFAULT_TOOLBAR_STYLE,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**