From ba8f8b4dd85409cb5c2df2db7eedbe3b90827512 Mon Sep 17 00:00:00 2001
From: Daniel Elstner <daniel.elstner@gmx.net>
Date: Tue, 4 Jun 2002 16:12:13 +0000
Subject: [ 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.
---
gtk/gtkcellrenderertoggle.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'gtk/gtkcellrenderertoggle.c')
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)
--
cgit v1.2.1