(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 71bc0468d3ba3af893e7a2248ee8560176c0c147..3abc4cb2da6e0151dcaa3d75de6f9659daed0e3c 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -54,6 +54,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
 
 wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
 
 wxTopLevelWindowBase::wxTopLevelWindowBase()
 {

+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;

 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()


@@ -65,7 +67,7 @@ wxTopLevelWindowBase::~wxTopLevelWindowBase()
     bool shouldExit = IsLastBeforeExit();
 
     wxTopLevelWindows.DeleteObject(this);
     bool shouldExit = IsLastBeforeExit();
 
     wxTopLevelWindows.DeleteObject(this);

-
+    

     if ( shouldExit )
     {
         // then do it
     if ( shouldExit )
     {
         // then do it


@@ -80,8 +82,16 @@ bool wxTopLevelWindowBase::Destroy()
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 
     if ( !wxPendingDelete.Member(this) )
         wxPendingDelete.Append(this);
 

-    // but hide it immediately
-    Hide();
+    if (wxTopLevelWindows.GetCount() > 1)
+    {
+        // 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;
 }
 
     return TRUE;
 }


@@ -115,6 +125,30 @@ wxSize wxTopLevelWindowBase::GetMaxSize() const
     return size;
 }
 
     return size;
 }
 

+/* static */
+wxSize wxTopLevelWindowBase::GetDefaultSize()
+{
+    wxSize size = wxGetClientDisplayRect().GetSize();
+
+    // create proportionally bigger windows on small screens
+    if ( size.x >= 1024 )
+        size.x = 400;
+    else if ( size.x >= 800 )
+        size.x = 300;
+    else if ( size.x >= 320 )
+        size.x = 240;
+
+    if ( size.y >= 768 )
+        size.y = 250;
+    else if ( size.y > 200 )
+    {
+        size.y *= 2;
+        size.y /= 3;
+    }
+
+    return size;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow size management: we exclude the areas taken by
 // menu/status/toolbars from the client area, so the client area is what's