defaulting to small style (24x24), and correcting the cut-off decision to be at ...

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 20b595bfba655b6404f09f795a580b86441b8bad..cbcd80f7b9f70c7feab2a3cebb36ba4f60626d89 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -547,8 +547,6 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
         else
             mode = kHIToolbarDisplayModeIconOnly ;
 
-        displaySize = kHIToolbarDisplaySizeDefault ;
-
         HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef , mode ) ;
         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef , displaySize ) ;
     }
@@ -949,8 +947,14 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     if (m_macHIToolbarRef != NULL)
     {
         int maxs = wxMax( size.x, size.y );
-        // TODO CHECK
-        HIToolbarDisplaySize sizeSpec = ((maxs > 16) ? kHIToolbarDisplaySizeNormal : kHIToolbarDisplaySizeSmall);
+        HIToolbarDisplaySize sizeSpec ;
+        if ( maxs > 32 )
+            sizeSpec = kHIToolbarDisplaySizeLarge ;
+        else if ( maxs > 24 )
+            sizeSpec = kHIToolbarDisplaySizeNormal ;
+        else
+            sizeSpec = kHIToolbarDisplaySizeSmall ;
+            
         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
     }
 #endif