X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/328f4fee60529aa3d924415c2fe048a225b43122..2ddb4d13585d5235556119fb1937273da9e433a3:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index cbcd80f7b9..b7c55f0812 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -9,10 +9,6 @@ // Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "toolbar.h" -#endif - #include "wx/wxprec.h" #if wxUSE_TOOLBAR @@ -24,7 +20,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_PAINT( wxToolBar::OnPaint ) + EVT_PAINT( wxToolBar::OnPaint ) END_EVENT_TABLE() #include "wx/mac/uma.h" @@ -68,7 +64,7 @@ public: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp) ; - + wxToolBarTool(wxToolBar *tbar, wxControl *control) : wxToolBarToolBase(tbar, control) { @@ -76,10 +72,10 @@ public: if (control != NULL) SetControlHandle( (ControlRef) control->GetHandle() ) ; } - + ~wxToolBarTool() { - ClearControl() ; + ClearControl() ; if ( m_controlHandle ) DisposeControl( m_controlHandle ) ; #if wxMAC_USE_NATIVE_TOOLBAR @@ -87,27 +83,27 @@ public: CFRelease( m_toolbarItemRef ) ; #endif } - - WXWidget GetControlHandle() - { - return (WXWidget) m_controlHandle ; + + WXWidget GetControlHandle() + { + return (WXWidget) m_controlHandle ; } - - void SetControlHandle( ControlRef handle ) - { - m_controlHandle = handle ; + + void SetControlHandle( ControlRef handle ) + { + m_controlHandle = handle ; } void SetPosition( const wxPoint& position ) ; - - void ClearControl() - { - m_control = NULL ; + + void ClearControl() + { + m_control = NULL ; #if wxMAC_USE_NATIVE_TOOLBAR - m_toolbarItemRef = NULL ; -#endif + m_toolbarItemRef = NULL ; +#endif } - + wxSize GetSize() const { if ( IsControl() ) @@ -132,19 +128,19 @@ public: wxPoint GetPosition() const { return wxPoint(m_x, m_y); - } + } bool DoEnable( bool enable ) ; - + void UpdateToggleImage( bool toggle ) ; - -#if wxMAC_USE_NATIVE_TOOLBAR - void SetToolbarItemRef( HIToolbarItemRef ref ) - { + +#if wxMAC_USE_NATIVE_TOOLBAR + void SetToolbarItemRef( HIToolbarItemRef ref ) + { if ( m_controlHandle ) HideControl( m_controlHandle ) ; if ( m_toolbarItemRef ) CFRelease( m_toolbarItemRef ) ; - m_toolbarItemRef = ref ; + m_toolbarItemRef = ref ; if ( m_toolbarItemRef ) { HIToolbarItemSetHelpText( @@ -152,23 +148,36 @@ public: wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ; } } - HIToolbarItemRef GetToolbarItemRef() const - { - return m_toolbarItemRef ; + HIToolbarItemRef GetToolbarItemRef() const + { + return m_toolbarItemRef ; + } + + void SetIndex( CFIndex idx ) + { + m_index = idx ; + } + + CFIndex GetIndex() const + { + return m_index ; } #endif private : - void Init() + void Init() { m_controlHandle = NULL ; #if wxMAC_USE_NATIVE_TOOLBAR m_toolbarItemRef = NULL ; + m_index = -1 ; #endif } ControlRef m_controlHandle ; #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; @@ -176,9 +185,9 @@ private : static const EventTypeSpec eventList[] = { - { kEventClassControl , kEventControlHit } , + { kEventClassControl , kEventControlHit } , #ifdef __WXMAC_OSX__ - { kEventClassControl , kEventControlHitTest } , + { kEventClassControl , kEventControlHitTest } , #endif } ; @@ -187,7 +196,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; @@ -210,7 +219,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef } if (tbartool != NULL) tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() ); - result = noErr; + result = noErr; } break ; @@ -220,7 +229,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef HIPoint pt = cEvent.GetParameter(kEventParamMouseLocation) ; HIRect rect ; HIViewGetBounds( controlRef , &rect ) ; - + ControlPartCode pc = kControlNoPart ; if ( CGRectContainsPoint( rect , pt ) ) pc = kControlIconPart ; @@ -262,13 +271,13 @@ 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 ) ) { case kEventToolbarItemPerformAction : @@ -280,10 +289,12 @@ static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef hand wxToolBar *tbar = ( wxToolBar * ) ( tbartool->GetToolBar() ); if ( tbartool->CanBeToggled() ) { - tbar->ToggleTool(toolID, !tbartool->IsToggled() ); + if ( tbar ) + tbar->ToggleTool(toolID, !tbartool->IsToggled() ); } - tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ; - result = noErr; + if ( tbar ) + tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ; + result = noErr; } } break ; @@ -329,7 +340,7 @@ bool wxToolBarTool::DoEnable(bool enable) } else if ( IsButton() ) { -#if wxMAC_USE_NATIVE_TOOLBAR +#if wxMAC_USE_NATIVE_TOOLBAR if ( m_toolbarItemRef ) HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ; #endif @@ -371,12 +382,12 @@ void wxToolBarTool::SetPosition(const wxPoint& position) if ( IsButton() ) { - Rect contrlRect ; - GetControlBounds( m_controlHandle , &contrlRect ) ; + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; int former_mac_x = contrlRect.left ; int former_mac_y = contrlRect.top ; GetToolBar()->GetToolSize() ; - + if ( mac_x != former_mac_x || mac_y != former_mac_y ) { UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; @@ -388,13 +399,13 @@ void wxToolBarTool::SetPosition(const wxPoint& position) } else { - // separator + // separator #ifdef __WXMAC_OSX__ - Rect contrlRect ; - GetControlBounds( m_controlHandle , &contrlRect ) ; + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; int former_mac_x = contrlRect.left ; int former_mac_y = contrlRect.top ; - + if ( mac_x != former_mac_x || mac_y != former_mac_y ) { UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; @@ -403,9 +414,9 @@ void wxToolBarTool::SetPosition(const wxPoint& position) } } -void wxToolBarTool::UpdateToggleImage( bool toggle ) +void wxToolBarTool::UpdateToggleImage( bool toggle ) { -#if wxMAC_USE_NATIVE_TOOLBAR +#if wxMAC_USE_NATIVE_TOOLBAR #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 #define kHIToolbarItemSelected (1 << 7) @@ -447,22 +458,22 @@ void wxToolBarTool::UpdateToggleImage( bool toggle ) 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 @@ -524,19 +535,18 @@ void wxToolBar::Init() 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; #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 ); if (m_macHIToolbarRef != NULL) - { + { HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault ; HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall ; @@ -556,7 +566,7 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons } wxToolBar::~wxToolBar() -{ +{ #if wxMAC_USE_NATIVE_TOOLBAR if ( m_macHIToolbarRef ) { @@ -572,24 +582,26 @@ wxToolBar::~wxToolBar() bool wxToolBar::Show( bool show ) { - bool bResult, ownToolbarInstalled = false; + bool bResult; WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); - + bResult = (tlw != NULL); if (bResult) { #if wxMAC_USE_NATIVE_TOOLBAR + bool ownToolbarInstalled = false; 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 ); } - + return bResult; } @@ -601,11 +613,14 @@ 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(); - + return bResult; } @@ -614,7 +629,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const #if wxMAC_USE_NATIVE_TOOLBAR Rect boundsR; bool ownToolbarInstalled; - + MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); if ( ownToolbarInstalled ) { @@ -630,7 +645,14 @@ void wxToolBar::DoGetSize( int *width, int *height ) const wxToolBarBase::DoGetSize( width, height ); } -void wxToolBar::SetWindowStyleFlag( long style ) +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 @@ -644,7 +666,7 @@ void wxToolBar::SetWindowStyleFlag( long style ) mode = kHIToolbarDisplayModeIconAndLabel; else mode = kHIToolbarDisplayModeIconOnly; - + HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode ); } #endif @@ -676,9 +698,9 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const return bResultV; } -bool wxToolBar::MacInstallNativeToolbar(bool usesNative) +bool wxToolBar::MacInstallNativeToolbar(bool usesNative) { - bool bResult = false; + bool bResult = false; WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); if (tlw == NULL) @@ -686,10 +708,10 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) if (usesNative && (m_macHIToolbarRef == NULL)) return bResult; - + if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0)) return bResult; - + // check the existing toolbar HIToolbarRef curToolbarRef = NULL; OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); @@ -709,7 +731,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) ShowHideWindowToolbar( tlw, true, false ); ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 ); SetAutomaticControlDragTrackingEnabledForWindow( tlw, true ); - + // FIXME: which is best, which is necessary? // // m_peer->SetVisibility( false, true ); @@ -738,10 +760,10 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative) ShowHideWindowToolbar( tlw, false, false ); ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute ); SetWindowToolbar( tlw, NULL ); - + // FIXME: which is best, which is necessary? m_peer->SetVisibility( true, true ); - + // // wxToolBarBase::Show( true ); // @@ -763,50 +785,56 @@ bool wxToolBar::Realize() 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; - + // find the maximum tool width and height wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node != NULL ) { wxToolBarTool *tool = (wxToolBarTool *) node->GetData(); - + if ( tool != NULL ) { wxSize sz = tool->GetSize(); - + if ( sz.x > maxToolWidth ) maxToolWidth = sz.x; if ( sz.y > maxToolHeight ) maxToolHeight = sz.y; } - + node = node->GetNext(); } - + bool lastIsRadio = false; bool curIsRadio = false; bool setChoiceInGroup = false; - + node = m_tools.GetFirst(); + +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex currentPosition = 0 ; + bool insertAll = false ; +#endif // wxMAC_USE_NATIVE_TOOLBAR + while ( node != NULL ) { wxToolBarTool *tool = (wxToolBarTool *) node->GetData(); - + if ( tool == NULL ) { node = node->GetNext(); continue; } - + // set tool position // for the moment just perform a single row/column alignment wxSize cursize = tool->GetSize(); @@ -814,7 +842,7 @@ bool wxToolBar::Realize() maxWidth = x + cursize.x; if ( y + cursize.y > maxHeight ) maxHeight = y + cursize.y; - + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) { int x1 = x + ( maxToolWidth - cursize.x ) / 2; @@ -825,13 +853,13 @@ bool wxToolBar::Realize() int y1 = y + ( maxToolHeight - cursize.y ) / 2; tool->SetPosition( wxPoint(x, y1) ); } - + // update the item positioning state if ( GetWindowStyleFlag() & wxTB_VERTICAL ) y += cursize.y + kwxMacToolSpacing; else x += cursize.x + kwxMacToolSpacing; - + #if wxMAC_USE_NATIVE_TOOLBAR // install in native HIToolbar if ( m_macHIToolbarRef != NULL ) @@ -839,25 +867,40 @@ bool wxToolBar::Realize() HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef(); if ( hiItemRef != NULL ) { - OSStatus result = HIToolbarAppendItem( (HIToolbarRef) m_macHIToolbarRef, hiItemRef ); - if ( result == 0 ) + if ( tool->GetIndex() != currentPosition || insertAll == true ) { - 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; curIsRadio = ( tool->IsButton() && (tool->GetKind() == wxITEM_RADIO) ); - + if ( !curIsRadio ) { if ( tool->IsToggled() ) DoToggleTool( tool, true ); - + setChoiceInGroup = false; } else @@ -874,31 +917,31 @@ bool wxToolBar::Realize() { if ( tool->IsToggled() ) DoToggleTool( tool, true ); - + wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious(); while ( nodePrev != NULL ) { wxToolBarToolBase *toggleTool = nodePrev->GetData(); if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) ) break; - + if ( toggleTool->Toggle(false) ) DoToggleTool( toggleTool, false ); - + nodePrev = nodePrev->GetPrevious(); } } } - + node = node->GetNext(); } - + if ( GetWindowStyleFlag() & wxTB_HORIZONTAL ) { // if not set yet, only one row if ( m_maxRows <= 0 ) SetRows( 1 ); - + m_minWidth = maxWidth; maxWidth = tw; maxHeight += m_yMargin + kwxMacToolBarTopMargin; @@ -909,14 +952,14 @@ bool wxToolBar::Realize() // if not set yet, have one column if ( (GetToolsCount() > 0) && (m_maxRows <= 0) ) SetRows( GetToolsCount() ); - + m_minHeight = maxHeight; maxHeight = th; maxWidth += m_xMargin + kwxMacToolBarLeftMargin; m_minWidth = m_maxWidth = maxWidth; } -#if 0 +#if 0 // FIXME: should this be OSX-only? { bool wantNativeToolbar, ownToolbarInstalled; @@ -931,10 +974,13 @@ bool wxToolBar::Realize() InvalidateBestSize(); } } -#else +#else SetSize( maxWidth, maxHeight ); InvalidateBestSize(); #endif + + SetBestFittingSize(); + return true; } @@ -942,19 +988,19 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size) { m_defaultWidth = size.x + kwxMacToolBorder; m_defaultHeight = size.y + kwxMacToolBorder; - + #if wxMAC_USE_NATIVE_TOOLBAR if (m_macHIToolbarRef != NULL) { int maxs = wxMax( size.x, size.y ); HIToolbarDisplaySize sizeSpec ; if ( maxs > 32 ) - sizeSpec = kHIToolbarDisplaySizeLarge ; - else if ( maxs > 24 ) sizeSpec = kHIToolbarDisplaySizeNormal ; + else if ( maxs > 24 ) + sizeSpec = kHIToolbarDisplaySizeDefault ; else sizeSpec = kHIToolbarDisplaySizeSmall ; - + HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec ); } #endif @@ -975,7 +1021,7 @@ void wxToolBar::SetRows(int nRows) } } -void wxToolBar::MacSuperChangedPosition() +void wxToolBar::MacSuperChangedPosition() { wxWindow::MacSuperChangedPosition(); #if wxMAC_USE_NATIVE_TOOLBAR @@ -1055,15 +1101,15 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), #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 ); if (err == noErr) tool->SetToolbarItemRef( item ); - #endif + #endif // wxMAC_USE_NATIVE_TOOLBAR CreateSeparatorControl( window, &toolrect, &controlHandle ); tool->SetControlHandle( controlHandle ); - #endif + #endif // __WXMAC_OSX__ } break; @@ -1072,40 +1118,43 @@ 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 ) ; - } + + 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 +#endif // wxMAC_USE_NATIVE_TOOLBAR wxMacReleaseBitmapButton( &info ) ; /* SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ; UMASetControlTitle( m_controlHandle , label , wxFont::GetDefaultEncoding() ) ; */ - + InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(), GetEventTypeCount(eventList), eventList, tool, NULL ); @@ -1119,8 +1168,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 ); @@ -1129,20 +1177,20 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) ); HIToolbarItemSetCommandID( item, tool->GetId() ); tool->SetToolbarItemRef( item ); - + controlHandle = ( ControlRef ) tool->GetControlHandle(); wxASSERT_MSG( controlHandle != NULL, wxT("NULL tool control") ); - + // FIXME: is this necessary ?? ::GetControlBounds( controlHandle, &toolrect ); UMAMoveControl( controlHandle, -toolrect.left, -toolrect.top ); - + // FIXME: is this necessary ?? InstallControlEventHandler( controlHandle, GetwxMacToolBarToolEventHandlerUPP(), GetEventTypeCount(eventList), eventList, tool, NULL ); } } - + #else // FIXME: right now there's nothing to do here #endif @@ -1151,7 +1199,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), default : break; } - + if ( err == 0 ) { if ( controlHandle ) @@ -1172,11 +1220,10 @@ 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 ); } @@ -1205,6 +1252,10 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) tool->Detach(); +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex removeIndex = tool->GetIndex(); +#endif // wxMAC_USE_NATIVE_TOOLBAR + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_CONTROL: @@ -1220,9 +1271,12 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) { DisposeControl( (ControlRef) tool->GetControlHandle() ) ; #if wxMAC_USE_NATIVE_TOOLBAR - if ( tool->GetToolbarItemRef() ) - CFRelease( tool->GetToolbarItemRef() ) ; -#endif + if ( removeIndex != -1 && m_macHIToolbarRef ) + { + HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , removeIndex ) ; + tool->SetIndex( -1 ) ; + } +#endif // wxMAC_USE_NATIVE_TOOLBAR tool->ClearControl() ; } break; @@ -1232,7 +1286,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) } // and finally reposition all the controls after this one - + for ( /* node -> first after deleted */ ; node; node = node->GetNext() ) { wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData(); @@ -1244,8 +1298,14 @@ 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 ; } @@ -1259,7 +1319,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event) return ; } #endif - + wxPaintDC dc(this) ; int w, h ; @@ -1273,7 +1333,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event) memset( &info, 0 , sizeof( info ) ) ; info.version = 0 ; info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; - + CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ; HIRect rect = CGRectMake( 0 , 0 , w , h ) ; HIThemeDrawPlacard( &rect , & info , cgContext, kHIThemeOrientationNormal) ; @@ -1285,8 +1345,8 @@ void wxToolBar::OnPaint(wxPaintEvent& event) } #else wxMacPortSetter helper(&dc) ; - - Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + + Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ; /* if( toolbarrect.left < 0 ) @@ -1304,7 +1364,7 @@ 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) , + HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) ); CGContextRef cgContext ; Rect bounds ;