Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted broken changes from r56345 and r56349

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-10-16 08:15:56 +00:00
parent e261c9e2af
commit 352cd79f63
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/private.h
View File

@@ -105,12 +105,6 @@ void gtk_window_set_policy (GtkWindow *window,
} // extern "C" } // 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 // various private helper functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/gtk/dataview.cpp
View File

@@ -1914,7 +1914,7 @@ wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
delete m_dc; delete m_dc;
if (m_text_renderer) if (m_text_renderer)
g_object_ref_sink(m_text_renderer); gtk_object_sink( GTK_OBJECT(m_text_renderer) );
} }
wxDC *wxDataViewCustomRenderer::GetDC() wxDC *wxDataViewCustomRenderer::GetDC()

2
src/gtk/menu.cpp
View File

@@ -706,7 +706,7 @@ void wxMenu::Init()
// NB: keep reference to the menu so that it is not destroyed behind // 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: // our back by GTK+ e.g. when it is removed from menubar:
g_object_ref(m_menu); g_object_ref(m_menu);
g_object_ref_sink(m_menu); gtk_object_sink(GTK_OBJECT(m_menu));
m_owner = (GtkWidget*) NULL; m_owner = (GtkWidget*) NULL;

2
src/gtk/tbargtk.cpp
View File

@@ -378,7 +378,7 @@ bool wxToolBar::Create( wxWindow *parent,
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
m_tooltips = gtk_tooltips_new(); m_tooltips = gtk_tooltips_new();
g_object_ref(m_tooltips); g_object_ref(m_tooltips);
g_object_ref_sink(m_tooltips); gtk_object_sink(GTK_OBJECT(m_tooltips));
GtkSetStyle(); GtkSetStyle();
if (style & wxTB_DOCKABLE) if (style & wxTB_DOCKABLE)