Added a couple more numeric character references

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index fd78077c09f23b7f6d4d22b5bde7711ab8bd9942..049760f8c2db8b157a45ba0547208fa12ccb23c6 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,12 @@ bool wxSizer::Remove( int pos )
 
 void wxSizer::Fit( wxWindow *window )
 {
 
 void wxSizer::Fit( wxWindow *window )
 {

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

     window->SetSize( size );
 }
 
     window->SetSize( size );
 }
 


@@ -371,7 +376,7 @@ void wxSizer::SetSizeHints( wxWindow *window )
     window->SetSizeHints( size.x, size.y );
 }
 
     window->SetSizeHints( size.x, size.y );
 }
 

-wxSize wxSizer::GetMaxWindowSize( wxWindow *window )
+wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )

 {
     wxSize sizeMax = wxGetDisplaySize();
     // make the max size a bit smaller than the screen, a window which takes
 {
     wxSize sizeMax = wxGetDisplaySize();
     // make the max size a bit smaller than the screen, a window which takes


@@ -942,7 +947,7 @@ wxSize wxBoxSizer::CalcMin()
         wxSizerItem *item = (wxSizerItem*) node->Data();
 
         m_stretchable += item->GetOption();
         wxSizerItem *item = (wxSizerItem*) node->Data();
 
         m_stretchable += item->GetOption();

-        
+

         wxSize size( item->CalcMin() );
 
         if (m_orient == wxHORIZONTAL)
         wxSize size( item->CalcMin() );
 
         if (m_orient == wxHORIZONTAL)


@@ -964,7 +969,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 );
             }


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

-
+       (void)box;

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