From eaa8686b7192641931947c29337d555890d9836a Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Mon, 26 Nov 2012 17:53:01 +0000 Subject: [PATCH] fix for GTK assert after r72696, a draw/expose_event signal may also be attached to parent git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index ca7409a761..2fe5fc38ba 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -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(); -- 2.45.2