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

Hold a reference on m_widget for the life of the associated wxWindow object.

Browse Source 
This allows removing some ugly hacks, and leaking of GtkWidgets by wxNotebook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-26 16:19:23 +00:00
parent 4a693a9b8c
commit 9ff9d30c0a
43 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/window.cpp
View File

@@ -2131,6 +2131,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
gtk_widget_show( m_wxwindow );
}
g_object_ref(m_widget);
if (m_parent)
m_parent->DoAddChild( this );
@@ -2180,17 +2181,17 @@ wxWindowGTK::~wxWindowGTK()
// delete before the widgets to avoid a crash on solaris
delete m_imData;
if (m_wxwindow && (m_wxwindow != m_widget))
{
gtk_widget_destroy( m_wxwindow );
m_wxwindow = (GtkWidget*) NULL;
}
if (m_widget)
{
gtk_widget_destroy( m_widget );
m_widget = (GtkWidget*) NULL;
// Note that gtk_widget_destroy() does not destroy the widget, it just
// emits the "destroy" signal. The widget is not actually destroyed
// until its reference count drops to zero.
gtk_widget_destroy(m_widget);
// Release our reference, should be the last one
g_object_unref(m_widget);
m_widget = NULL;
}
m_wxwindow = NULL;
}
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )