[libegg] Ifdef GTK_WIDGET_STATE for compiling with -DGSEAL_ENABLE. See bug 615348.



commit 4e51b152336f4cddadda644b4d50809fca20e96b
Author: Andre Klapper <a9016009 gmx de>
Date:   Sat Apr 10 14:10:57 2010 +0200

    Ifdef GTK_WIDGET_STATE for compiling with -DGSEAL_ENABLE. See bug 615348.

 libegg/dock/egg-dock-item-grip.c              |    8 ++++++++
 libegg/dock/egg-dock-item.c                   |    9 +++++++++
 libegg/treeviewutils/egg-cell-renderer-text.c |    4 ++++
 3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item-grip.c b/libegg/dock/egg-dock-item-grip.c
index d373c73..ea8bf4e 100644
--- a/libegg/dock/egg-dock-item-grip.c
+++ b/libegg/dock/egg-dock-item-grip.c
@@ -52,7 +52,11 @@ egg_dock_item_grip_expose (GtkWidget      *widget,
 
     gtk_paint_handle (widget->style,
                       widget->window,
+#if GTK_CHECK_VERSION(2,20,0)
+                      gtk_widget_get_state (widget),
+#else
                       GTK_WIDGET_STATE (widget),
+#endif
                       shadow,
                       clip, widget, "dockitem",
                       rect->x, rect->y, rect->width, rect->height, 
@@ -75,7 +79,11 @@ egg_dock_item_grip_expose (GtkWidget      *widget,
         focus.height -= 2 * (widget->style->xthickness + focus_pad);
 		
         gtk_paint_focus (widget->style, widget->window,
+#if GTK_CHECK_VERSION(2,20,0)
+                         gtk_widget_get_state (widget),
+#else
                          GTK_WIDGET_STATE (widget),
+#endif
                          clip, widget, "dockitem",
                          focus.x, focus.y,
                          focus.width, focus.height);
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 6632095..5cc9ac2 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -807,8 +807,13 @@ egg_dock_item_realize (GtkWidget *widget)
     gdk_window_set_user_data (widget->window, widget);
   
     widget->style = gtk_style_attach (widget->style, widget->window);
+#if GTK_CHECK_VERSION(2,20,0)
+    gtk_style_set_background (widget->style, widget->window, 
+                              gtk_widget_get_state (item));
+#else
     gtk_style_set_background (widget->style, widget->window, 
                               GTK_WIDGET_STATE (item));
+#endif
     gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
 
     if (item->child)
@@ -848,7 +853,11 @@ egg_dock_item_paint (GtkWidget      *widget,
 
     gtk_paint_box (widget->style,
                    widget->window,
+#if GTK_CHECK_VERSION(2,20,0)
+                   gtk_widget_get_state (widget),
+#else
                    GTK_WIDGET_STATE (widget),
+#endif
                    GTK_SHADOW_NONE,
                    &event->area, widget,
                    "dockitem",
diff --git a/libegg/treeviewutils/egg-cell-renderer-text.c b/libegg/treeviewutils/egg-cell-renderer-text.c
index d135657..e7afefa 100644
--- a/libegg/treeviewutils/egg-cell-renderer-text.c
+++ b/libegg/treeviewutils/egg-cell-renderer-text.c
@@ -98,7 +98,11 @@ egg_cell_renderer_text_render (GtkCellRenderer    *cell,
 	}
 	else
 	{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+#else
 		if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
+#endif
 			state = GTK_STATE_INSENSITIVE;
 		else
 			state = GTK_STATE_NORMAL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]