fixed GTK critical warning when closing MDI child (patch 529369)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 8f33dbd97b0212fd421323b0dd80855f9afad5b5..dbe2a3a928a2ffbae0245a44e33f2b28da7980ff 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -515,7 +515,11 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     m_isBeingDeleted = TRUE;
     
-    gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
+    // it may also be GtkScrolledWindow in the case of an MDI child
+    if (GTK_IS_WINDOW(m_widget))
+    {
+        gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
+    }
 
     wxTopLevelWindows.DeleteObject( this );
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 8f33dbd97b0212fd421323b0dd80855f9afad5b5..dbe2a3a928a2ffbae0245a44e33f2b28da7980ff 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -515,7 +515,11 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     m_isBeingDeleted = TRUE;
     
-    gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
+    // it may also be GtkScrolledWindow in the case of an MDI child
+    if (GTK_IS_WINDOW(m_widget))
+    {
+        gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );
+    }
 
     wxTopLevelWindows.DeleteObject( this );