diff src/cellrenderericon.c @ 1810:c416d099a3dc

GTK marks several functions as deprecated The following functions has been replaced and deprecated by version 2.20: - GTK_WIDGET_CAN_FOCUS - GTK_WIDGET_DRAWABLE - GTK_WIDGET_HAS_FOCUS - GTK_WIDGET_HAS_GRAB - GTK_WIDGET_IS_SENSITIVE - GTK_WIDGET_NO_WINDOW - GTK_WIDGET_REALIZED - GTK_WIDGET_SENSITIVE - GTK_WIDGET_STATE - GTK_WIDGET_TOPLEVEL - GTK_WIDGET_VISIBLE

--- a/src/cellrenderericon.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/cellrenderericon.c	Mon May 10 11:32:56 2010 +0000
@@ -20,6 +20,7 @@
  */
 
 #include <stdlib.h>
+#include <gtk/gtk.h> /* To define GTK_CHECK_VERSION */
 #include "cellrenderericon.h"
 #include "intl.h"
 
@@ -646,14 +647,22 @@
 
 	if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_has_focus(widget))
+#else
 		if (GTK_WIDGET_HAS_FOCUS(widget))
+#endif
 			state = GTK_STATE_SELECTED;
 		else
 			state = GTK_STATE_ACTIVE;
 		}
 	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;
@@ -756,7 +765,11 @@
 			}
                 }
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (cellicon->focused && gtk_widget_has_focus(widget))
+#else
 	if (cellicon->focused && GTK_WIDGET_HAS_FOCUS(widget))
+#endif
 		{
 		gtk_paint_focus(widget->style, window,
 				state,