forked from AuroraMiddleware/gtk
[ 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.
This commit is contained in:
parent
9ad79b6c77
commit
ba8f8b4dd8
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -1,3 +1,12 @@
|
||||
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.
|
||||
|
@ -1,3 +1,12 @@
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user