Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

defaulting to small style (24x24), and correcting the cut-off decision to be at > 24 instead of >16

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-07-31 09:22:29 +00:00
parent b77a938972
commit 328f4fee60
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/carbon/toolbar.cpp
View File

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