X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65afac3fbc6115b899045d767af823fc3abd7322..e319bb30f7e88242f56144fcc279b57047566a6b:/src/common/toplvcmn.cpp?ds=sidebyside

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 8441f436eb..45ad2fc6fb 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -23,8 +23,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/toplevel.h"
     #include "wx/dcclient.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP
@@ -54,6 +55,8 @@ wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
     // Unlike windows, top level windows are created hidden by default.
     m_isShown = false;
+    m_winDefault = NULL;
+    m_winTmpDefault = NULL;
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
@@ -137,26 +140,37 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
 // wxTopLevelWindow geometry
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
 {
-    GetPosition(x,y);
-    GetSize(w,h);
+    SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() );    
 }
 
-wxSize wxTopLevelWindowBase::GetMaxSize() const
+void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
 {
-    wxSize  size( GetMaxWidth(), GetMaxHeight() );
-    int     w, h;
-
-    wxClientDisplayRect( 0, 0, &w, &h );
-
-    if( size.GetWidth() == wxDefaultCoord )
-        size.SetWidth( w );
+    SetSizeHints( GetMinWidth(), GetMinHeight(), maxSize.x, maxSize.y );
+}
 
-    if( size.GetHeight() == wxDefaultCoord )
-        size.SetHeight( h );
+// set the min/max size of the window
+void wxTopLevelWindowBase::DoSetSizeHints(int minW, int minH,
+                                  int maxW, int maxH,
+                                  int WXUNUSED(incW), int WXUNUSED(incH))
+{
+    // setting min width greater than max width leads to infinite loops under
+    // X11 and generally doesn't make any sense, so don't allow it
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
+                 _T("min width/height must be less than max width/height!") );
+
+    m_minWidth = minW;
+    m_maxWidth = maxW;
+    m_minHeight = minH;
+    m_maxHeight = maxH;
+}
 
-    return size;
+void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+{
+    GetPosition(x,y);
+    GetSize(w,h);
 }
 
 /* static */
@@ -185,6 +199,11 @@ wxSize wxTopLevelWindowBase::GetDefaultSize()
 
 void wxTopLevelWindowBase::DoCentre(int dir)
 {
+    // on some platforms centering top level windows is impossible
+    // because they are always maximized by guidelines or limitations
+    if(IsAlwaysMaximized())
+        return;
+
     // we need the display rect anyhow so store it first
     int nDisplay = wxDisplay::GetFromWindow(this);
     wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
@@ -202,8 +221,8 @@ void wxTopLevelWindowBase::DoCentre(int dir)
         // parent frame under Mac but could happen elsewhere too if the frame
         // was hidden/moved away for some reason), don't use it as otherwise
         // this window wouldn't be visible at all
-        if ( !rectDisplay.Inside(rectParent.GetTopLeft()) &&
-                !rectParent.Inside(rectParent.GetBottomRight()) )
+        if ( !rectDisplay.Contains(rectParent.GetTopLeft()) &&
+                !rectParent.Contains(rectParent.GetBottomRight()) )
         {
             // this is enough to make IsEmpty() test below pass
             rectParent.width = 0;
@@ -227,9 +246,9 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     // we don't want to place the window off screen if Centre() is called as
     // this is (almost?) never wanted and it would be very difficult to prevent
     // it from happening from the user code if we didn't check for it here
-    if ( rectDisplay.Inside(rect.GetTopLeft()) )
+    if ( rectDisplay.Contains(rect.GetTopLeft()) )
     {
-        if ( !rectDisplay.Inside(rect.GetBottomRight()) )
+        if ( !rectDisplay.Contains(rect.GetBottomRight()) )
         {
             // check if we can move the window so that the bottom right corner
             // is visible without hiding the top left one
@@ -286,6 +305,14 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
     wxWindow::DoClientToScreen(x, y);
 }
 
+bool wxTopLevelWindowBase::IsAlwaysMaximized() const
+{
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    return true;
+#else
+    return false;
+#endif
+}
 
 // ----------------------------------------------------------------------------
 // event handlers
@@ -325,7 +352,7 @@ void wxTopLevelWindowBase::DoLayout()
         }
 
         // do we have any children at all?
-        if ( child )
+        if ( child && child->IsShown() )
         {
             // exactly one child - set it's size to fill the whole frame
             int clientW, clientH;
@@ -334,12 +361,18 @@ void wxTopLevelWindowBase::DoLayout()
             // for whatever reasons, wxGTK wants to have a small offset - it
             // probably looks better with it?
 #ifdef __WXGTK__
-            static const int ofs = 1;
+            const int ofs = 1;
+            clientW -= 2 * ofs;
+            clientH -= 2 * ofs;
+            if (clientW < 0)
+                clientW = 0;
+            if (clientH < 0)
+                clientH = 0;
 #else
-            static const int ofs = 0;
+            const int ofs = 0;
 #endif
 
-            child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
+            child->SetSize(ofs, ofs, clientW, clientH);
         }
     }
 }
@@ -379,3 +412,14 @@ void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))
     // it's probably better than do nothing, isn't it?
     Raise();
 }
+
+void wxTopLevelWindowBase::RemoveChild(wxWindowBase *child)
+{
+    if ( child == m_winDefault )
+        m_winDefault = NULL;
+
+    if ( child == m_winTmpDefault )
+        m_winTmpDefault = NULL;
+
+    wxWindow::RemoveChild(child);
+}