X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c37f1248bda69718bc13e2fdaa1ebb86f3dfc93..355debca0650f70aa8ed4803b2ebc45541e03d9f:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 4869227f6c..5c7934010e 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -1,275 +1,540 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toolbar.cpp +// Name: src/mac/carbon/toolbar.cpp // Purpose: wxToolBar // Author: Stefan Csomor // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: The wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "toolbar.h" -#endif - -#include "wx/wx.h" +#include "wx/wxprec.h" #if wxUSE_TOOLBAR -#include "wx/toolbar.h" -#include "wx/notebook.h" -#include "wx/tabctrl.h" +#include "wx/wx.h" #include "wx/bitmap.h" +#include "wx/toolbar.h" + +#include "wx/mac/uma.h" +#include "wx/geometry.h" + + +#ifdef __WXMAC_OSX__ +const short kwxMacToolBarToolDefaultWidth = 16; +const short kwxMacToolBarToolDefaultHeight = 16; +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; +const short kwxMacToolBarTopMargin = 2; +const short kwxMacToolBarLeftMargin = 2; +const short kwxMacToolBorder = 4; +const short kwxMacToolSpacing = 0; +#endif + -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase) - EVT_PAINT( wxToolBar::OnPaint ) + EVT_PAINT( wxToolBar::OnPaint ) END_EVENT_TABLE() -#endif -#include "wx/mac/uma.h" -#include "wx/geometry.h" + +#pragma mark - +#pragma mark Tool Implementation + + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- +// We have a dual implementation for each tool, ControlRef and HIToolbarItemRef + class wxToolBarTool : public wxToolBarToolBase { public: - wxToolBarTool(wxToolBar *tbar, - int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) ; - + wxToolBarTool( + wxToolBar *tbar, + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp ); + wxToolBarTool(wxToolBar *tbar, wxControl *control) : wxToolBarToolBase(tbar, control) { - Init() ; + Init(); + if (control != NULL) + SetControlHandle( (ControlRef) control->GetHandle() ); } - + ~wxToolBarTool() { + ClearControl(); + +#if wxMAC_USE_NATIVE_TOOLBAR + if ( m_toolbarItemRef ) + CFRelease( m_toolbarItemRef ); +#endif + } + + WXWidget GetControlHandle() + { + return (WXWidget) m_controlHandle; + } + + void SetControlHandle( ControlRef handle ) + { + m_controlHandle = handle; + } + + void SetPosition( const wxPoint& position ); + + void ClearControl() + { + m_control = NULL; if ( m_controlHandle ) - DisposeControl( m_controlHandle ) ; + { + DisposeControl( m_controlHandle ); + m_controlHandle = NULL ; + } + +#if wxMAC_USE_NATIVE_TOOLBAR + m_toolbarItemRef = NULL; +#endif } - - WXWidget GetControlHandle() { return (WXWidget) m_controlHandle ; } - void SetControlHandle( ControlRef handle ) { m_controlHandle = handle ; } - void SetSize(const wxSize& size) ; - void SetPosition( const wxPoint& position ) ; wxSize GetSize() const { + wxSize curSize; + if ( IsControl() ) { - return GetControl()->GetSize() ; + curSize = GetControl()->GetSize(); } else if ( IsButton() ) { - return GetToolBar()->GetToolSize() ; + curSize = GetToolBar()->GetToolSize(); } else { - wxSize sz = GetToolBar()->GetToolSize() ; - sz.x /= 4 ; - sz.y /= 4 ; - return sz ; + // separator size + curSize = GetToolBar()->GetToolSize(); + if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + curSize.y /= 4; + else + curSize.x /= 4; } + + return curSize; } + wxPoint GetPosition() const { - return wxPoint(m_x, m_y); - } -private : - void Init() + return wxPoint( m_x, m_y ); + } + + bool DoEnable( bool enable ); + + void UpdateToggleImage( bool toggle ); + +#if wxMAC_USE_NATIVE_TOOLBAR + void SetToolbarItemRef( HIToolbarItemRef ref ) + { + if ( m_controlHandle ) + 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() ) ); + } + } + + 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 ; + m_controlHandle = NULL; + +#if wxMAC_USE_NATIVE_TOOLBAR + m_toolbarItemRef = NULL; + m_index = -1; +#endif } - ControlRef m_controlHandle ; + 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 }; static const EventTypeSpec eventList[] = { - { kEventClassControl , kEventControlHit } , -} ; + { kEventClassControl, kEventControlHit }, +#ifdef __WXMAC_OSX__ + { kEventClassControl, kEventControlHitTest }, +#endif +}; -static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler, EventRef event, void *data ) { - OSStatus result = eventNotHandledErr ; - - wxMacCarbonEvent cEvent( event ) ; - - ControlRef controlRef ; + OSStatus result = eventNotHandledErr; + ControlRef controlRef; + wxMacCarbonEvent cEvent( event ); - cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + cEvent.GetParameter( kEventParamDirectObject, &controlRef ); - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { - case kEventControlHit : + case kEventControlHit: { - wxToolBarTool* tbartool = (wxToolBarTool*)data ; - if ( tbartool->CanBeToggled() ) + wxToolBarTool *tbartool = (wxToolBarTool*)data; + wxToolBar *tbar = tbartool != NULL ? (wxToolBar*) (tbartool->GetToolBar()) : NULL; + if ((tbartool != NULL) && tbartool->CanBeToggled()) { - tbartool->Toggle( GetControl32BitValue( (ControlRef) tbartool->GetControlHandle() ) ) ; + bool shouldToggle; + +#ifdef __WXMAC_OSX__ + shouldToggle = !tbartool->IsToggled(); +#else + shouldToggle = (GetControl32BitValue( (ControlRef)(tbartool->GetControlHandle()) ) != 0); +#endif + + tbar->ToggleTool( tbartool->GetId(), shouldToggle ); } - ((wxToolBar*)tbartool->GetToolBar())->OnLeftClick( tbartool->GetId() , tbartool -> IsToggled() ) ; - result = noErr; + if (tbartool != NULL) + tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() ); + result = noErr; } - break ; - default : - break ; + break; + +#ifdef __WXMAC_OSX__ + case kEventControlHitTest: + { + HIPoint pt = cEvent.GetParameter(kEventParamMouseLocation); + HIRect rect; + HIViewGetBounds( controlRef, &rect ); + + ControlPartCode pc = kControlNoPart; + if ( CGRectContainsPoint( rect, pt ) ) + pc = kControlIconPart; + cEvent.SetParameter( kEventParamControlPart, typeControlPartCode, pc ); + result = noErr; + } + break; +#endif + + default: + break; } - return result ; + + return result; } -pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler, EventRef event, void *data ) { - OSStatus result = eventNotHandledErr ; + OSStatus result = eventNotHandledErr; switch ( GetEventClass( event ) ) { - case kEventClassControl : - result = wxMacToolBarToolControlEventHandler( handler, event, data ) ; - break ; - default : - break ; + case kEventClassControl: + result = wxMacToolBarToolControlEventHandler( handler, event, data ); + break; + + default: + break; } - return result ; + + return result; } DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler ) -// ============================================================================ -// implementation -// ============================================================================ +#if wxMAC_USE_NATIVE_TOOLBAR -// ---------------------------------------------------------------------------- -// wxToolBarTool -// ---------------------------------------------------------------------------- +static const EventTypeSpec toolBarEventList[] = +{ + { kEventClassToolbarItem, kEventToolbarItemPerformAction }, +}; + +static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler, EventRef event, void *data ) +{ + OSStatus result = eventNotHandledErr; + + switch ( GetEventKind( event ) ) + { + case kEventToolbarItemPerformAction: + { + wxToolBarTool* tbartool = (wxToolBarTool*) data; + if ( tbartool != NULL ) + { + wxToolBar *tbar = (wxToolBar*)(tbartool->GetToolBar()); + int toolID = tbartool->GetId(); + + if ( tbartool->CanBeToggled() ) + { + if ( tbar != NULL ) + tbar->ToggleTool(toolID, !tbartool->IsToggled() ); + } + + if ( tbar != NULL ) + tbar->OnLeftClick( toolID, tbartool->IsToggled() ); + result = noErr; + } + } + break; + + default: + break; + } + + return result; +} + +static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data ) +{ + OSStatus result = eventNotHandledErr; + + switch ( GetEventClass( event ) ) + { + case kEventClassToolbarItem: + result = wxMacToolBarCommandEventHandler( handler, event, data ); + break; + + default: + break; + } + + return result; +} -void wxToolBarTool::SetSize(const wxSize& size) +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler ) + +#endif + +bool wxToolBarTool::DoEnable( bool enable ) { if ( IsControl() ) { - GetControl()->SetSize( size ) ; + GetControl()->Enable( enable ); } + else if ( IsButton() ) + { +#if wxMAC_USE_NATIVE_TOOLBAR + if ( m_toolbarItemRef != NULL ) + HIToolbarItemSetEnabled( m_toolbarItemRef, enable ); +#endif + + if ( m_controlHandle != NULL ) + { +#if TARGET_API_MAC_OSX + if ( enable ) + EnableControl( m_controlHandle ); + else + DisableControl( m_controlHandle ); +#else + if ( enable ) + ActivateControl( m_controlHandle ); + else + DeactivateControl( m_controlHandle ); +#endif + } + } + + return true; } -void wxToolBarTool::SetPosition(const wxPoint& position) +void wxToolBarTool::SetPosition( const wxPoint& position ) { m_x = position.x; m_y = position.y; - if ( IsButton() ) + int x, y; + x = y = 0; + int mac_x = position.x; + int mac_y = position.y; + + if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() ) { - int x , y ; - x = y = 0 ; - int mac_x = position.x ; - int mac_y = position.y ; -#if !TARGET_API_MAC_OSX - WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ; - GetToolBar()->MacWindowToRootWindow( &x , &y ) ; + GetToolBar()->MacWindowToRootWindow( &x, &y ); mac_x += x; mac_y += y; -#endif - Rect contrlRect ; - GetControlBounds( m_controlHandle , &contrlRect ) ; - int former_mac_x = contrlRect.left ; - int former_mac_y = contrlRect.top ; - wxSize sz = GetToolBar()->GetToolSize() ; - + } + + if ( IsButton() ) + { + 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 ) ; + UMAMoveControl( m_controlHandle, mac_x, mac_y ); } } else if ( IsControl() ) { - GetControl()->Move( position ) ; + GetControl()->Move( position ); } -} + else + { + // separator +#ifdef __WXMAC_OSX__ + Rect contrlRect; + GetControlBounds( m_controlHandle, &contrlRect ); + int former_mac_x = contrlRect.left; + int former_mac_y = contrlRect.top; -const short kwxMacToolBarToolDefaultWidth = 24 ; -const short kwxMacToolBarToolDefaultHeight = 22 ; -const short kwxMacToolBarTopMargin = 2 ; -const short kwxMacToolBarLeftMargin = 2 ; + if ( mac_x != former_mac_x || mac_y != former_mac_y ) + UMAMoveControl( m_controlHandle, mac_x, mac_y ); +#endif + } +} -wxToolBarTool::wxToolBarTool(wxToolBar *tbar, - int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) - : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind, - clientData, shortHelp, longHelp) +void wxToolBarTool::UpdateToggleImage( bool toggle ) { - Init(); - - if (id == wxID_SEPARATOR) return; - - WindowRef window = (WindowRef) tbar->MacGetTopLevelWindowRef() ; - wxSize toolSize = tbar->GetToolSize() ; - Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ; - - ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ; - - SInt16 behaviour = kControlBehaviorOffsetContents ; - if ( CanBeToggled() ) - behaviour += kControlBehaviorToggles ; - - CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , - 0 , 0 , 0 , &m_controlHandle ) ; - - InstallControlEventHandler( (ControlRef) m_controlHandle, GetwxMacToolBarToolEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this,NULL); - - UMAShowControl( m_controlHandle ) ; - if ( !IsEnabled() ) - DisableControl( m_controlHandle ) ; - - if ( CanBeToggled() && IsToggled() ) - ::SetControl32BitValue( m_controlHandle , 1 ) ; +#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__ + if ( toggle ) + { + int w = m_bmpNormal.GetWidth(); + 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.SelectObject( wxNullBitmap ); + ControlButtonContentInfo info; + wxMacCreateBitmapButton( &info, bmp ); + SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info ); + wxMacReleaseBitmapButton( &info ); + } else - ::SetControl32BitValue( m_controlHandle , 0 ) ; - - ControlRef container = (ControlRef) tbar->GetHandle() ; - wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( m_controlHandle , container ) ; + { + ControlButtonContentInfo info; + wxMacCreateBitmapButton( &info, m_bmpNormal ); + 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 ); + HIViewSetNeedsDisplay( m_controlHandle, true ); + +#else + ::SetControl32BitValue( m_controlHandle, toggle ); +#endif } +wxToolBarTool::wxToolBarTool( + wxToolBar *tbar, + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp ) + : + wxToolBarToolBase( + tbar, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp ) +{ + Init(); +} -wxToolBarToolBase *wxToolBar::CreateTool(int id, - const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelp, - const wxString& longHelp) +#pragma mark - +#pragma mark Toolbar Implementation + +wxToolBarToolBase *wxToolBar::CreateTool( + int id, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp ) { - return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind, - clientData, shortHelp, longHelp); + return new wxToolBarTool( + this, id, label, bmpNormal, bmpDisabled, kind, + clientData, shortHelp, longHelp ); } -wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) +wxToolBarToolBase * wxToolBar::CreateTool( wxControl *control ) { - return new wxToolBarTool(this, control); + return new wxToolBarTool( this, control ); } void wxToolBar::Init() @@ -278,213 +543,743 @@ void wxToolBar::Init() m_maxHeight = -1; m_defaultWidth = kwxMacToolBarToolDefaultWidth; m_defaultHeight = kwxMacToolBarToolDefaultHeight; + +#if wxMAC_USE_NATIVE_TOOLBAR + m_macHIToolbarRef = NULL; + m_macUsesNativeToolbar = false; +#endif } -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 ) ) - return FALSE ; - - return TRUE; +// 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 ) +{ + if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) + return false; + + OSStatus err = noErr; + +#if wxMAC_USE_NATIVE_TOOLBAR + 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; + + if ( style & wxTB_NOICONS ) + mode = kHIToolbarDisplayModeLabelOnly; + else if ( style & wxTB_TEXT ) + mode = kHIToolbarDisplayModeIconAndLabel; + else + mode = kHIToolbarDisplayModeIconOnly; + + HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode ); + HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, displaySize ); + } +#endif + + return (err == noErr); } wxToolBar::~wxToolBar() -{ - // we must refresh the frame size when the toolbar is deleted but the frame - // is not - otherwise toolbar leaves a hole in the place it used to occupy +{ +#if wxMAC_USE_NATIVE_TOOLBAR + if (m_macHIToolbarRef != NULL) + { + // if this is the installed toolbar, then deinstall it + if (m_macUsesNativeToolbar) + MacInstallNativeToolbar( false ); + + CFRelease( (HIToolbarRef)m_macHIToolbarRef ); + m_macHIToolbarRef = NULL; + } +#endif +} + +bool wxToolBar::Show( bool show ) +{ + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + bool bResult = (tlw != NULL); + + if (bResult) + { +#if wxMAC_USE_NATIVE_TOOLBAR + bool ownToolbarInstalled = false; + MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); + if (ownToolbarInstalled) + { + bResult = (IsWindowToolbarVisible( tlw ) != show); + if ( bResult ) + ShowHideWindowToolbar( tlw, show, false ); + } + else + bResult = wxToolBarBase::Show( show ); +#else + + bResult = wxToolBarBase::Show( show ); +#endif + } + + return bResult; +} + +bool wxToolBar::IsShown() const +{ + bool bResult; + +#if wxMAC_USE_NATIVE_TOOLBAR + bool ownToolbarInstalled; + + MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); + if (ownToolbarInstalled) + { + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + bResult = IsWindowToolbarVisible( tlw ); + } + else + bResult = wxToolBarBase::IsShown(); +#else + + bResult = wxToolBarBase::IsShown(); +#endif + + return bResult; +} + +void wxToolBar::DoGetSize( int *width, int *height ) const +{ +#if wxMAC_USE_NATIVE_TOOLBAR + Rect boundsR; + bool ownToolbarInstalled; + + MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); + if ( ownToolbarInstalled ) + { + // TODO: is this really a control ? + GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR ); + if ( width != NULL ) + *width = boundsR.right - boundsR.left; + if ( height != NULL ) + *height = boundsR.bottom - boundsR.top; + } + else + wxToolBarBase::DoGetSize( width, height ); + +#else + wxToolBarBase::DoGetSize( width, height ); +#endif +} + +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) + { + HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault; + + if ( style & wxTB_NOICONS ) + mode = kHIToolbarDisplayModeLabelOnly; + else if ( style & wxTB_TEXT ) + mode = kHIToolbarDisplayModeIconAndLabel; + else + mode = kHIToolbarDisplayModeIconOnly; + + HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode ); + } +#endif +} + +#if wxMAC_USE_NATIVE_TOOLBAR +bool wxToolBar::MacWantsNativeToolbar() +{ + return m_macUsesNativeToolbar; } +bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const +{ + bool bResultV = false; + + if (ownToolbarInstalled != NULL) + *ownToolbarInstalled = false; + + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + if (tlw != NULL) + { + HIToolbarRef curToolbarRef = NULL; + OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); + bResultV = ((err == noErr) && (curToolbarRef != NULL)); + if (bResultV && (ownToolbarInstalled != NULL)) + *ownToolbarInstalled = (curToolbarRef == m_macHIToolbarRef); + } + + return bResultV; +} + +bool wxToolBar::MacInstallNativeToolbar(bool usesNative) +{ + bool bResult = false; + + if (usesNative && (m_macHIToolbarRef == NULL)) + return bResult; + + if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0)) + return bResult; + + WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef()); + if (tlw == NULL) + return bResult; + + // check the existing toolbar + HIToolbarRef curToolbarRef = NULL; + OSStatus err = GetWindowToolbar( tlw, &curToolbarRef ); + if (err != noErr) + curToolbarRef = NULL; + + m_macUsesNativeToolbar = usesNative; + + if (m_macUsesNativeToolbar) + { + // only install toolbar if there isn't one installed already + if (curToolbarRef == NULL) + { + bResult = true; + + SetWindowToolbar( tlw, (HIToolbarRef) m_macHIToolbarRef ); + ShowHideWindowToolbar( tlw, true, false ); + ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 ); + SetAutomaticControlDragTrackingEnabledForWindow( tlw, true ); + + Rect r = { 0, 0, 0, 0 }; + m_peer->SetRect( &r ); + SetSize( wxSIZE_AUTO_WIDTH, 0 ); + m_peer->SetVisibility( false, true ); + wxToolBarBase::Show( false ); + } + } + else + { + // only deinstall toolbar if this is the installed one + if (m_macHIToolbarRef == curToolbarRef) + { + bResult = true; + + ShowHideWindowToolbar( tlw, false, false ); + ChangeWindowAttributes( tlw, 0, kWindowToolbarButtonAttribute ); + SetWindowToolbar( tlw, NULL ); + + m_peer->SetVisibility( true, true ); + } + } + + if (bResult) + InvalidateBestSize(); + +// wxLogDebug( wxT(" --> [%lx] - result [%s]"), (long)this, bResult ? wxT("T") : wxT("F") ); + return bResult; +} +#endif + bool wxToolBar::Realize() { if (m_tools.GetCount() == 0) - return FALSE; + return false; - int x = m_xMargin + kwxMacToolBarLeftMargin ; - int y = m_yMargin + kwxMacToolBarTopMargin ; + int maxWidth = 0; + int maxHeight = 0; - 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::Node *node = m_tools.GetFirst(); - while ( node ) + int x = m_xMargin + kwxMacToolBarLeftMargin; + int y = m_yMargin + kwxMacToolBarTopMargin; + + int tw, th; + GetSize( &tw, &th ); + + // find the maximum tool width and height + wxToolBarTool *tool; + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); - wxSize sz = tool->GetSize() ; + 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; + 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; + +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex currentPosition = 0; + bool insertAll = false; +#endif + node = m_tools.GetFirst(); - while (node) + while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); - wxSize cursize = tool->GetSize() ; - - // for the moment we just do a single row/column alignement + 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(); if ( x + cursize.x > maxWidth ) - maxWidth = x + cursize.x ; + maxWidth = x + cursize.x; if ( y + cursize.y > maxHeight ) - maxHeight = y + cursize.y ; - - tool->SetPosition( wxPoint( x , y ) ) ; - + maxHeight = y + cursize.y; + + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + { + int x1 = x + ( maxToolWidth - cursize.x ) / 2; + tool->SetPosition( wxPoint(x1, y) ); + } + else + { + 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 ) { - y += cursize.y ; + HIToolbarItemRef hiItemRef = tool->GetToolbarItemRef(); + if ( hiItemRef != NULL ) + { + if ( insertAll || (tool->GetIndex() != currentPosition) ) + { + OSStatus err = noErr; + if ( !insertAll ) + { + insertAll = true; + + // 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 ); + } + + if (err != noErr) + { + wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err ); + wxFAIL_MSG( errMsg.c_str() ); + } + } + + err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef, currentPosition ); + if (err != noErr) + { + wxString errMsg = wxString::Format( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err ); + wxFAIL_MSG( errMsg.c_str() ); + } + + tool->SetIndex( currentPosition ); + } + + currentPosition++; + } + } +#endif + + // 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 { - x += cursize.x ; + if ( !lastIsRadio ) + { + if ( tool->Toggle( true ) ) + { + DoToggleTool( tool, true ); + setChoiceInGroup = true; + } + } + else if ( tool->IsToggled() ) + { + 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 ( m_maxRows == 0 ) - { - // if not set yet, only one row - SetRows(1); - } - maxWidth = tw ; + // if not set yet, only one row + if ( m_maxRows <= 0 ) + SetRows( 1 ); + + m_minWidth = maxWidth; + maxWidth = tw; maxHeight += m_yMargin + kwxMacToolBarTopMargin; - m_maxHeight = maxHeight ; + m_minHeight = m_maxHeight = maxHeight; } else { - if ( GetToolsCount() > 0 && m_maxRows == 0 ) + // 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 + // FIXME: should this be OSX-only? + { + bool wantNativeToolbar, ownToolbarInstalled; + + // attempt to install the native toolbar + wantNativeToolbar = ((GetWindowStyleFlag() & wxTB_VERTICAL) == 0); + MacInstallNativeToolbar( wantNativeToolbar ); + (void)MacTopLevelHasNativeToolbar( &ownToolbarInstalled ); + if (!ownToolbarInstalled) { - // if not set yet, have one column - SetRows(GetToolsCount()); + SetSize( maxWidth, maxHeight ); + InvalidateBestSize(); } - maxHeight = th ; - maxWidth += m_xMargin + kwxMacToolBarLeftMargin; - m_maxWidth = maxWidth ; } - +#else SetSize( maxWidth, maxHeight ); - - return TRUE; + InvalidateBestSize(); +#endif + + SetBestFittingSize(); + + return true; } void wxToolBar::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x+4; m_defaultHeight = size.y+4; + 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 = kHIToolbarDisplaySizeNormal; + else if ( maxs > 24 ) + sizeSpec = kHIToolbarDisplaySizeDefault; + else + sizeSpec = kHIToolbarDisplaySizeSmall; + + HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec ); + } +#endif } // The button size is bigger than the bitmap size wxSize wxToolBar::GetToolSize() const { - return wxSize(m_defaultWidth + 4, m_defaultHeight + 4); + return wxSize(m_defaultWidth + kwxMacToolBorder, m_defaultHeight + kwxMacToolBorder); } void wxToolBar::SetRows(int nRows) { - if ( nRows == m_maxRows ) - { - // avoid resizing the frame uselessly - return; - } - - m_maxRows = nRows; + // avoid resizing the frame uselessly + if ( nRows != m_maxRows ) + m_maxRows = nRows; } -void wxToolBar::MacSuperChangedPosition() +void wxToolBar::MacSuperChangedPosition() { - wxWindow::MacSuperChangedPosition() ; - Realize() ; + wxWindow::MacSuperChangedPosition(); + +#if wxMAC_USE_NATIVE_TOOLBAR + if (! m_macUsesNativeToolbar ) + Realize(); +#else + + Realize(); +#endif } wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const { - wxToolBarToolsList::Node *node = m_tools.GetFirst(); - while (node) + wxToolBarTool *tool; + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); + while ( node != NULL ) { - wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ; - wxRect2DInt r( tool->GetPosition() , tool->GetSize() ) ; - if ( r.Contains( wxPoint( x , y ) ) ) + tool = (wxToolBarTool *)node->GetData(); + if (tool != NULL) { - return tool; + wxRect2DInt r( tool->GetPosition(), tool->GetSize() ); + if ( r.Contains( wxPoint( x, y ) ) ) + return tool; } node = node->GetNext(); } - return (wxToolBarToolBase *)NULL; + return (wxToolBarToolBase*)NULL; } wxString wxToolBar::MacGetToolTipString( wxPoint &pt ) { - wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ; - if ( tool ) - { - return tool->GetShortHelp() ; - } - return wxEmptyString ; + wxToolBarToolBase *tool = FindToolForPosition( pt.x, pt.y ); + if ( tool != NULL ) + return tool->GetShortHelp(); + + return wxEmptyString; } void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable) { - if (!IsShown()) - return ; + if ( t != NULL ) + ((wxToolBarTool*)t)->DoEnable( enable ); +} +void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle) +{ wxToolBarTool *tool = (wxToolBarTool *)t; - if ( tool->IsControl() ) - { - tool->GetControl()->Enable( enable ) ; - } - else if ( tool->IsButton() ) - { - if ( enable ) - UMAActivateControl( (ControlRef) tool->GetControlHandle() ) ; - else - UMADeactivateControl( (ControlRef) tool->GetControlHandle() ) ; - } + if ( ( tool != NULL ) && tool->IsButton() ) + tool->UpdateToggleImage( toggle ); } -void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle) +bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) { - if (!IsShown()) - return ; + wxToolBarTool *tool = wx_static_cast( wxToolBarTool*, toolBase ); + if (tool == NULL) + return false; - wxToolBarTool *tool = (wxToolBarTool *)t; - if ( tool->IsButton() ) + WindowRef window = (WindowRef) MacGetTopLevelWindowRef(); + wxSize toolSize = GetToolSize(); + Rect toolrect = { 0, 0, toolSize.y, toolSize.x }; + ControlRef controlHandle = NULL; + OSStatus err = 0; + + switch (tool->GetStyle()) { - ::SetControl32BitValue( (ControlRef) tool->GetControlHandle() , toggle ) ; + case wxTOOL_STYLE_SEPARATOR: + { + wxASSERT( tool->GetControlHandle() == NULL ); + toolSize.x /= 4; + toolSize.y /= 4; + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + toolrect.bottom = toolSize.y; + else + toolrect.right = toolSize.x; + +#ifdef __WXMAC_OSX__ + // in flat style we need a visual separator +#if wxMAC_USE_NATIVE_TOOLBAR + HIToolbarItemRef item; + err = HIToolbarItemCreate( + kHIToolbarSeparatorIdentifier, + kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, + &item ); + if (err == noErr) + tool->SetToolbarItemRef( item ); +#endif + + CreateSeparatorControl( window, &toolrect, &controlHandle ); + tool->SetControlHandle( controlHandle ); +#endif + } + break; + + case wxTOOL_STYLE_BUTTON: + { + 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; + err = CreateBevelButtonControl( window, + &toolrect, CFSTR(""), kControlBevelButtonNormalBevel, + behaviour, &info, 0, 0, 0, &controlHandle ); + } + +#if wxMAC_USE_NATIVE_TOOLBAR + HIToolbarItemRef item; + 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, 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 ); + + tool->SetControlHandle( controlHandle ); + } + break; + + case wxTOOL_STYLE_CONTROL: + wxASSERT( tool->GetControl() != NULL ); + +#if 0 // wxMAC_USE_NATIVE_TOOLBAR + // FIXME: doesn't work yet... + { + HIToolbarItemRef item; + wxString labelStr = wxString::Format( wxT("%xd"), (int)tool ); + result = HIToolbarItemCreate( + wxMacCFStringHolder( labelStr, wxFont::GetDefaultEncoding() ), + kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, + &item ); + if ( result == noErr ) + { + 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 + break; + + default: + break; } -} -bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), - wxToolBarToolBase *tool) -{ - // nothing special to do here - we relayout in Realize() later - tool->Attach(this); + if ( err == noErr ) + { + if ( controlHandle ) + { + ControlRef container = (ControlRef) GetHandle(); + wxASSERT_MSG( container != NULL, wxT("No valid Mac container control") ); + + UMAShowControl( controlHandle ); + ::EmbedControl( controlHandle, container ); + } + + if ( tool->CanBeToggled() && tool->IsToggled() ) + tool->UpdateToggleImage( true ); + + // nothing special to do here - we relayout in Realize() later + tool->Attach( this ); + InvalidateBestSize(); + } + else + { + wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long)err ); + wxFAIL_MSG( errMsg.c_str() ); + } - return TRUE; + return (err == noErr); } void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle)) { - wxFAIL_MSG( _T("not implemented") ); + wxFAIL_MSG( wxT("not implemented") ); } -bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) +bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase) { - wxToolBarToolsList::Node *node; + wxToolBarTool* tool = wx_static_cast( wxToolBarTool*, toolbase ); + wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { wxToolBarToolBase *tool2 = node->GetData(); @@ -497,50 +1292,153 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) } } - wxSize sz = ((wxToolBarTool*)tool)->GetSize() ; + wxSize sz = ((wxToolBarTool*)tool)->GetSize(); tool->Detach(); +#if wxMAC_USE_NATIVE_TOOLBAR + CFIndex removeIndex = tool->GetIndex(); +#endif + + switch ( tool->GetStyle() ) + { + case wxTOOL_STYLE_CONTROL: + { + tool->GetControl()->Destroy(); + tool->ClearControl(); + } + break; + + case wxTOOL_STYLE_BUTTON: + case wxTOOL_STYLE_SEPARATOR: + if ( tool->GetControlHandle() ) + { +#if wxMAC_USE_NATIVE_TOOLBAR + if ( removeIndex != -1 && m_macHIToolbarRef ) + { + HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, removeIndex ); + tool->SetIndex( -1 ); + } +#endif + + tool->ClearControl(); + } + break; + + default: + break; + } + // and finally reposition all the controls after this one - - for ( /* node -> first after deleted */ ; node; node = node->GetNext() ) + + for ( /* node -> first after deleted */; node; node = node->GetNext() ) { wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData(); - wxPoint pt = tool2->GetPosition() ; + wxPoint pt = tool2->GetPosition(); if ( GetWindowStyleFlag() & wxTB_VERTICAL ) - { - pt.y -= sz.y ; - } + pt.y -= sz.y; else - { - pt.x -= sz.x ; - } - tool2->SetPosition( pt ) ; + pt.x -= sz.x; + + tool2->SetPosition( pt ); + +#if wxMAC_USE_NATIVE_TOOLBAR + if ( removeIndex != -1 && tool2->GetIndex() > removeIndex ) + tool2->SetIndex( tool2->GetIndex() - 1 ); +#endif } - - return TRUE ; + + InvalidateBestSize(); + + return true; } void wxToolBar::OnPaint(wxPaintEvent& event) { - wxPaintDC dc(this) ; - wxMacPortSetter helper(&dc) ; - int w, h ; - GetSize( &w , &h ) ; - - Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , - dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ; -/* - if( toolbarrect.left < 0 ) - toolbarrect.left = 0 ; - if ( toolbarrect.top < 0 ) - toolbarrect.top = 0 ; -*/ - UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; +#if wxMAC_USE_NATIVE_TOOLBAR + if ( m_macUsesNativeToolbar ) + { + event.Skip(true); + return; + } +#endif + + wxPaintDC dc(this); + + int w, h; + GetSize( &w, &h ); + + bool drawMetalTheme = MacGetTopLevelWindow()->MacGetMetalAppearance(); + bool minimumUmaAvailable = (UMAGetSystemVersion() >= 0x1030); + +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( !drawMetalTheme && minimumUmaAvailable ) + { + HIThemePlacardDrawInfo info; + 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 ); + } + else + { + // leave the background as it is (striped or metal) + } + +#else + + const bool drawBorder = true; - event.Skip() ; + if (drawBorder) + { + wxMacPortSetter helper( &dc ); + + if ( !drawMetalTheme || !minimumUmaAvailable ) + { + Rect toolbarrect = { dc.YLOG2DEVMAC(0), dc.XLOG2DEVMAC(0), + dc.YLOG2DEVMAC(h), dc.XLOG2DEVMAC(w) }; + +#if 0 + if ( toolbarrect.left < 0 ) + toolbarrect.left = 0; + if ( toolbarrect.top < 0 ) + toolbarrect.top = 0; +#endif + + UMADrawThemePlacard( &toolbarrect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ); + } + else + { +#if TARGET_API_MAC_OSX + 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 ); + QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); + + CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top ); + CGContextScaleCTM( cgContext, 1, -1 ); + + HIThemeBackgroundDrawInfo drawInfo; + drawInfo.version = 0; + drawInfo.state = kThemeStateActive; + drawInfo.kind = kThemeBackgroundMetal; + HIThemeApplyBackground( &hiToolbarrect, &drawInfo, cgContext, kHIThemeOrientationNormal ); + + QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext ); +#endif + } + } +#endif + + event.Skip(); } #endif // wxUSE_TOOLBAR -