reverted broken changes from r56345 and r56349

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 286cc121a66c7800585cd553bdc540ea16af57bd..7be4c61cf3c86712f120846056e685e87a29d5ec 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -105,12 +105,6 @@ void gtk_window_set_policy (GtkWindow *window,
 } // extern "C"
 
 
-// some newer functions not available in older versions of GTK+:
-#if !GTK_CHECK_VERSION(2,9,0)
-#define g_object_ref_sink(x) gtk_object_sink(GTK_OBJECT(x))
-#endif
-
-
 // ----------------------------------------------------------------------------
 // various private helper functions
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 138bcd5bcc220ce4df90c452ba03dbe4090e6ef7..4610c07b01323fde08ed195bf99d005f2b1595ba 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -1914,7 +1914,7 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
         delete m_dc;
 
     if (m_text_renderer)
-        g_object_ref_sink(m_text_renderer);
+        gtk_object_sink( GTK_OBJECT(m_text_renderer) );
 }
 
 wxDC *wxDataViewCustomRenderer::GetDC()

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index e1be8ff88acf4626a545fbfed5f4b0d98c66a594..bbbd626e99e3d7987206b5f2ea1723fa2f2f51d7 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -706,7 +706,7 @@ void wxMenu::Init()
     // NB: keep reference to the menu so that it is not destroyed behind
     //     our back by GTK+ e.g. when it is removed from menubar:
     g_object_ref(m_menu);
-    g_object_ref_sink(m_menu);
+    gtk_object_sink(GTK_OBJECT(m_menu));
 
     m_owner = (GtkWidget*) NULL;
 

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 9eb43e3fc3d4e5726c71738203b7cc8bc4499f03..7deab1ffa54a348cc79ab1faf4a150184c0b8cf3 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -378,7 +378,7 @@ bool wxToolBar::Create( wxWindow *parent,
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     m_tooltips = gtk_tooltips_new();
     g_object_ref(m_tooltips);
-    g_object_ref_sink(m_tooltips);
+    gtk_object_sink(GTK_OBJECT(m_tooltips));
     GtkSetStyle();
 
     if (style & wxTB_DOCKABLE)