AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 01:31:13 +00:00
Code Issues Projects Releases Wiki Activity

gtk_widget_set_property(): use accessors instead of setting flags

Browse Source 
Use the newly added accessors to set the "can-focus", "can-default"
and "receives-default" properties.
This commit is contained in:
Michael Natterer 2009-09-04 15:18:24 +02:00
parent 026bea2293
commit 6ee228a363
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkwidget.c
View File

@ -2415,11 +2415,10 @@ gtk_widget_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
gboolean tmp; gboolean tmp;
guint32 saved_flags;
gchar *tooltip_markup; gchar *tooltip_markup;
const gchar *tooltip_text; const gchar *tooltip_text;
GtkWindow *tooltip_window; GtkWindow *tooltip_window;
case PROP_NAME: case PROP_NAME:
gtk_widget_set_name (widget, g_value_get_string (value)); gtk_widget_set_name (widget, g_value_get_string (value));
break; break;
@ -2442,13 +2441,7 @@ gtk_widget_set_property (GObject *object,
gtk_widget_set_app_paintable (widget, g_value_get_boolean (value)); gtk_widget_set_app_paintable (widget, g_value_get_boolean (value));
break; break;
case PROP_CAN_FOCUS: case PROP_CAN_FOCUS:
saved_flags = GTK_WIDGET_FLAGS (widget); gtk_widget_set_can_focus (widget, g_value_get_boolean (value));
if (g_value_get_boolean (value))
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
if (saved_flags != GTK_WIDGET_FLAGS (widget))
gtk_widget_queue_resize (widget);
break; break;
case PROP_HAS_FOCUS: case PROP_HAS_FOCUS:
if (g_value_get_boolean (value)) if (g_value_get_boolean (value))
@ -2459,23 +2452,14 @@ gtk_widget_set_property (GObject *object,
gtk_widget_grab_focus (widget); gtk_widget_grab_focus (widget);
break; break;
case PROP_CAN_DEFAULT: case PROP_CAN_DEFAULT:
saved_flags = GTK_WIDGET_FLAGS (widget); gtk_widget_set_can_default (widget, g_value_get_boolean (value));
if (g_value_get_boolean (value))
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_DEFAULT);
if (saved_flags != GTK_WIDGET_FLAGS (widget))
gtk_widget_queue_resize (widget);
break; break;
case PROP_HAS_DEFAULT: case PROP_HAS_DEFAULT:
if (g_value_get_boolean (value)) if (g_value_get_boolean (value))
gtk_widget_grab_default (widget); gtk_widget_grab_default (widget);
break; break;
case PROP_RECEIVES_DEFAULT: case PROP_RECEIVES_DEFAULT:
if (g_value_get_boolean (value)) gtk_widget_set_receives_default (widget, g_value_get_boolean (value));
GTK_WIDGET_SET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
break; break;
case PROP_STYLE: case PROP_STYLE:
gtk_widget_set_style (widget, g_value_get_object (value)); gtk_widget_set_style (widget, g_value_get_object (value));