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

GtkRadioButton: Set widget state as state flags.

Browse Source
This commit is contained in:
Carlos Garnacho 2010-10-31 14:45:01 +01:00
parent 517eaa55e5
commit 80d1ce9f67
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk/gtkradiobutton.c
View File

@ -217,7 +217,7 @@ gtk_radio_button_init (GtkRadioButton *radio_button)
priv->group = g_slist_prepend (NULL, radio_button); priv->group = g_slist_prepend (NULL, radio_button);
_gtk_button_set_depressed (GTK_BUTTON (radio_button), TRUE); _gtk_button_set_depressed (GTK_BUTTON (radio_button), TRUE);
gtk_widget_set_state (GTK_WIDGET (radio_button), GTK_STATE_ACTIVE); gtk_widget_set_state_flags (GTK_WIDGET (radio_button), GTK_STATE_FLAG_ACTIVE, TRUE);
} }
static void static void
@ -790,7 +790,7 @@ gtk_radio_button_clicked (GtkButton *button)
GtkRadioButtonPrivate *priv = radio_button->priv; GtkRadioButtonPrivate *priv = radio_button->priv;
GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button); GtkToggleButton *toggle_button = GTK_TOGGLE_BUTTON (button);
GtkToggleButton *tmp_button; GtkToggleButton *tmp_button;
GtkStateType new_state; GtkStateFlags new_state = 0;
GSList *tmp_list; GSList *tmp_list;
gint toggled; gint toggled;
gboolean depressed; gboolean depressed;
@ -818,14 +818,19 @@ gtk_radio_button_clicked (GtkButton *button)
if (!tmp_button) if (!tmp_button)
{ {
new_state = (button->priv->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE); if (button->priv->in_button)
new_state |= GTK_STATE_FLAG_PRELIGHT;
new_state |= GTK_STATE_FLAG_ACTIVE;
} }
else else
{ {
toggled = TRUE; toggled = TRUE;
_gtk_toggle_button_set_active (toggle_button, _gtk_toggle_button_set_active (toggle_button,
!gtk_toggle_button_get_active (toggle_button)); !gtk_toggle_button_get_active (toggle_button));
new_state = (button->priv->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
if (button->priv->in_button)
new_state |= GTK_STATE_FLAG_PRELIGHT;
} }
} }
else else
@ -847,7 +852,10 @@ gtk_radio_button_clicked (GtkButton *button)
} }
} }
new_state = (button->priv->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_ACTIVE); if (button->priv->in_button)
new_state |= GTK_STATE_FLAG_PRELIGHT;
new_state |= GTK_STATE_FLAG_ACTIVE;
} }
if (gtk_toggle_button_get_inconsistent (toggle_button)) if (gtk_toggle_button_get_inconsistent (toggle_button))
@ -857,8 +865,8 @@ gtk_radio_button_clicked (GtkButton *button)
else else
depressed = gtk_toggle_button_get_active (toggle_button); depressed = gtk_toggle_button_get_active (toggle_button);
if (gtk_widget_get_state (GTK_WIDGET (button)) != new_state) if (gtk_widget_get_state_flags (GTK_WIDGET (button)) != new_state)
gtk_widget_set_state (GTK_WIDGET (button), new_state); gtk_widget_set_state_flags (GTK_WIDGET (button), new_state, TRUE);
if (toggled) if (toggled)
{ {