(trunk gtk) add portability wrapper for gtk_widget_get_realized() in gtk+ < 2.20

diff --git a/gtk/tr-window.c b/gtk/tr-window.c
index ecaf5821fada534bc22b2024a282673156e5cb48..004d7a31d5783682b7cd14961fe68ccffb7749c7 100644 (file)
--- a/gtk/tr-window.c
+++ b/gtk/tr-window.c
@@ -888,7 +888,7 @@ tr_window_get_selection( TrWindow * w )
 void
 tr_window_set_busy( TrWindow * w, gboolean isBusy )
 {
-    if( w && gtk_widget_get_realized( GTK_WIDGET( w ) ) )
+    if( w && gtr_widget_get_realized( GTK_WIDGET( w ) ) )
     {    
         GdkDisplay * display = gtk_widget_get_display( GTK_WIDGET( w ) );
         GdkCursor * cursor = isBusy ? gdk_cursor_new_for_display( display, GDK_WATCH ) : NULL;

diff --git a/gtk/util.c b/gtk/util.c
index ddf53a0add8da3c9e4d4dfa8477eca4266a6cdf9..b3f9961d21b81f9eeffca5115dfaf73a812514c6 100644 (file)
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -716,6 +716,16 @@ gtr_widget_set_tooltip_text( GtkWidget * w, const char * tip )
 #endif
 }
 
+gboolean
+gtr_widget_get_realized( GtkWidget * w )
+{
+#if GTK_CHECK_VERSION( 2,20,0 )
+    return gtk_widget_get_realized( w );
+#else
+    return GTK_WIDGET_REALIZED( w ) != 0;
+#endif
+}
+
 void
 gtr_toolbar_set_orientation( GtkToolbar      * toolbar,
                              GtkOrientation    orientation )
@@ -727,6 +737,7 @@ gtr_toolbar_set_orientation( GtkToolbar      * toolbar,
 #endif
 }
 
+
 /***
 ****
 ***/

diff --git a/gtk/util.h b/gtk/util.h
index 23f18638a3601efb54caacae27ddfaff38012ce5..73d11683ee0a8e71278777bb78488a175efae135 100644 (file)
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -128,6 +128,9 @@ void gtr_toolbar_set_orientation( GtkToolbar * tb, GtkOrientation orientation );
 /* backwards-compatible wrapper around gtk_widget_set_tooltip_text() */
 void gtr_widget_set_tooltip_text( GtkWidget * w, const char * tip );
 
+/* backwards-compatible wrapper around gtk_widget_get_realized() */
+gboolean gtr_widget_get_realized( GtkWidget * w );
+
 /* backwards-compatible wrapper around g_object_ref_sink() */
 gpointer gtr_object_ref_sink( gpointer object );