diff src/ui_misc.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/ui_misc.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/ui_misc.c	Mon May 10 11:32:56 2010 +0000
@@ -551,7 +551,11 @@
 {
 	GtkWidget *widget = data;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
+#else
 	gtk_widget_set_sensitive(widget, GTK_WIDGET_IS_SENSITIVE(watch));
+#endif
 }
 
 void pref_link_sensitivity(GtkWidget *widget, GtkWidget *watch)
@@ -876,7 +880,11 @@
 {
 	if (!ds->window) return;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (gtk_widget_has_grab(ds->window))
+#else
 	if (GTK_WIDGET_HAS_GRAB(ds->window))
+#endif
 		{
 		gtk_grab_remove(ds->window);
 		gdk_keyboard_ungrab(GDK_CURRENT_TIME);
@@ -1289,7 +1297,11 @@
 
 	if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(sd->sizer))
+#else
 	if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(sd->sizer))
+#endif
 		{
 		gtk_grab_remove(sd->sizer);
 		gdk_pointer_ungrab(bevent->time);