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

Allow the native toolbar to have more han one button toggled at a time.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-06 04:47:30 +00:00
parent 72ef6efb1f
commit ce9da810d8
1 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,33 +437,6 @@ void wxToolBarTool::SetPosition( const wxPoint& position )
void wxToolBarTool::UpdateToggleImage( bool toggle ) void wxToolBarTool::UpdateToggleImage( bool toggle )
{ {
#if wxMAC_USE_NATIVE_TOOLBAR
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
#define kHIToolbarItemSelected (1 << 7)
#endif
// FIXME: this should be a OSX v10.4 runtime check
if (m_toolbarItemRef != NULL)
{
OptionBits addAttrs, removeAttrs;
OSStatus result;
if (toggle)
{
addAttrs = kHIToolbarItemSelected;
removeAttrs = kHIToolbarItemNoAttributes;
}
else
{
addAttrs = kHIToolbarItemNoAttributes;
removeAttrs = kHIToolbarItemSelected;
}
result = HIToolbarItemChangeAttributes( m_toolbarItemRef, addAttrs, removeAttrs );
}
#endif
#ifdef __WXMAC_OSX__ #ifdef __WXMAC_OSX__
if ( toggle ) if ( toggle )
{ {
@@ -473,14 +446,20 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
wxMemoryDC dc; wxMemoryDC dc;
dc.SelectObject( bmp ); dc.SelectObject( bmp );
dc.SetPen( wxNullPen ); dc.SetPen( wxPen(*wxBLACK) );
dc.SetBackground( *wxWHITE ); dc.SetBrush( wxBrush( *wxLIGHT_GREY ));
dc.DrawRectangle( 0, 0, w, h ); dc.DrawRectangle( 0, 0, w, h );
dc.DrawBitmap( m_bmpNormal, 0, 0, true ); dc.DrawBitmap( m_bmpNormal, 0, 0, true );
dc.SelectObject( wxNullBitmap ); dc.SelectObject( wxNullBitmap );
ControlButtonContentInfo info; ControlButtonContentInfo info;
wxMacCreateBitmapButton( &info, bmp ); wxMacCreateBitmapButton( &info, bmp );
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
#if wxMAC_USE_NATIVE_TOOLBAR
if (m_toolbarItemRef != NULL)
{
HIToolbarItemSetIconRef( m_toolbarItemRef, info.u.iconRef );
}
#endif
wxMacReleaseBitmapButton( &info ); wxMacReleaseBitmapButton( &info );
} }
else else
@@ -488,6 +467,12 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
ControlButtonContentInfo info; ControlButtonContentInfo info;
wxMacCreateBitmapButton( &info, m_bmpNormal ); wxMacCreateBitmapButton( &info, m_bmpNormal );
SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
#if wxMAC_USE_NATIVE_TOOLBAR
if (m_toolbarItemRef != NULL)
{
HIToolbarItemSetIconRef( m_toolbarItemRef, info.u.iconRef );
}
#endif
wxMacReleaseBitmapButton( &info ); wxMacReleaseBitmapButton( &info );
} }