AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_RECEIVES_DEFAULT)

Browse Source 
Use new API instead: gtk_widget_set_receives_default ()
This commit is contained in:
Javier Jardón 2010-03-01 17:41:37 +01:00
parent b4b95d07f8
commit b909abaa62
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkbutton.c
View File

@ -540,7 +540,8 @@ gtk_button_init (GtkButton *button)
{ {
GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button); GtkButtonPrivate *priv = GTK_BUTTON_GET_PRIVATE (button);
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_FOCUS | GTK_RECEIVES_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_FOCUS);
gtk_widget_set_receives_default (GTK_WIDGET (button), TRUE);
GTK_WIDGET_SET_FLAGS (button, GTK_NO_WINDOW); GTK_WIDGET_SET_FLAGS (button, GTK_NO_WINDOW);
button->label_text = NULL; button->label_text = NULL;

2
gtk/gtkcheckbutton.c
View File

@ -86,7 +86,7 @@ static void
gtk_check_button_init (GtkCheckButton *check_button) gtk_check_button_init (GtkCheckButton *check_button)
{ {
GTK_WIDGET_SET_FLAGS (check_button, GTK_NO_WINDOW); GTK_WIDGET_SET_FLAGS (check_button, GTK_NO_WINDOW);
GTK_WIDGET_UNSET_FLAGS (check_button, GTK_RECEIVES_DEFAULT); gtk_widget_set_receives_default (GTK_WIDGET (check_button), FALSE);
GTK_TOGGLE_BUTTON (check_button)->draw_indicator = TRUE; GTK_TOGGLE_BUTTON (check_button)->draw_indicator = TRUE;
GTK_BUTTON (check_button)->depress_on_activate = FALSE; GTK_BUTTON (check_button)->depress_on_activate = FALSE;
} }

3
gtk/gtkoptionmenu.c
View File

@ -187,7 +187,8 @@ static void
gtk_option_menu_init (GtkOptionMenu *option_menu) gtk_option_menu_init (GtkOptionMenu *option_menu)
{ {
GTK_WIDGET_SET_FLAGS (option_menu, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (option_menu, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (option_menu, GTK_CAN_DEFAULT | GTK_RECEIVES_DEFAULT); GTK_WIDGET_UNSET_FLAGS (option_menu, GTK_CAN_DEFAULT);
gtk_widget_set_receives_default (GTK_WIDGET (option_menu), FALSE);
option_menu->menu = NULL; option_menu->menu = NULL;
option_menu->menu_item = NULL; option_menu->menu_item = NULL;

2
gtk/gtkradiobutton.c
View File

@ -119,7 +119,7 @@ static void
gtk_radio_button_init (GtkRadioButton *radio_button) gtk_radio_button_init (GtkRadioButton *radio_button)
{ {
GTK_WIDGET_SET_FLAGS (radio_button, GTK_NO_WINDOW); GTK_WIDGET_SET_FLAGS (radio_button, GTK_NO_WINDOW);
GTK_WIDGET_UNSET_FLAGS (radio_button, GTK_RECEIVES_DEFAULT); gtk_widget_set_receives_default (GTK_WIDGET (radio_button), FALSE);
GTK_TOGGLE_BUTTON (radio_button)->active = TRUE; GTK_TOGGLE_BUTTON (radio_button)->active = TRUE;

4
gtk/gtkwidget.c
View File

@ -5651,9 +5651,9 @@ gtk_widget_set_receives_default (GtkWidget *widget,
if (receives_default != gtk_widget_get_receives_default (widget)) if (receives_default != gtk_widget_get_receives_default (widget))
{ {
if (receives_default) if (receives_default)
GTK_WIDGET_SET_FLAGS (widget, GTK_RECEIVES_DEFAULT); GTK_OBJECT_FLAGS (widget) |= GTK_RECEIVES_DEFAULT;
else else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_RECEIVES_DEFAULT); GTK_OBJECT_FLAGS (widget) &= ~(GTK_RECEIVES_DEFAULT);
g_object_notify (G_OBJECT (widget), "receives-default"); g_object_notify (G_OBJECT (widget), "receives-default");
} }