From 9d432c2f96d98dbea6f4a6ed0f1fabfbaacecbef Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Tue, 4 Jun 2002 16:06:39 +0000 Subject: [PATCH] Really fix #83796: Revert jrb's last patch, and move the second if-clause 2002-06-04 Daniel Elstner * 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. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkcellrenderertoggle.c | 9 ++++----- 7 files changed, 46 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 707635b8eb..611177a74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 707635b8eb..611177a74a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 707635b8eb..611177a74a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 707635b8eb..611177a74a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 707635b8eb..611177a74a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 707635b8eb..611177a74a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-06-04 Daniel Elstner + + * 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. + 2002-06-03 Federico Mena Quintero * gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case. 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)