diff src/pan-view.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/pan-view.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/pan-view.c	Mon May 10 11:32:56 2010 +0000
@@ -1212,9 +1212,15 @@
 	pr = PIXBUF_RENDERER(pw->imd->pr);
 	fd = pan_menu_click_fd(pw);
 
+#if GTK_CHECK_VERSION(2,20,0)
+	focused = (pw->fs || gtk_widget_has_focus(GTK_WIDGET(pw->imd->widget)));
+	on_entry = (gtk_widget_has_focus(pw->path_entry) ||
+		    gtk_widget_has_focus(pw->search_entry));
+#else
 	focused = (pw->fs || GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(pw->imd->widget)));
 	on_entry = (GTK_WIDGET_HAS_FOCUS(pw->path_entry) ||
 		    GTK_WIDGET_HAS_FOCUS(pw->search_entry));
+#endif
 
 	if (focused)
 		{
@@ -1967,7 +1973,11 @@
 	PanWindow *pw = data;
 	gboolean visible;
 
+#if GTK_CHECK_VERSION(2,20,0)
+	visible = gtk_widget_get_visible(pw->search_box);
+#else
 	visible = GTK_WIDGET_VISIBLE(pw->search_box);
+#endif
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return;
 
 	if (visible)
@@ -1989,7 +1999,11 @@
 
 	if (enable)
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_visible(pw->search_box))
+#else
 		if (GTK_WIDGET_VISIBLE(pw->search_box))
+#endif
 			{
 			gtk_widget_grab_focus(pw->search_entry);
 			}
@@ -2000,9 +2014,17 @@
 		}
 	else
 		{
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_visible(pw->search_entry))
+#else
 		if (GTK_WIDGET_VISIBLE(pw->search_entry))
+#endif
 			{
+#if GTK_CHECK_VERSION(2,20,0)
+			if (gtk_widget_has_focus(pw->search_entry))
+#else
 			if (GTK_WIDGET_HAS_FOCUS(pw->search_entry))
+#endif
 				{
 				gtk_widget_grab_focus(GTK_WIDGET(pw->imd->widget));
 				}