diff options
author | Daniel Elstner <daniel.elstner@gmx.net> | 2002-06-04 16:12:13 +0000 |
---|---|---|
committer | Daniel Elstner <daniel@src.gnome.org> | 2002-06-04 16:12:13 +0000 |
commit | ba8f8b4dd85409cb5c2df2db7eedbe3b90827512 (patch) | |
tree | e74c12c2cff222cf6a2c6932edab6da974218be4 /gtk/gtkcellrenderertoggle.c | |
parent | 9ad79b6c77e31b288d37b14ee71ce2c67f128d47 (diff) | |
download | gtk+-ba8f8b4dd85409cb5c2df2db7eedbe3b90827512.tar.gz |
[ merge from stable ]
2002-06-04 Daniel Elstner <daniel.elstner@gmx.net>
[ merge from stable ]
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Really fix #83796: Revert jrb's last patch, and move the second if-clause into the fist one's else-branch. This is also what the other cell renderers do.
Diffstat (limited to 'gtk/gtkcellrenderertoggle.c')
-rw-r--r-- | gtk/gtkcellrenderertoggle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index 9a1da63364..3831bfee33 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -304,13 +304,12 @@ gtk_cell_renderer_toggle_render (GtkCellRenderer *cell, else state = GTK_STATE_ACTIVE; } - if (celltoggle->activatable) - { - state |= GTK_STATE_NORMAL; - } else { - state |= GTK_STATE_INSENSITIVE; + if (celltoggle->activatable) + state = GTK_STATE_NORMAL; + else + state = GTK_STATE_INSENSITIVE; } if (celltoggle->radio) |