diff src/collect-table.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/collect-table.c	Sun Feb 28 22:55:37 2010 +0000
+++ b/src/collect-table.c	Mon May 10 11:32:56 2010 +0000
@@ -537,7 +537,11 @@
 
 	gdk_window_get_pointer(NULL, &x, &y, NULL);
 
+#if GTK_CHECK_VERSION(2,20,0)
+	if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
+#else
 	if (!GTK_WIDGET_REALIZED(ct->tip_window)) gtk_widget_realize(ct->tip_window);
+#endif
 	gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
 	gtk_widget_show(ct->tip_window);
 }
@@ -1550,7 +1554,11 @@
 					layout_image_set_collection(NULL, ct->cd, info);
 					}
 				}
+#if GTK_CHECK_VERSION(2,20,0)
+			else if (!gtk_widget_has_focus(ct->listview))
+#else
 			else if (!GTK_WIDGET_HAS_FOCUS(ct->listview))
+#endif
 				{
 				gtk_widget_grab_focus(ct->listview);
 				}
@@ -1716,7 +1724,11 @@
 							     "show_text", ct->show_text, NULL);
 				}
 			}
+#if GTK_CHECK_VERSION(2,20,0)
+		if (gtk_widget_get_realized(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
+#else
 		if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
+#endif
 		}
 
 	row = -1;