diff src/layout_util.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/layout_util.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/layout_util.c	Mon May 10 11:32:56 2010 +0000
@@ -89,7 +89,11 @@
 	gint x = 0;
 	gint y = 0;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (lw->path_entry && gtk_widget_has_focus(lw->path_entry))
+#else
 	if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
+#endif
 		{
 		if (event->keyval == GDK_Escape && lw->dir_fd)
 			{
@@ -104,7 +108,11 @@
 			return TRUE;
 			}
 		}
+#if GTK_CHECK_VERSION(2,20,0)
+	if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && gtk_widget_has_focus(lw->vd->view) &&
+#else
 	if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) &&
+#endif
 	    !layout_key_match(event->keyval) &&
 	    gtk_widget_event(lw->vd->view, (GdkEvent *)event))
 		{
@@ -123,7 +131,11 @@
 */
 
 	if (lw->image &&
+#if GTK_CHECK_VERSION(2,20,0)
+	    (gtk_widget_has_focus(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) )
+#else
 	    (GTK_WIDGET_HAS_FOCUS(lw->image->widget) || (lw->tools && widget == lw->window) || lw->full_screen) )
+#endif
 		{
 		stop_signal = TRUE;
 		switch (event->keyval)
@@ -2393,7 +2405,11 @@
 
 static gboolean layout_bar_enabled(LayoutWindow *lw)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+	return lw->bar && gtk_widget_get_visible(lw->bar);
+#else
 	return lw->bar && GTK_WIDGET_VISIBLE(lw->bar);
+#endif
 }
 
 static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
@@ -2486,7 +2502,11 @@
 
 static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
 {
+#if GTK_CHECK_VERSION(2,20,0)
+	return lw->bar_sort && gtk_widget_get_visible(lw->bar_sort);
+#else
 	return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort);
+#endif
 }