Set m_minWidth, m_minHeight so that GetBestSize() works properly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 21c9a569f3883aebd59535c4be77c613d9c94e9b..bdb6e6bad37a962616c5a6ee151fb1d483a2f42e 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -401,9 +401,10 @@ bool wxToolBar::Realize()
             // if not set yet, only one row
             SetRows(1);
         }
             // if not set yet, only one row
             SetRows(1);
         }

+        m_minWidth = maxWidth;

         maxWidth = tw ; 
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         maxWidth = tw ; 
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;

-        m_maxHeight = maxHeight ;
+        m_minHeight = m_maxHeight = maxHeight ;

     }
     else
     {
     }
     else
     {


@@ -412,9 +413,10 @@ bool wxToolBar::Realize()
             // if not set yet, have one column
             SetRows(GetToolsCount());
         }
             // if not set yet, have one column
             SetRows(GetToolsCount());
         }

+        m_minHeight = maxHeight;

         maxHeight = th ;
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         maxHeight = th ;
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;

-        m_maxWidth = maxWidth ;
+        m_minWidth = m_maxWidth = maxWidth ;

     }
     
     SetSize( maxWidth, maxHeight );
     }
     
     SetSize( maxWidth, maxHeight );