From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 16 Oct 2008 08:15:56 +0000 (+0000)
Subject: reverted broken changes from r56345 and r56349
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/352cd79f633561e31c1718fbcd64fddbc442cb3c

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 286cc121a6..7be4c61cf3 100644
--- 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 138bcd5bcc..4610c07b01 100644
--- 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 e1be8ff88a..bbbd626e99 100644
--- 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 9eb43e3fc3..7deab1ffa5 100644
--- 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)