cleanup in toplevel activation, and switching to native carbon event notification...

[wxWidgets.git] / src / common / toplvcmn.cpp

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 7aba62adf9b6e35f55b7b3335679e059e7438cac..6ff702eff319dbc9e5424573295809113f9740e3 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -54,6 +54,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
 
 wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
@@ -65,7 +67,7 @@ wxTopLevelWindowBase::~wxTopLevelWindowBase()
     bool shouldExit = IsLastBeforeExit();
 
     wxTopLevelWindows.DeleteObject(this);
-
+    
     if ( shouldExit )
     {
         // then do it
@@ -80,17 +82,15 @@ bool wxTopLevelWindowBase::Destroy()
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 
-    // but hide it immediately
-    Hide();
-
-    // also remove it from the list of parents children so that the loop in
-    // wxWindowBase::DestroyChildren() eventually terminates
-    if ( m_parent )
+    if (wxTopLevelWindows.GetCount() > 1)
     {
-        m_parent->RemoveChild(this);
-
-        // don't do it again in our dtor
-        m_parent = NULL;
+        // Hide it immediately. This should
+        // not be done if this TLW is the
+        // only one left since we then would
+        // risk not to get any idle events
+        // at all anymore during which we 
+        // could delete any pending events.
+        Hide();
     }
 
     return TRUE;