AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for GTK assert after r72696, a draw/expose_event signal may also be attached to parent

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2012-11-26 17:53:01 +00:00
parent f0facad09d
commit eaa8686b71
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@ -2396,10 +2396,15 @@ wxWindowGTK::~wxWindowGTK()
g_captureWindow = NULL;
}
if (m_widget)
GTKDisconnect(m_widget);
if (m_wxwindow && m_wxwindow != m_widget)
if (m_wxwindow)
{
GTKDisconnect(m_wxwindow);
GtkWidget* parent = gtk_widget_get_parent(m_wxwindow);
if (parent)
GTKDisconnect(parent);
}
if (m_widget && m_widget != m_wxwindow)
GTKDisconnect(m_widget);
// destroy children before destroying this window itself
DestroyChildren();