Improve standard button spacing on Windows

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 7aba62adf9b6e35f55b7b3335679e059e7438cac..0146f40ab4553fe2d3f93eb6b4cff17f4bda493d 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()
@@ -80,20 +82,18 @@ 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;
+    return true;
 }
 
 bool wxTopLevelWindowBase::IsLastBeforeExit() const
@@ -109,6 +109,12 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
 // wxTopLevelWindow geometry
 // ----------------------------------------------------------------------------
 
+void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+{
+    GetPosition(x,y);
+    GetSize(w,h);
+}
+
 wxSize wxTopLevelWindowBase::GetMaxSize() const
 {
     wxSize  size( GetMaxWidth(), GetMaxHeight() );
@@ -116,15 +122,39 @@ wxSize wxTopLevelWindowBase::GetMaxSize() const
 
     wxClientDisplayRect( 0, 0, &w, &h );
 
-    if( size.GetWidth() == -1 )
+    if( size.GetWidth() == wxDefaultCoord )
         size.SetWidth( w );
 
-    if( size.GetHeight() == -1 )
+    if( size.GetHeight() == wxDefaultCoord )
         size.SetHeight( h );
 
     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
@@ -163,7 +193,7 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
 
 // default resizing behaviour - if only ONE subwindow, resize to fill the
 // whole client area
-void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxTopLevelWindowBase::DoLayout()
 {
     // if we're using constraints or sizers - do use them
     if ( GetAutoLayout() )
@@ -233,7 +263,7 @@ void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
     if ( event.GetSetEnabled() )
         Enable(event.GetEnabled());
-    
+
     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetTitle() )
@@ -241,4 +271,9 @@ void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
     }
 }
 
-// vi:sts=4:sw=4:et
+void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))
+{
+    // it's probably better than do nothing, isn't it?
+    Raise();
+}
+