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

Deprecate some widget flags

Browse Source 
Deprecate the following:
GTK_WIDGET_APP_PAINTABLE
GTK_WIDGET_CAN_DEFAULT
GTK_WIDGET_DOUBLE_BUFFERED
GTK_WIDGET_HAS_DEFAULT
GTK_WIDGET_HAS_GRAB
GTK_WIDGET_RECEIVES_DEFAULT

https://bugzilla.gnome.org/show_bug.cgi?id=69872
This commit is contained in:
Javier Jardón
2010-01-04 03:07:11 +01:00
committed by Tristan Van Berkom
parent 312263233f
commit 69de358b38
12 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/drawing-model.xml
View File

@ -507,7 +507,7 @@ static gint
gtk_window_expose (GtkWidget *widget, gtk_window_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
if (!GTK_WIDGET_APP_PAINTABLE (widget)) if (!gtk_widget_get_app_paintable (widget))
gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL,
GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1); GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1);

8
gtk/gtkbutton.c
View File

@ -1354,7 +1354,7 @@ gtk_button_size_request (GtkWidget *widget,
GTK_WIDGET (widget)->style->ythickness) * 2 + GTK_WIDGET (widget)->style->ythickness) * 2 +
inner_border.top + inner_border.bottom); inner_border.top + inner_border.bottom);
if (GTK_WIDGET_CAN_DEFAULT (widget)) if (gtk_widget_get_can_default (widget))
{ {
requisition->width += default_border.left + default_border.right; requisition->width += default_border.left + default_border.right;
requisition->height += default_border.top + default_border.bottom; requisition->height += default_border.top + default_border.bottom;
@ -1421,7 +1421,7 @@ gtk_button_size_allocate (GtkWidget *widget,
inner_border.bottom - inner_border.bottom -
border_width * 2); border_width * 2);
if (GTK_WIDGET_CAN_DEFAULT (button)) if (gtk_widget_get_can_default (GTK_WIDGET (button)))
{ {
child_allocation.x += default_border.left; child_allocation.x += default_border.left;
child_allocation.y += default_border.top; child_allocation.y += default_border.top;
@ -1488,7 +1488,7 @@ _gtk_button_paint (GtkButton *button,
width = widget->allocation.width - border_width * 2; width = widget->allocation.width - border_width * 2;
height = widget->allocation.height - border_width * 2; height = widget->allocation.height - border_width * 2;
if (GTK_WIDGET_HAS_DEFAULT (widget) && if (gtk_widget_has_default (widget) &&
GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL) GTK_BUTTON (widget)->relief == GTK_RELIEF_NORMAL)
{ {
gtk_paint_box (widget->style, widget->window, gtk_paint_box (widget->style, widget->window,
@ -1501,7 +1501,7 @@ _gtk_button_paint (GtkButton *button,
width -= default_border.left + default_border.right; width -= default_border.left + default_border.right;
height -= default_border.top + default_border.bottom; height -= default_border.top + default_border.bottom;
} }
else if (GTK_WIDGET_CAN_DEFAULT (widget)) else if (gtk_widget_get_can_default (widget))
{ {
x += default_outside_border.left; x += default_outside_border.left;
y += default_outside_border.top; y += default_outside_border.top;

2
gtk/gtkeventbox.c
View File

@ -549,7 +549,7 @@ static void
gtk_event_box_paint (GtkWidget *widget, gtk_event_box_paint (GtkWidget *widget,
GdkRectangle *area) GdkRectangle *area)
{ {
if (!GTK_WIDGET_APP_PAINTABLE (widget)) if (!gtk_widget_get_app_paintable (widget))
gtk_paint_flat_box (widget->style, widget->window, gtk_paint_flat_box (widget->style, widget->window,
widget->state, GTK_SHADOW_NONE, widget->state, GTK_SHADOW_NONE,
area, widget, "eventbox", area, widget, "eventbox",

8
gtk/gtkmain.c
View File

@ -1566,7 +1566,7 @@ gtk_main_do_event (GdkEvent *event)
break; break;
case GDK_EXPOSE: case GDK_EXPOSE:
if (event->any.window && GTK_WIDGET_DOUBLE_BUFFERED (event_widget)) if (event->any.window && gtk_widget_get_double_buffered (event_widget))
{ {
gdk_window_begin_paint_region (event->any.window, event->expose.region); gdk_window_begin_paint_region (event->any.window, event->expose.region);
gtk_widget_send_expose (event_widget, event); gtk_widget_send_expose (event_widget, event);
@ -1827,7 +1827,7 @@ gtk_grab_add (GtkWidget *widget)
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
if (!GTK_WIDGET_HAS_GRAB (widget) && GTK_WIDGET_IS_SENSITIVE (widget)) if (!gtk_widget_has_grab (widget) && GTK_WIDGET_IS_SENSITIVE (widget))
{ {
GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB); GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB);
@ -1865,7 +1865,7 @@ gtk_grab_remove (GtkWidget *widget)
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
if (GTK_WIDGET_HAS_GRAB (widget)) if (gtk_widget_has_grab (widget))
{ {
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_GRAB); GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_GRAB);
@ -2404,7 +2404,7 @@ gtk_propagate_event (GtkWidget *widget,
/* If there is a grab within the window, give the grab widget /* If there is a grab within the window, give the grab widget
* a first crack at the key event * a first crack at the key event
*/ */
if (widget != window && GTK_WIDGET_HAS_GRAB (widget)) if (widget != window && gtk_widget_has_grab (widget))
handled_event = gtk_widget_event (widget, event); handled_event = gtk_widget_event (widget, event);
if (!handled_event) if (!handled_event)

2
gtk/gtkscalebutton.c
View File

@ -1133,7 +1133,7 @@ gtk_scale_button_grab_notify (GtkScaleButton *button,
priv = button->priv; priv = button->priv;
if (!GTK_WIDGET_HAS_GRAB (priv->dock)) if (!gtk_widget_has_grab (priv->dock))
return; return;
if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock)) if (gtk_widget_is_ancestor (gtk_grab_get_current (), priv->dock))

24
gtk/gtkwidget.c
View File

@ -2757,7 +2757,7 @@ gtk_widget_get_property (GObject *object,
g_value_set_boolean (value, (GTK_WIDGET_SENSITIVE (widget) != FALSE)); g_value_set_boolean (value, (GTK_WIDGET_SENSITIVE (widget) != FALSE));
break; break;
case PROP_APP_PAINTABLE: case PROP_APP_PAINTABLE:
g_value_set_boolean (value, (GTK_WIDGET_APP_PAINTABLE (widget) != FALSE)); g_value_set_boolean (value, (gtk_widget_get_app_paintable (widget) != FALSE));
break; break;
case PROP_CAN_FOCUS: case PROP_CAN_FOCUS:
g_value_set_boolean (value, (GTK_WIDGET_CAN_FOCUS (widget) != FALSE)); g_value_set_boolean (value, (GTK_WIDGET_CAN_FOCUS (widget) != FALSE));
@ -2769,13 +2769,13 @@ gtk_widget_get_property (GObject *object,
g_value_set_boolean (value, (gtk_widget_is_focus (widget))); g_value_set_boolean (value, (gtk_widget_is_focus (widget)));
break; break;
case PROP_CAN_DEFAULT: case PROP_CAN_DEFAULT:
g_value_set_boolean (value, (GTK_WIDGET_CAN_DEFAULT (widget) != FALSE)); g_value_set_boolean (value, (gtk_widget_get_can_default (widget) != FALSE));
break; break;
case PROP_HAS_DEFAULT: case PROP_HAS_DEFAULT:
g_value_set_boolean (value, (GTK_WIDGET_HAS_DEFAULT (widget) != FALSE)); g_value_set_boolean (value, (gtk_widget_has_default (widget) != FALSE));
break; break;
case PROP_RECEIVES_DEFAULT: case PROP_RECEIVES_DEFAULT:
g_value_set_boolean (value, (GTK_WIDGET_RECEIVES_DEFAULT (widget) != FALSE)); g_value_set_boolean (value, (gtk_widget_get_receives_default (widget) != FALSE));
break; break;
case PROP_COMPOSITE_CHILD: case PROP_COMPOSITE_CHILD:
g_value_set_boolean (value, (GTK_WIDGET_FLAGS (widget) & GTK_COMPOSITE_CHILD) != 0 ); g_value_set_boolean (value, (GTK_WIDGET_FLAGS (widget) & GTK_COMPOSITE_CHILD) != 0 );
@ -5560,7 +5560,7 @@ gtk_widget_set_can_default (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (can_default != GTK_WIDGET_CAN_DEFAULT (widget)) if (can_default != gtk_widget_get_can_default (widget))
{ {
if (can_default) if (can_default)
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
@ -5588,7 +5588,7 @@ gtk_widget_get_can_default (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
return GTK_WIDGET_CAN_DEFAULT (widget); return (GTK_WIDGET_FLAGS (widget) & GTK_CAN_DEFAULT) != 0;
} }
/** /**
@ -5608,7 +5608,7 @@ gtk_widget_has_default (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
return GTK_WIDGET_HAS_DEFAULT (widget); return (GTK_WIDGET_FLAGS (widget) & GTK_HAS_DEFAULT) != 0;
} }
/** /**
@ -5628,7 +5628,7 @@ gtk_widget_grab_default (GtkWidget *widget)
GtkWidget *window; GtkWidget *window;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget)); g_return_if_fail (gtk_widget_get_can_default (widget));
window = gtk_widget_get_toplevel (widget); window = gtk_widget_get_toplevel (widget);
@ -5994,7 +5994,7 @@ gtk_widget_set_app_paintable (GtkWidget *widget,
app_paintable = (app_paintable != FALSE); app_paintable = (app_paintable != FALSE);
if (GTK_WIDGET_APP_PAINTABLE (widget) != app_paintable) if (gtk_widget_get_app_paintable (widget) != app_paintable)
{ {
if (app_paintable) if (app_paintable)
GTK_WIDGET_SET_FLAGS (widget, GTK_APP_PAINTABLE); GTK_WIDGET_SET_FLAGS (widget, GTK_APP_PAINTABLE);
@ -6059,7 +6059,7 @@ gtk_widget_set_double_buffered (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (double_buffered != GTK_WIDGET_DOUBLE_BUFFERED (widget)) if (double_buffered != gtk_widget_get_double_buffered (widget))
{ {
if (double_buffered) if (double_buffered)
GTK_WIDGET_SET_FLAGS (widget, GTK_DOUBLE_BUFFERED); GTK_WIDGET_SET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
@ -9082,7 +9082,7 @@ gtk_widget_propagate_state (GtkWidget *widget,
{ {
g_object_ref (widget); g_object_ref (widget);
if (!GTK_WIDGET_IS_SENSITIVE (widget) && GTK_WIDGET_HAS_GRAB (widget)) if (!GTK_WIDGET_IS_SENSITIVE (widget) && gtk_widget_has_grab (widget))
gtk_grab_remove (widget); gtk_grab_remove (widget);
g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state); g_signal_emit (widget, widget_signals[STATE_CHANGED], 0, old_state);
@ -9350,7 +9350,7 @@ expose_window (GdkWindow *window)
gdk_window_get_user_data (window, &user_data); gdk_window_get_user_data (window, &user_data);
if (user_data) if (user_data)
is_double_buffered = GTK_WIDGET_DOUBLE_BUFFERED (GTK_WIDGET (user_data)); is_double_buffered = gtk_widget_get_double_buffered (GTK_WIDGET (user_data));
else else
is_double_buffered = FALSE; is_double_buffered = FALSE;

24
gtk/gtkwidget.h
View File

@ -289,31 +289,43 @@ typedef enum
*/ */
#define GTK_WIDGET_HAS_FOCUS(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_FOCUS) != 0) #define GTK_WIDGET_HAS_FOCUS(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_FOCUS) != 0)
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_CAN_DEFAULT: * GTK_WIDGET_CAN_DEFAULT:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the widget is allowed to receive the default action * Evaluates to %TRUE if the widget is allowed to receive the default action
* via gtk_widget_grab_default(). * via gtk_widget_grab_default().
*
* Deprecated: 2.20: Use gtk_widget_get_can_default() instead.
*/ */
#define GTK_WIDGET_CAN_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_DEFAULT) != 0) #define GTK_WIDGET_CAN_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_DEFAULT) != 0)
#endif
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_HAS_DEFAULT: * GTK_WIDGET_HAS_DEFAULT:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the widget currently is receiving the default action. * Evaluates to %TRUE if the widget currently is receiving the default action.
*
* Deprecated: 2.20: Use gtk_widget_has_default() instead.
*/ */
#define GTK_WIDGET_HAS_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_DEFAULT) != 0) #define GTK_WIDGET_HAS_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_DEFAULT) != 0)
#endif
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_HAS_GRAB: * GTK_WIDGET_HAS_GRAB:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the widget is in the grab_widgets stack, and will be * Evaluates to %TRUE if the widget is in the grab_widgets stack, and will be
* the preferred one for receiving events other than ones of cosmetic value. * the preferred one for receiving events other than ones of cosmetic value.
*
* Deprecated: 2.20: Use gtk_widget_has_grab() instead.
*/ */
#define GTK_WIDGET_HAS_GRAB(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0) #define GTK_WIDGET_HAS_GRAB(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0)
#endif
/** /**
* GTK_WIDGET_RC_STYLE: * GTK_WIDGET_RC_STYLE:
@ -335,30 +347,42 @@ typedef enum
#define GTK_WIDGET_COMPOSITE_CHILD(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0) #define GTK_WIDGET_COMPOSITE_CHILD(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
#endif #endif
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_APP_PAINTABLE: * GTK_WIDGET_APP_PAINTABLE:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the #GTK_APP_PAINTABLE flag has been set on the widget. * Evaluates to %TRUE if the #GTK_APP_PAINTABLE flag has been set on the widget.
*
* Deprecated: 2.20: Use gtk_widget_get_app_paintable() instead.
*/ */
#define GTK_WIDGET_APP_PAINTABLE(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0) #define GTK_WIDGET_APP_PAINTABLE(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0)
#endif
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_RECEIVES_DEFAULT: * GTK_WIDGET_RECEIVES_DEFAULT:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the widget when focused will receive the default action * Evaluates to %TRUE if the widget when focused will receive the default action
* even if there is a different widget set as default. * even if there is a different widget set as default.
*
* Deprecated: 2.20: Use gtk_widget_get_receives_default() instead.
*/ */
#define GTK_WIDGET_RECEIVES_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0) #define GTK_WIDGET_RECEIVES_DEFAULT(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0)
#endif
#ifndef GTK_DISABLE_DEPRECATED
/** /**
* GTK_WIDGET_DOUBLE_BUFFERED: * GTK_WIDGET_DOUBLE_BUFFERED:
* @wid: a #GtkWidget. * @wid: a #GtkWidget.
* *
* Evaluates to %TRUE if the #GTK_DOUBLE_BUFFERED flag has been set on the widget. * Evaluates to %TRUE if the #GTK_DOUBLE_BUFFERED flag has been set on the widget.
*
* Deprecated: 2.20: Use gtk_widget_get_double_buffered() instead.
*/ */
#define GTK_WIDGET_DOUBLE_BUFFERED(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0) #define GTK_WIDGET_DOUBLE_BUFFERED(wid) ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0)
#endif
/* Macros for setting and clearing widget flags. /* Macros for setting and clearing widget flags.

30
gtk/gtkwindow.c
View File

@ -1646,7 +1646,7 @@ gtk_window_set_default (GtkWindow *window,
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
if (default_widget) if (default_widget)
g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (default_widget)); g_return_if_fail (gtk_widget_get_can_default (default_widget));
if (window->default_widget != default_widget) if (window->default_widget != default_widget)
{ {
@ -1660,7 +1660,7 @@ gtk_window_set_default (GtkWindow *window,
old_default_widget = window->default_widget; old_default_widget = window->default_widget;
if (window->focus_widget != window->default_widget || if (window->focus_widget != window->default_widget ||
!GTK_WIDGET_RECEIVES_DEFAULT (window->default_widget)) !gtk_widget_get_receives_default (window->default_widget))
GTK_WIDGET_UNSET_FLAGS (window->default_widget, GTK_HAS_DEFAULT); GTK_WIDGET_UNSET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
gtk_widget_queue_draw (window->default_widget); gtk_widget_queue_draw (window->default_widget);
} }
@ -1670,7 +1670,7 @@ gtk_window_set_default (GtkWindow *window,
if (window->default_widget) if (window->default_widget)
{ {
if (window->focus_widget == NULL || if (window->focus_widget == NULL ||
!GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget)) !gtk_widget_get_receives_default (window->focus_widget))
GTK_WIDGET_SET_FLAGS (window->default_widget, GTK_HAS_DEFAULT); GTK_WIDGET_SET_FLAGS (window->default_widget, GTK_HAS_DEFAULT);
gtk_widget_queue_draw (window->default_widget); gtk_widget_queue_draw (window->default_widget);
} }
@ -2000,7 +2000,7 @@ gtk_window_get_focus (GtkWindow *window)
* *
* Activates the default widget for the window, unless the current * Activates the default widget for the window, unless the current
* focused widget has been configured to receive the default action * focused widget has been configured to receive the default action
* (see #GTK_RECEIVES_DEFAULT in #GtkWidgetFlags), in which case the * (see gtk_widget_set_receives_default()), in which case the
* focused widget is activated. * focused widget is activated.
* *
* Return value: %TRUE if a widget got activated. * Return value: %TRUE if a widget got activated.
@ -2011,7 +2011,7 @@ gtk_window_activate_default (GtkWindow *window)
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) && if (window->default_widget && GTK_WIDGET_IS_SENSITIVE (window->default_widget) &&
(!window->focus_widget || !GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget))) (!window->focus_widget || !gtk_widget_get_receives_default (window->focus_widget)))
return gtk_widget_activate (window->default_widget); return gtk_widget_activate (window->default_widget);
else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget)) else if (window->focus_widget && GTK_WIDGET_IS_SENSITIVE (window->focus_widget))
return gtk_widget_activate (window->focus_widget); return gtk_widget_activate (window->focus_widget);
@ -5468,21 +5468,21 @@ gtk_window_real_set_focus (GtkWindow *window,
{ {
g_object_ref (old_focus); g_object_ref (old_focus);
g_object_freeze_notify (G_OBJECT (old_focus)); g_object_freeze_notify (G_OBJECT (old_focus));
old_focus_had_default = GTK_WIDGET_HAS_DEFAULT (old_focus); old_focus_had_default = gtk_widget_has_default (old_focus);
} }
if (focus) if (focus)
{ {
g_object_ref (focus); g_object_ref (focus);
g_object_freeze_notify (G_OBJECT (focus)); g_object_freeze_notify (G_OBJECT (focus));
focus_had_default = GTK_WIDGET_HAS_DEFAULT (focus); focus_had_default = gtk_widget_has_default (focus);
} }
if (window->default_widget) if (window->default_widget)
had_default = GTK_WIDGET_HAS_DEFAULT (window->default_widget); had_default = gtk_widget_has_default (window->default_widget);
if (window->focus_widget) if (window->focus_widget)
{ {
if (GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget) && if (gtk_widget_get_receives_default (window->focus_widget) &&
(window->focus_widget != window->default_widget)) (window->focus_widget != window->default_widget))
{ {
GTK_WIDGET_UNSET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT); GTK_WIDGET_UNSET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT);
@ -5507,10 +5507,10 @@ gtk_window_real_set_focus (GtkWindow *window,
{ {
window->focus_widget = focus; window->focus_widget = focus;
if (GTK_WIDGET_RECEIVES_DEFAULT (window->focus_widget) && if (gtk_widget_get_receives_default (window->focus_widget) &&
(window->focus_widget != window->default_widget)) (window->focus_widget != window->default_widget))
{ {
if (GTK_WIDGET_CAN_DEFAULT (window->focus_widget)) if (gtk_widget_get_can_default (window->focus_widget))
GTK_WIDGET_SET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT); GTK_WIDGET_SET_FLAGS (window->focus_widget, GTK_HAS_DEFAULT);
if (window->default_widget) if (window->default_widget)
@ -5530,12 +5530,12 @@ gtk_window_real_set_focus (GtkWindow *window,
* is harmless. * is harmless.
*/ */
if (window->default_widget && if (window->default_widget &&
(had_default != GTK_WIDGET_HAS_DEFAULT (window->default_widget))) (had_default != gtk_widget_has_default (window->default_widget)))
gtk_widget_queue_draw (window->default_widget); gtk_widget_queue_draw (window->default_widget);
if (old_focus) if (old_focus)
{ {
if (old_focus_had_default != GTK_WIDGET_HAS_DEFAULT (old_focus)) if (old_focus_had_default != gtk_widget_has_default (old_focus))
gtk_widget_queue_draw (old_focus); gtk_widget_queue_draw (old_focus);
g_object_thaw_notify (G_OBJECT (old_focus)); g_object_thaw_notify (G_OBJECT (old_focus));
@ -5543,7 +5543,7 @@ gtk_window_real_set_focus (GtkWindow *window,
} }
if (focus) if (focus)
{ {
if (focus_had_default != GTK_WIDGET_HAS_DEFAULT (focus)) if (focus_had_default != gtk_widget_has_default (focus))
gtk_widget_queue_draw (focus); gtk_widget_queue_draw (focus);
g_object_thaw_notify (G_OBJECT (focus)); g_object_thaw_notify (G_OBJECT (focus));
@ -6619,7 +6619,7 @@ static gint
gtk_window_expose (GtkWidget *widget, gtk_window_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
if (!GTK_WIDGET_APP_PAINTABLE (widget)) if (!gtk_widget_get_app_paintable (widget))
gtk_window_paint (widget, &event->area); gtk_window_paint (widget, &event->area);
if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event) if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event)

2
gtk/tests/builder.c
View File

@ -1624,7 +1624,7 @@ test_widget (void)
builder = builder_new_from_string (buffer2, -1, NULL); builder = builder_new_from_string (buffer2, -1, NULL);
button1 = gtk_builder_get_object (builder, "button1"); button1 = gtk_builder_get_object (builder, "button1");
g_assert (GTK_WIDGET_RECEIVES_DEFAULT (GTK_WIDGET (button1))); g_assert (gtk_widget_get_receives_default (GTK_WIDGET (button1)));
g_object_unref (builder); g_object_unref (builder);

2
modules/engines/ms-windows/msw_style.c
View File

@ -2057,7 +2057,7 @@ draw_box (GtkStyle *style,
} }
else else
{ {
gboolean is_default = GTK_WIDGET_HAS_DEFAULT (widget); gboolean is_default = gtk_widget_has_default (widget);
if (xp_theme_draw if (xp_theme_draw
(window, (window,
is_default ? XP_THEME_ELEMENT_DEFAULT_BUTTON : is_default ? XP_THEME_ELEMENT_DEFAULT_BUTTON :

2
modules/other/gail/gail.c
View File

@ -263,7 +263,7 @@ gail_focus_watcher (GSignalInvocationHint *ihint,
{ {
GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
if (GTK_IS_WIDGET (child) && GTK_WIDGET_HAS_GRAB (child)) if (GTK_IS_WIDGET (child) && gtk_widget_has_grab (child))
{ {
if (GTK_IS_MENU_SHELL (child)) if (GTK_IS_MENU_SHELL (child))
{ {

2
modules/other/gail/gailwidget.c
View File

@ -529,7 +529,7 @@ gail_widget_ref_state_set (AtkObject *accessible)
if (focus_obj == NULL) if (focus_obj == NULL)
atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); atk_state_set_add_state (state_set, ATK_STATE_FOCUSED);
} }
if (GTK_WIDGET_HAS_DEFAULT(widget)) if (gtk_widget_has_default (widget))
{ {
atk_state_set_add_state (state_set, ATK_STATE_DEFAULT); atk_state_set_add_state (state_set, ATK_STATE_DEFAULT);
} }