comparison gtk/gtkcellrendererexpander.c @ 14657:38d1052611bc

[gaim-migrate @ 17403] I don't think this crashes any more than it did before and it does now compile with older Gtk versions. Thanks to Sadrul for the patch. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 30 Sep 2006 02:44:03 +0000
parents f407d80a618c
children a413bcb6f19a
comparison
equal deleted inserted replaced
14656:d1a76ccb93c4 14657:38d1052611bc
26 26
27 /* This is taken largely from GtkCellRenderer[Text|Pixbuf|Toggle] by 27 /* This is taken largely from GtkCellRenderer[Text|Pixbuf|Toggle] by
28 * Jonathon Blandford <jrb@redhat.com> for RedHat, Inc. 28 * Jonathon Blandford <jrb@redhat.com> for RedHat, Inc.
29 */ 29 */
30 30
31 #include <gtk/gtk.h>
31 #include <gtk/gtktreeview.h> 32 #include <gtk/gtktreeview.h>
32 #include "gtkcellrendererexpander.h" 33 #include "gtkcellrendererexpander.h"
33 34
34 static void gaim_gtk_cell_renderer_expander_get_property (GObject *object, 35 static void gaim_gtk_cell_renderer_expander_get_property (GObject *object,
35 guint param_id, 36 guint param_id,
243 return; 244 return;
244 245
245 width = cell_area->width; 246 width = cell_area->width;
246 height = cell_area->height; 247 height = cell_area->height;
247 248
249 #if GTK_CHECK_VERSION(2,6,0)
248 if (!cell->sensitive) 250 if (!cell->sensitive)
249 state = GTK_STATE_INSENSITIVE; 251 state = GTK_STATE_INSENSITIVE;
252 #else
253 if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE)
254 state = GTK_STATE_INSENSITIVE;
255 #endif
250 else if (flags & GTK_CELL_RENDERER_PRELIT) 256 else if (flags & GTK_CELL_RENDERER_PRELIT)
251 state = GTK_STATE_PRELIGHT; 257 state = GTK_STATE_PRELIGHT;
252 else if (GTK_WIDGET_HAS_FOCUS (widget) && flags & GTK_CELL_RENDERER_SELECTED) 258 else if (GTK_WIDGET_HAS_FOCUS (widget) && flags & GTK_CELL_RENDERER_SELECTED)
253 state = GTK_STATE_ACTIVE; 259 state = GTK_STATE_ACTIVE;
254 else 260 else