1. added wxAssertIsEqual() function to be used in wxASSERT()

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index c49530577e928e6cce07a9d9eca16145941fc847..8735020e9bcc7672e57e457de0a8fee312f04441 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -196,7 +196,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
             size.x = rwidth;
         }
     }
             size.x = rwidth;
         }
     }

-    
+

     // This is what GetPosition() returns. Since we calculate
     // borders afterwards, GetPosition() will be the left/top
     // corner of the surrounding border.
     // This is what GetPosition() returns. Since we calculate
     // borders afterwards, GetPosition() will be the left/top
     // corner of the surrounding border.


@@ -355,7 +355,13 @@ bool wxSizer::Remove( int pos )
 
 void wxSizer::Fit( wxWindow *window )
 {
 
 void wxSizer::Fit( wxWindow *window )
 {

-    window->SetSize( GetMinWindowSize( window ) );
+    wxSize size;
+    if (window->IsTopLevel())
+        size = FitSize( window );
+    else
+        size = GetMinWindowSize( window );
+
+    window->SetSize( size );

 }
 
 void wxSizer::Layout()
 }
 
 void wxSizer::Layout()


@@ -366,10 +372,27 @@ void wxSizer::Layout()
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {
 
 void wxSizer::SetSizeHints( wxWindow *window )
 {

-    wxSize size( GetMinWindowSize( window ) );
+    wxSize size = FitSize( window );

     window->SetSizeHints( size.x, size.y );
 }
 
     window->SetSizeHints( size.x, size.y );
 }
 

+wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
+{
+    wxRect rect = wxGetClientDisplayRect();
+    wxSize sizeMax (rect.width,rect.height);
+
+    // Make the max size a bit smaller than the visible portion of
+    // the screen.  A window which takes the entire screen doesn't
+    // look very nice either
+    sizeMax.x *= 9;
+    sizeMax.x /= 10;
+
+    sizeMax.y *= 9;
+    sizeMax.y /= 10;
+
+    return sizeMax;
+}
+

 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {
     wxSize minSize( GetMinSize() );
 wxSize wxSizer::GetMinWindowSize( wxWindow *window )
 {
     wxSize minSize( GetMinSize() );


@@ -379,6 +402,20 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
                    minSize.y+size.y-client_size.y );
 }
 
                    minSize.y+size.y-client_size.y );
 }
 

+// Return a window size that will fit within the screens dimensions
+wxSize wxSizer::FitSize( wxWindow *window )
+{
+    wxSize size     = GetMinWindowSize( window );
+    wxSize sizeMax  = GetMaxWindowSize( window );
+
+    if ( size.x > sizeMax.x )
+        size.x = sizeMax.x;
+    if ( size.y > sizeMax.y )
+        size.y = sizeMax.y;
+
+    return size;
+}
+

 void wxSizer::SetDimension( int x, int y, int width, int height )
 {
     m_position.x = x;
 void wxSizer::SetDimension( int x, int y, int width, int height )
 {
     m_position.x = x;


@@ -907,14 +944,43 @@ wxSize wxBoxSizer::CalcMin()
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 
     m_fixedWidth = 0;
     m_fixedHeight = 0;
 

+    // Find how long each stretch unit needs to be
+    int stretchSize = 1;

     wxNode *node = m_children.GetFirst();
     while (node)
     wxNode *node = m_children.GetFirst();
     while (node)

+    {
+        wxSizerItem *item = (wxSizerItem*) node->Data();
+        if (item->GetOption() != 0)
+        {
+            int stretch = item->GetOption();
+            wxSize size( item->CalcMin() );
+            int sizePerStretch;
+            // Integer division rounded up is (a + b - 1) / b
+            if (m_orient == wxHORIZONTAL)
+                sizePerStretch = ( size.x + stretch - 1 ) / stretch;
+            else
+                sizePerStretch = ( size.y + stretch - 1 ) / stretch;
+            if (sizePerStretch > stretchSize)
+                stretchSize = sizePerStretch;
+        }
+        node = node->Next();
+    }
+       // Calculate overall minimum size
+       node = m_children.GetFirst();
+    while (node)

     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
 
         m_stretchable += item->GetOption();
     {
         wxSizerItem *item = (wxSizerItem*) node->Data();
 
         m_stretchable += item->GetOption();

-        
+

         wxSize size( item->CalcMin() );
         wxSize size( item->CalcMin() );

+        if (item->GetOption() != 0)
+        {
+            if (m_orient == wxHORIZONTAL)
+                size.x = stretchSize * item->GetOption();
+            else
+                size.y = stretchSize * item->GetOption();
+        }

 
         if (m_orient == wxHORIZONTAL)
         {
 
         if (m_orient == wxHORIZONTAL)
         {


@@ -935,7 +1001,7 @@ wxSize wxBoxSizer::CalcMin()
                 m_fixedWidth = wxMax( m_fixedWidth, size.x );
             }
             else
                 m_fixedWidth = wxMax( m_fixedWidth, size.x );
             }
             else

-            { 
+            {

                 m_fixedWidth += size.x;
                 m_fixedHeight = wxMax( m_fixedHeight, size.y );
             }
                 m_fixedWidth += size.x;
                 m_fixedHeight = wxMax( m_fixedHeight, size.y );
             }


@@ -970,7 +1036,7 @@ static void GetStaticBoxBorders(wxStaticBox *box,
     else
 #endif // __WXGTK__
         *borderTop = 15;
     else
 #endif // __WXGTK__
         *borderTop = 15;

-
+       (void)box;

     *borderOther = 5;
 }
 
     *borderOther = 5;
 }