X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb2a7883df16d45e476efd12d601b56e0ef1429f..095b80e2b5120d4c476a834b2017c355fa9afef0:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 1d9073891f..7123f19c6a 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -195,9 +195,17 @@ 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();
+            if (min.x == -1 || min.y == -1)
+            {
+                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 +288,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();
@@ -1045,20 +1056,20 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
     {
         if (flag & wxALIGN_CENTER_HORIZONTAL)
         {
-            pt.x = x + (w - sz.x) / 2;
+            pt.x = x + (w - sz.x - m_hgap) / 2;
         }
         else if (flag & wxALIGN_RIGHT)
         {
-            pt.x = x + (w - sz.x);
+            pt.x = x + (w - sz.x - m_hgap);
         }
 
         if (flag & wxALIGN_CENTER_VERTICAL)
         {
-            pt.y = y + (h - sz.y) / 2;
+            pt.y = y + (h - sz.y - m_vgap) / 2;
         }
         else if (flag & wxALIGN_BOTTOM)
         {
-            pt.y = y + (h - sz.y);
+            pt.y = y + (h - sz.y - m_vgap);
         }
     }