X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3a65c3e49b45b8771ff5c6c9fab948f1c936593..592a247dddf027936cd7a638599a384e31033ac8:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 9ba20471a8..01be924743 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -6,13 +6,9 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: The wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "toolbar.h" -#endif - #include "wx/wxprec.h" #if wxUSE_TOOLBAR @@ -21,22 +17,17 @@ #include "wx/bitmap.h" #include "wx/toolbar.h" -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) - -BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_PAINT( wxToolBar::OnPaint ) -END_EVENT_TABLE() - #include "wx/mac/uma.h" #include "wx/geometry.h" + #ifdef __WXMAC_OSX__ const short kwxMacToolBarToolDefaultWidth = 16 ; const short kwxMacToolBarToolDefaultHeight = 16 ; -const short kwxMacToolBarTopMargin = 4 ; // 1 ; // used to be 4 -const short kwxMacToolBarLeftMargin = 4 ; //1 ; // used to be 4 -const short kwxMacToolBorder = 0 ; // used to be 0 -const short kwxMacToolSpacing = 6 ; // 2 ; // used to be 6 +const short kwxMacToolBarTopMargin = 4 ; +const short kwxMacToolBarLeftMargin = 4 ; +const short kwxMacToolBorder = 0 ; +const short kwxMacToolSpacing = 6 ; #else const short kwxMacToolBarToolDefaultWidth = 24 ; const short kwxMacToolBarToolDefaultHeight = 22 ; @@ -46,6 +37,14 @@ const short kwxMacToolBorder = 4 ; const short kwxMacToolSpacing = 0 ; #endif + +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) + +BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) + EVT_PAINT( wxToolBar::OnPaint ) +END_EVENT_TABLE() + + #pragma mark - #pragma mark Tool Implementation @@ -79,9 +78,10 @@ public: ~wxToolBarTool() { - ClearControl() ; + ClearControl() ; if ( m_controlHandle ) DisposeControl( m_controlHandle ) ; + #if wxMAC_USE_NATIVE_TOOLBAR if ( m_toolbarItemRef ) CFRelease( m_toolbarItemRef ) ; @@ -95,14 +95,15 @@ public: void SetControlHandle( ControlRef handle ) { - m_controlHandle = handle ; + m_controlHandle = handle ; } void SetPosition( const wxPoint& position ) ; void ClearControl() { - m_control = NULL ; + m_control = NULL ; + #if wxMAC_USE_NATIVE_TOOLBAR m_toolbarItemRef = NULL ; #endif @@ -126,13 +127,16 @@ public: sz.y /= 4 ; else sz.x /= 4 ; + return sz ; } } + wxPoint GetPosition() const { return wxPoint(m_x, m_y); } + bool DoEnable( bool enable ) ; void UpdateToggleImage( bool toggle ) ; @@ -144,41 +148,60 @@ public: HideControl( m_controlHandle ) ; if ( m_toolbarItemRef ) CFRelease( m_toolbarItemRef ) ; + m_toolbarItemRef = ref ; if ( m_toolbarItemRef ) { HIToolbarItemSetHelpText( - m_toolbarItemRef, wxMacCFStringHolder( GetShortHelp() , GetToolBar()->GetFont().GetEncoding() ) , - wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ; + m_toolbarItemRef, + wxMacCFStringHolder( GetShortHelp(), GetToolBar()->GetFont().GetEncoding() ) , + wxMacCFStringHolder( GetLongHelp(), GetToolBar()->GetFont().GetEncoding() ) ) ; } } + HIToolbarItemRef GetToolbarItemRef() const { return m_toolbarItemRef ; } + + void SetIndex( CFIndex idx ) + { + m_index = idx ; + } + + CFIndex GetIndex() const + { + return m_index ; + } #endif private : void Init() { m_controlHandle = NULL ; + #if wxMAC_USE_NATIVE_TOOLBAR m_toolbarItemRef = NULL ; + m_index = -1 ; #endif } + ControlRef m_controlHandle ; + wxCoord m_x; + wxCoord m_y; + #if wxMAC_USE_NATIVE_TOOLBAR HIToolbarItemRef m_toolbarItemRef ; + // position in its toolbar, -1 means not inserted + CFIndex m_index ; #endif - wxCoord m_x; - wxCoord m_y; }; static const EventTypeSpec eventList[] = { - { kEventClassControl , kEventControlHit } , + { kEventClassControl , kEventControlHit } , #ifdef __WXMAC_OSX__ - { kEventClassControl , kEventControlHitTest } , + { kEventClassControl , kEventControlHitTest } , #endif } ; @@ -192,22 +215,25 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventControlHit : { wxToolBarTool* tbartool = (wxToolBarTool*)data ; - wxToolBar *tbar = tbartool != NULL ? ( wxToolBar * ) ( tbartool->GetToolBar() ) : NULL ; - if ((tbartool != NULL) && tbartool->CanBeToggled() ) + wxToolBar *tbar = tbartool != NULL ? (wxToolBar*) (tbartool->GetToolBar()) : NULL ; + if ((tbartool != NULL) && tbartool->CanBeToggled()) { bool shouldToggle; + #ifdef __WXMAC_OSX__ shouldToggle = !tbartool->IsToggled(); #else shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 ); #endif + tbar->ToggleTool( tbartool->GetId(), shouldToggle ); } + if (tbartool != NULL) tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() ); result = noErr; @@ -233,6 +259,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef default : break ; } + return result ; } @@ -249,6 +276,7 @@ static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler default : break ; } + return result ; } @@ -262,27 +290,31 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler ) static const EventTypeSpec toolBarEventList[] = { - { kEventClassToolbarItem , kEventToolbarItemPerformAction } , + { kEventClassToolbarItem , kEventToolbarItemPerformAction } , } ; static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventToolbarItemPerformAction : { wxToolBarTool* tbartool = (wxToolBarTool*) data ; if ( tbartool != NULL ) { - int toolID = tbartool->GetId(); - wxToolBar *tbar = ( wxToolBar * ) ( tbartool->GetToolBar() ); + wxToolBar *tbar = (wxToolBar*)(tbartool->GetToolBar()); + int toolID = tbartool->GetId(); + if ( tbartool->CanBeToggled() ) { - tbar->ToggleTool(toolID, !tbartool->IsToggled() ); + if ( tbar ) + tbar->ToggleTool(toolID, !tbartool->IsToggled() ); } - tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ; + + if ( tbar ) + tbar->OnLeftClick( toolID , tbartool->IsToggled() ) ; result = noErr; } } @@ -291,13 +323,15 @@ static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef hand default : break ; } + return result ; } static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data ) { OSStatus result = eventNotHandledErr ; - switch( GetEventClass( event ) ) + + switch ( GetEventClass( event ) ) { case kEventClassToolbarItem : result = wxMacToolBarCommandEventHandler( handler, event, data ) ; @@ -306,6 +340,7 @@ static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, Ev default : break ; } + return result ; } @@ -349,6 +384,7 @@ bool wxToolBarTool::DoEnable(bool enable) #endif } } + return true ; } @@ -396,9 +432,7 @@ void wxToolBarTool::SetPosition(const wxPoint& position) int former_mac_y = contrlRect.top ; if ( mac_x != former_mac_x || mac_y != former_mac_y ) - { UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; - } #endif } } @@ -439,30 +473,30 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) int h = m_bmpNormal.GetHeight() ; wxBitmap bmp( w , h ) ; wxMemoryDC dc ; + dc.SelectObject( bmp ) ; dc.SetPen( wxNullPen ) ; dc.SetBackground( *wxWHITE ) ; dc.DrawRectangle( 0 , 0 , w , h ) ; - dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ; + dc.DrawBitmap( m_bmpNormal , 0 , 0 , true ) ; dc.SelectObject( wxNullBitmap ) ; ControlButtonContentInfo info ; wxMacCreateBitmapButton( &info , bmp ) ; - SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), - (Ptr)&info ); + SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); wxMacReleaseBitmapButton( &info ) ; } else { ControlButtonContentInfo info ; wxMacCreateBitmapButton( &info , m_bmpNormal ) ; - SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), - (Ptr)&info ); + SetControlData( m_controlHandle , 0, kControlIconContentTag, + sizeof( info ), (Ptr)&info ); wxMacReleaseBitmapButton( &info ) ; } IconTransformType transform = toggle ? kTransformSelected : kTransformNone ; - SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ), - (Ptr)&transform ); + SetControlData( m_controlHandle, 0, kControlIconTransformTag, + sizeof( transform ), (Ptr)&transform ); HIViewSetNeedsDisplay( m_controlHandle , true ) ; #else @@ -512,6 +546,7 @@ void wxToolBar::Init() m_maxHeight = -1; m_defaultWidth = kwxMacToolBarToolDefaultWidth; m_defaultHeight = kwxMacToolBarToolDefaultHeight; + #if wxMAC_USE_NATIVE_TOOLBAR m_macHIToolbarRef = NULL ; m_macUsesNativeToolbar = false ; @@ -521,17 +556,20 @@ void wxToolBar::Init() // also for the toolbar we have the dual implementation: // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar // -bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) +bool wxToolBar::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { - if ( !wxToolBarBase::Create( parent , id , pos , size , style ) ) + if ( !wxToolBarBase::Create( parent , id , pos , size , style, wxDefaultValidator, name ) ) return false ; - OSStatus err = 0; + OSStatus err = noErr; #if wxMAC_USE_NATIVE_TOOLBAR - wxString labelStr; - labelStr.Format(wxT("%xd"), (int)this); + wxString labelStr = wxString::Format(wxT("%xd"), (int)this); err = HIToolbarCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding() ) , 0 , (HIToolbarRef*) &m_macHIToolbarRef ); @@ -552,7 +590,7 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons } #endif - return (err == 0); + return (err == noErr); } wxToolBar::~wxToolBar() @@ -583,11 +621,13 @@ bool wxToolBar::Show( bool show ) MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) { - bResult = (HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ) != show); - ShowHideWindowToolbar( tlw, show, false ); + bResult = ( IsWindowToolbarVisible(tlw) != show); + if ( bResult ) + ShowHideWindowToolbar( tlw, show, false ); } else #endif + bResult = wxToolBarBase::Show( show ); } @@ -602,7 +642,10 @@ bool wxToolBar::IsShown() const bool ownToolbarInstalled ; MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if (ownToolbarInstalled) - bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef ); + { + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + bResult = IsWindowToolbarVisible(tlw) ; + } else #endif bResult = wxToolBarBase::IsShown(); @@ -619,7 +662,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if ( ownToolbarInstalled ) { - // TODO is this really a control ? + // TODO: is this really a control ? GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR ); if ( width != NULL ) *width = boundsR.right - boundsR.left; @@ -631,9 +674,19 @@ void wxToolBar::DoGetSize( int *width, int *height ) const wxToolBarBase::DoGetSize( width, height ); } +wxSize wxToolBar::DoGetBestSize() const +{ + int width , height ; + + DoGetSize( &width , &height ) ; + + return wxSize( width , height ) ; +} + void wxToolBar::SetWindowStyleFlag( long style ) { wxToolBarBase::SetWindowStyleFlag( style ); + #if wxMAC_USE_NATIVE_TOOLBAR if (m_macHIToolbarRef != NULL) { @@ -679,7 +732,7 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const bool wxToolBar::MacInstallNativeToolbar(bool usesNative) { - bool bResult = false; + bool bResult = false; WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); if (tlw == NULL) @@ -694,7 +747,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) // check the existing toolbar HIToolbarRef curToolbarRef = NULL; OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); - if (err != 0) + if (err != noErr) curToolbarRef = NULL; m_macUsesNativeToolbar = usesNative; @@ -711,20 +764,9 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 ); SetAutomaticControlDragTrackingEnabledForWindow( tlw, true ); - // FIXME: which is best, which is necessary? - // - // m_peer->SetVisibility( false, true ); - // - // Rect r = { 0 , 0 , 0 , 0 }; - // - // m_peer->SetRect( &r ); - // - // FIXME: which is best, which is necessary? - // SetSize( wxSIZE_AUTO_WIDTH, 0 ); - // m_peer->SetVisibility( false, true ); wxToolBarBase::Show( false ); } @@ -740,12 +782,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute ); SetWindowToolbar( tlw, NULL ); - // FIXME: which is best, which is necessary? m_peer->SetVisibility( true, true ); - - // - // wxToolBarBase::Show( true ); - // } } @@ -762,18 +799,18 @@ bool wxToolBar::Realize() if (m_tools.GetCount() == 0) return false; - int x = m_xMargin + kwxMacToolBarLeftMargin; - int y = m_yMargin + kwxMacToolBarTopMargin; - - int tw, th; - GetSize( &tw, &th ); - int maxWidth = 0; int maxHeight = 0; int maxToolWidth = 0; int maxToolHeight = 0; + int x = m_xMargin + kwxMacToolBarLeftMargin; + int y = m_yMargin + kwxMacToolBarTopMargin; + + int tw, th; + GetSize( &tw, &th ); + // find the maximum tool width and height wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node != NULL ) @@ -793,9 +830,14 @@ bool wxToolBar::Realize() node = node->GetNext(); } - bool lastIsRadio = false; - bool curIsRadio = false; - bool setChoiceInGroup = false; + bool lastIsRadio = false; + bool curIsRadio = false; + bool setChoiceInGroup = false; + +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex currentPosition = 0 ; + bool insertAll = false ; +#endif node = m_tools.GetFirst(); while ( node != NULL ) @@ -808,7 +850,7 @@ bool wxToolBar::Realize() continue; } - // set tool position + // set tool position: // for the moment just perform a single row/column alignment wxSize cursize = tool->GetSize(); if ( x + cursize.x > maxWidth ) @@ -840,15 +882,33 @@ bool wxToolBar::Realize() HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef(); if ( hiItemRef != NULL ) { - OSStatus result = HIToolbarAppendItem( (HIToolbarRef) m_macHIToolbarRef, hiItemRef ); - if ( result == 0 ) + if ( insertAll || (tool->GetIndex() != currentPosition) ) { - InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(), - GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL ); + OSStatus err = noErr ; + if ( !insertAll ) + { + // if this is the first tool that gets newly inserted or repositioned + // first remove all 'old' tools from here to the right, because of this + // all following tools will have to be reinserted (insertAll). i = 100 because there's + // no way to determine how many there are in a toolbar, so just a high number :-( + for ( CFIndex i = 100 ; i >= currentPosition ; --i ) + { + err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , i ) ; + } + wxASSERT_MSG( err == noErr, _T("HIToolbarRemoveItemAtIndex failed") ); + insertAll = true ; + } + + err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef , currentPosition ) ; + wxASSERT_MSG( err == noErr, _T("HIToolbarInsertItemAtIndex failed") ); + + tool->SetIndex( currentPosition ) ; } + + currentPosition++ ; } } -#endif +#endif // wxMAC_USE_NATIVE_TOOLBAR // update radio button (and group) state lastIsRadio = curIsRadio; @@ -936,6 +996,9 @@ bool wxToolBar::Realize() SetSize( maxWidth, maxHeight ); InvalidateBestSize(); #endif + + SetBestFittingSize(); + return true; } @@ -971,20 +1034,19 @@ void wxToolBar::SetRows(int nRows) { // avoid resizing the frame uselessly if ( nRows != m_maxRows ) - { m_maxRows = nRows; - } } void wxToolBar::MacSuperChangedPosition() { wxWindow::MacSuperChangedPosition(); + #if wxMAC_USE_NATIVE_TOOLBAR if (! m_macUsesNativeToolbar ) -#endif - { Realize(); - } +#else + Realize(); +#endif } wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const @@ -1054,17 +1116,21 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), else toolrect.right = toolSize.x; - #ifdef __WXMAC_OSX__ +#ifdef __WXMAC_OSX__ // in flat style we need a visual separator - #if wxMAC_USE_NATIVE_TOOLBAR +#if wxMAC_USE_NATIVE_TOOLBAR HIToolbarItemRef item; - err = HIToolbarItemCreate( kHIToolbarSeparatorIdentifier, kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, &item ); + err = HIToolbarItemCreate( + kHIToolbarSeparatorIdentifier, + kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, + &item ); if (err == noErr) tool->SetToolbarItemRef( item ); - #endif +#endif + CreateSeparatorControl( window, &toolrect, &controlHandle ); tool->SetControlHandle( controlHandle ); - #endif +#endif } break; @@ -1072,40 +1138,42 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), { wxASSERT( tool->GetControlHandle() == NULL ) ; ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() , kControlContentIconRef ) ; - - if ( UMAGetSystemVersion() >= 0x1000) - CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ; - else - { - SInt16 behaviour = kControlBehaviorOffsetContents ; - if ( tool->CanBeToggled() ) - behaviour += kControlBehaviorToggles ; - CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , - 0 , 0 , 0 , &controlHandle ) ; - } + wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() , kControlContentIconRef ) ; + + if ( UMAGetSystemVersion() >= 0x1000) + CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ; + else + { + SInt16 behaviour = kControlBehaviorOffsetContents ; + if ( tool->CanBeToggled() ) + behaviour |= kControlBehaviorToggles ; + CreateBevelButtonControl( window , + &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , + behaviour , &info , 0 , 0 , 0 , &controlHandle ) ; + } #if wxMAC_USE_NATIVE_TOOLBAR HIToolbarItemRef item ; - wxString labelStr; - labelStr.Format(wxT("%xd"), (int)tool); + wxString labelStr = wxString::Format(wxT("%xd"), (int)tool); err = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()), kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item ); if (err == noErr) { + InstallEventHandler( HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(), + GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL ); HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) ); HIToolbarItemSetIconRef( item, info.u.iconRef ); - HIToolbarItemSetCommandID( item, tool->GetId() ); + HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction ); tool->SetToolbarItemRef( item ); } #endif wxMacReleaseBitmapButton( &info ) ; - /* +#if 0 SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ; UMASetControlTitle( m_controlHandle , label , wxFont::GetDefaultEncoding() ) ; - */ +#endif InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(), GetEventTypeCount(eventList), eventList, tool, NULL ); @@ -1120,8 +1188,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), // FIXME: doesn't work yet... { HIToolbarItemRef item; - wxString labelStr; - labelStr.Format( wxT("%xd"), (int) tool ); + wxString labelStr = wxString::Format( wxT("%xd"), (int) tool ); result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()), kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item ); @@ -1153,7 +1220,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), break; } - if ( err == 0 ) + if ( err == noErr ) { if ( controlHandle ) { @@ -1173,12 +1240,11 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), } else { - wxString errMsg; - errMsg.Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err ); + wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err ); wxASSERT_MSG( false, errMsg.c_str() ); } - return( err == 0 ); + return (err == noErr); } void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) @@ -1206,6 +1272,10 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) tool->Detach(); +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex removeIndex = tool->GetIndex(); +#endif + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: @@ -1220,10 +1290,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) if ( tool->GetControlHandle() ) { DisposeControl( (ControlRef) tool->GetControlHandle() ) ; + #if wxMAC_USE_NATIVE_TOOLBAR - if ( tool->GetToolbarItemRef() ) - CFRelease( tool->GetToolbarItemRef() ) ; + if ( removeIndex != -1 && m_macHIToolbarRef ) + { + HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , removeIndex ) ; + tool->SetIndex( -1 ) ; + } #endif + tool->ClearControl() ; } break; @@ -1245,9 +1320,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) pt.x -= sz.x ; tool2->SetPosition( pt ) ; + +#if wxMAC_USE_NATIVE_TOOLBAR + if ( removeIndex != -1 && tool2->GetIndex() > removeIndex ) + tool2->SetIndex( tool2->GetIndex() - 1 ) ; +#endif } InvalidateBestSize(); + return true ; } @@ -1265,13 +1346,14 @@ void wxToolBar::OnPaint(wxPaintEvent& event) int w, h ; GetSize( &w , &h ) ; + #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() ) { if ( UMAGetSystemVersion() >= 0x1030 ) { HIThemePlacardDrawInfo info ; - memset( &info, 0 , sizeof( info ) ) ; + memset( &info, 0, sizeof(info) ) ; info.version = 0 ; info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; @@ -1284,17 +1366,19 @@ void wxToolBar::OnPaint(wxPaintEvent& event) { // leave the background as it is (striped or metal) } + #else wxMacPortSetter helper(&dc) ; Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ; /* - if( toolbarrect.left < 0 ) + if ( toolbarrect.left < 0 ) toolbarrect.left = 0 ; if ( toolbarrect.top < 0 ) toolbarrect.top = 0 ; */ + if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() ) { UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; @@ -1305,8 +1389,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event) #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 if ( UMAGetSystemVersion() >= 0x1030 ) { - HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , - dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) ); + HIRect hiToolbarrect = CGRectMake( + dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) ); CGContextRef cgContext ; Rect bounds ; GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; @@ -1319,7 +1404,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event) drawInfo.version = 0 ; drawInfo.state = kThemeStateActive ; drawInfo.kind = kThemeBackgroundMetal ; - HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ; + HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext, kHIThemeOrientationNormal) ; } QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;