diff options
| -rw-r--r-- | gtk/gtkcellrenderertoggle.c | 3 | ||||
| -rw-r--r-- | gtk/gtkcheckbutton.c | 3 | ||||
| -rw-r--r-- | gtk/gtkcheckmenuitem.c | 2 | ||||
| -rw-r--r-- | gtk/gtkradiobutton.c | 3 | ||||
| -rw-r--r-- | gtk/gtktogglebutton.c | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index 64c01f272b..282d8f060a 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -390,7 +390,8 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell, if (priv->inconsistent) state |= GTK_STATE_FLAG_INCONSISTENT; - else if (priv->active) + + if (priv->active) state |= GTK_STATE_FLAG_CHECKED; cairo_save (cr); diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index f395dcc7c4..89ce961d1e 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -566,7 +566,8 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button, if (gtk_toggle_button_get_inconsistent (toggle_button)) state |= GTK_STATE_FLAG_INCONSISTENT; - else if (gtk_toggle_button_get_active (toggle_button)) + + if (gtk_toggle_button_get_active (toggle_button)) state |= GTK_STATE_FLAG_CHECKED; if (button->priv->activate_timeout || (button->priv->button_down && button->priv->in_button)) diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index a32651582a..9e61306c8c 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -575,7 +575,7 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item, if (priv->inconsistent) state |= GTK_STATE_FLAG_INCONSISTENT; - else if (priv->active) + if (priv->active) state |= GTK_STATE_FLAG_CHECKED; gtk_style_context_set_state (context, state); diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index abf4e3cddd..6d3dec3a24 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -873,7 +873,8 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button, if (gtk_toggle_button_get_inconsistent (toggle_button)) state |= GTK_STATE_FLAG_INCONSISTENT; - else if (gtk_toggle_button_get_active (toggle_button)) + + if (gtk_toggle_button_get_active (toggle_button)) state |= GTK_STATE_FLAG_CHECKED; if (button->priv->activate_timeout || diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 193021b529..1a0580e488 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -661,7 +661,8 @@ gtk_toggle_button_update_state (GtkButton *button) if (priv->inconsistent) new_state |= GTK_STATE_FLAG_INCONSISTENT; - else if (priv->active) + + if (priv->active) new_state |= GTK_STATE_FLAG_CHECKED; if (button->priv->in_button && button->priv->button_down) |