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

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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 1d9073891ff707dcd7ba0326e884f4417c5801d2..c2320a4d5aaa093e47249dde4b7b06f739297e20 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -195,9 +195,14 @@ wxSize wxSizerItem::CalcMin()
     {
         if ( IsWindow() && !(m_flag & wxFIXED_MINSIZE) )
         {
-            // the size of the window may change during run-time, we should
-            // use the current minimal size
-            m_minSize = m_window->GetAdjustedBestSize();
+            // Since the size of the window may change during runtime, we
+            // should use the current minimal size.  If there is a MinSize,
+            // use it, otherwise use the BestSize.
+            wxSize min  = m_window->GetMinSize();
+            wxSize best = m_window->GetBestSize();
+            if (min.x == -1) min.x =  best.x;
+            if (min.y == -1) min.y =  best.y;
+            m_minSize = min;
         }
 
         ret = m_minSize;
@@ -280,7 +285,10 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
 void wxSizerItem::DeleteWindows()
 {
     if (m_window)
+    {
          m_window->Destroy();
+         m_window = NULL;
+    }
 
     if (m_sizer)
         m_sizer->DeleteWindows();