Commit ba8f8b4d authored by Daniel Elstner's avatar Daniel Elstner Committed by Daniel Elstner

[ 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.
parent 9ad79b6c
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
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.
2002-06-03 Federico Mena Quintero <federico@ximian.com>
* gdk/gdkpixbuf-drawable.c (rgb565msb): Fix the MSB -> MSB case.
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment