X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df7998fce5569c46a0f14456966adcef6521efc9..947848a1dd47b81092bebe435ec60e7c771c55a0:/src/mac/carbon/toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 33d8c6aaad..7f12f1cc6b 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -1,51 +1,53 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "toolbar.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_TOOLBAR
 
-#include "wx/wx.h"
-#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()
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
 
+#include "wx/app.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 ; // 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 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 ;
+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
 
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+    EVT_PAINT( wxToolBar::OnPaint )
+END_EVENT_TABLE()
+
+
 #pragma mark -
 #pragma mark Tool Implementation
 
@@ -59,443 +61,456 @@ const short kwxMacToolSpacing = 0 ;
 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, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    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, const wxString& label)
+        : wxToolBarToolBase(tbar, control, label)
     {
-        Init() ;
+        Init();
         if (control != NULL)
-            SetControlHandle( (ControlRef) control->GetHandle() ) ;
+            SetControlHandle( (ControlRef) control->GetHandle() );
     }
 
-    ~wxToolBarTool()
+    virtual ~wxToolBarTool()
     {
-        ClearControl() ;
-        if ( m_controlHandle )
-            DisposeControl( m_controlHandle ) ;
-#if wxMAC_USE_NATIVE_TOOLBAR
-        if ( m_toolbarItemRef )
-            CFRelease( m_toolbarItemRef ) ;
-#endif
+        ClearControl();
     }
 
     WXWidget GetControlHandle()
     {
-        return (WXWidget) m_controlHandle ;
+        return (WXWidget) m_controlHandle;
     }
 
     void SetControlHandle( ControlRef handle )
     {
-        m_controlHandle = handle ;
+        m_controlHandle = handle;
     }
 
-    void SetPosition( const wxPoint& position ) ;
+    void SetPosition( const wxPoint& position );
 
     void ClearControl()
     {
-        m_control = NULL ;
+        m_control = NULL;
+        if ( m_controlHandle )
+        {
+            if ( !IsControl() )
+                DisposeControl( m_controlHandle );
+            else
+            {
+                // the embedded control is not under the responsibility of the tool
+            }
+            m_controlHandle = NULL ;
+        }
+
 #if wxMAC_USE_NATIVE_TOOLBAR
-        m_toolbarItemRef = NULL ;
+        if ( m_toolbarItemRef )
+        {
+            CFIndex count = CFGetRetainCount( m_toolbarItemRef ) ;
+            wxASSERT_MSG( count == 1 , wxT("Reference Count of native tool was not 1 in wxToolBarTool destructor") );
+            wxTheApp->MacAddToAutorelease(m_toolbarItemRef);
+            CFRelease(m_toolbarItemRef);
+            m_toolbarItemRef = NULL;
+        }
 #endif
     }
 
     wxSize GetSize() const
     {
+        wxSize curSize;
+
         if ( IsControl() )
         {
-            return GetControl()->GetSize() ;
+            curSize = GetControl()->GetSize();
         }
         else if ( IsButton() )
         {
-            return GetToolBar()->GetToolSize() ;
+            curSize = GetToolBar()->GetToolSize();
         }
         else
         {
             // separator size
-            wxSize sz = GetToolBar()->GetToolSize() ;
+            curSize = GetToolBar()->GetToolSize();
             if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
-                sz.y /= 4 ;
+                curSize.y /= 4;
             else
-                sz.x /= 4 ;
-            return sz ;
+                curSize.x /= 4;
         }
+
+        return curSize;
     }
+
     wxPoint GetPosition() const
     {
-        return wxPoint(m_x, m_y);
+        return wxPoint( m_x, m_y );
     }
-    bool DoEnable( bool enable ) ;
 
-    void UpdateToggleImage( bool toggle ) ;
+    bool DoEnable( bool enable );
+
+    void UpdateToggleImage( bool toggle );
 
 #if wxMAC_USE_NATIVE_TOOLBAR
     void SetToolbarItemRef( HIToolbarItemRef ref )
     {
         if ( m_controlHandle )
-            HideControl( m_controlHandle ) ;
+            HideControl( m_controlHandle );
         if ( m_toolbarItemRef )
-            CFRelease( m_toolbarItemRef ) ;
-        m_toolbarItemRef = ref ;
+            CFRelease( m_toolbarItemRef );
+
+        m_toolbarItemRef = ref;
         if ( m_toolbarItemRef )
         {
+            wxFont f;
+            wxFontEncoding enc;
+            if ( GetToolBar() )
+                f = GetToolBar()->GetFont();
+            if ( f.IsOk() )
+                enc = f.GetEncoding();
+            else
+                enc = wxFont::GetDefaultEncoding();
+
             HIToolbarItemSetHelpText(
-                m_toolbarItemRef, wxMacCFStringHolder( GetShortHelp() , GetToolBar()->GetFont().GetEncoding() ) ,
-                wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ;
+                m_toolbarItemRef,
+                wxMacCFStringHolder( GetShortHelp(), enc ),
+                wxMacCFStringHolder( GetLongHelp(), enc ) );
         }
     }
+
     HIToolbarItemRef GetToolbarItemRef() const
     {
-        return m_toolbarItemRef ;
+        return m_toolbarItemRef;
     }
 
     void SetIndex( CFIndex idx )
     {
-        m_index = idx ;
+        m_index = idx;
     }
 
     CFIndex GetIndex() const
     {
-        return m_index ;
+        return m_index;
     }
 #endif
 
-private :
+private:
     void Init()
     {
-        m_controlHandle = NULL ;
+        m_controlHandle = NULL;
+
 #if wxMAC_USE_NATIVE_TOOLBAR
-        m_toolbarItemRef = NULL ;
-        m_index = -1 ;
+        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 ;
+    HIToolbarItemRef m_toolbarItemRef;
     // position in its toolbar, -1 means not inserted
-    CFIndex m_index ;
+    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
-} ;
+};
 
-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 ;
-                wxToolBar   *tbar = tbartool != NULL ? ( wxToolBar * ) ( tbartool->GetToolBar() ) : NULL ;
-                if ((tbartool != NULL) && tbartool->CanBeToggled() )
+                wxToolBarTool *tbartool = (wxToolBarTool*)data;
+                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 );
+                    shouldToggle = (GetControl32BitValue( (ControlRef)(tbartool->GetControlHandle()) ) != 0);
 #endif
+
                     tbar->ToggleTool( tbartool->GetId(), shouldToggle );
                 }
+
                 if (tbartool != NULL)
                     tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );
                 result = noErr;
             }
-            break ;
+            break;
 
 #ifdef __WXMAC_OSX__
-        case kEventControlHitTest :
+        case kEventControlHitTest:
             {
-                HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation) ;
-                HIRect rect ;
-                HIViewGetBounds( controlRef , &rect ) ;
-
-                ControlPartCode pc = kControlNoPart ;
-                if ( CGRectContainsPoint( rect , pt ) )
-                    pc = kControlIconPart ;
-                cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ;
-                result = noErr ;
+                HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation);
+                HIRect rect;
+                HIViewGetBounds( controlRef, &rect );
+
+                ControlPartCode pc = kControlNoPart;
+                if ( CGRectContainsPoint( rect, pt ) )
+                    pc = kControlIconPart;
+                cEvent.SetParameter( kEventParamControlPart, typeControlPartCode, pc );
+                result = noErr;
             }
-            break ;
+            break;
 #endif
 
-        default :
-            break ;
+        default:
+            break;
     }
-    return result ;
+
+    return result;
 }
 
-static 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 ;
+        case kEventClassControl:
+            result = wxMacToolBarToolControlEventHandler( handler, event, data );
+            break;
 
-        default :
-            break ;
+        default:
+            break;
     }
-    return result ;
+
+    return result;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )
 
 #if wxMAC_USE_NATIVE_TOOLBAR
 
-//
-// native toolbar
-//
-
 static const EventTypeSpec toolBarEventList[] =
 {
-    { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,
-} ;
+    { kEventClassToolbarItem, kEventToolbarItemPerformAction },
+};
 
-static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
 {
-    OSStatus result = eventNotHandledErr ;
+    OSStatus result = eventNotHandledErr;
 
-    switch( GetEventKind( event ) )
+    switch ( GetEventKind( event ) )
     {
-        case kEventToolbarItemPerformAction :
+        case kEventToolbarItemPerformAction:
             {
-                wxToolBarTool* tbartool = (wxToolBarTool*) data ;
+                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() )
                     {
-                        if ( tbar )
+                        if ( tbar != NULL )
                             tbar->ToggleTool(toolID, !tbartool->IsToggled() );
                     }
-                    if ( tbar )
-                        tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ;
+
+                    if ( tbar != NULL )
+                        tbar->OnLeftClick( toolID, tbartool->IsToggled() );
                     result = noErr;
                 }
             }
-            break ;
+            break;
 
-        default :
-            break ;
+        default:
+            break;
     }
-    return result ;
+
+    return result;
 }
 
 static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
 {
-    OSStatus result = eventNotHandledErr ;
-    switch( GetEventClass( event ) )
+    OSStatus result = eventNotHandledErr;
+
+    switch ( GetEventClass( event ) )
     {
-        case kEventClassToolbarItem :
-            result = wxMacToolBarCommandEventHandler( handler, event, data ) ;
-            break ;
+        case kEventClassToolbarItem:
+            result = wxMacToolBarCommandEventHandler( handler, event, data );
+            break;
 
-        default :
-            break ;
+        default:
+            break;
     }
-    return result ;
+
+    return result;
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler )
 
 #endif
 
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxToolBarTool
-// ----------------------------------------------------------------------------
-
-bool wxToolBarTool::DoEnable(bool enable)
+bool wxToolBarTool::DoEnable( bool enable )
 {
     if ( IsControl() )
     {
-        GetControl()->Enable( enable ) ;
+        GetControl()->Enable( enable );
     }
     else if ( IsButton() )
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
-        if ( m_toolbarItemRef )
-            HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ;
+        if ( m_toolbarItemRef != NULL )
+            HIToolbarItemSetEnabled( m_toolbarItemRef, enable );
 #endif
 
-        if ( m_controlHandle )
+        if ( m_controlHandle != NULL )
         {
 #if TARGET_API_MAC_OSX
             if ( enable )
-                EnableControl( m_controlHandle ) ;
+                EnableControl( m_controlHandle );
             else
-                DisableControl( m_controlHandle ) ;
+                DisableControl( m_controlHandle );
 #else
             if ( enable )
-                ActivateControl( m_controlHandle ) ;
+                ActivateControl( m_controlHandle );
             else
-                DeactivateControl( m_controlHandle ) ;
+                DeactivateControl( m_controlHandle );
 #endif
         }
     }
-    return true ;
+
+    return true;
 }
 
-void wxToolBarTool::SetPosition(const wxPoint& position)
+void wxToolBarTool::SetPosition( const wxPoint& position )
 {
     m_x = position.x;
     m_y = position.y;
 
-    int x , y ;
-    x = y = 0 ;
-    int mac_x = position.x ;
-    int mac_y = position.y ;
-
-    if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() )
-    {
-        GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
-        mac_x += x;
-        mac_y += y;
-    }
+    int mac_x = position.x;
+    int mac_y = position.y;
 
     if ( IsButton() )
     {
-        Rect contrlRect ;
-        GetControlBounds( m_controlHandle , &contrlRect ) ;
-        int former_mac_x = contrlRect.left ;
-        int former_mac_y = contrlRect.top ;
-        GetToolBar()->GetToolSize() ;
+        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 ) ;
+        // embedded native controls are moved by the OS
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if ( ((wxToolBar*)GetToolBar())->MacWantsNativeToolbar() == false )
+#endif
+        {
+            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 ;
+        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 ) ;
-        }
+            UMAMoveControl( m_controlHandle, mac_x, mac_y );
 #endif
     }
 }
 
 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)
+#ifdef __WXMAC_OSX__
+    if ( toggle )
     {
-        OptionBits addAttrs, removeAttrs;
-        OSStatus result;
-
-        if (toggle)
-        {
-            addAttrs = kHIToolbarItemSelected;
-            removeAttrs = kHIToolbarItemNoAttributes;
-        }
-        else
+        int w = m_bmpNormal.GetWidth();
+        int h = m_bmpNormal.GetHeight();
+        wxBitmap bmp( w, h );
+        wxMemoryDC dc;
+
+        dc.SelectObject( bmp );
+        dc.SetPen( wxPen(*wxBLACK) );
+        dc.SetBrush( wxBrush( *wxLIGHT_GREY ));
+        dc.DrawRectangle( 0, 0, w, h );
+        dc.DrawBitmap( m_bmpNormal, 0, 0, true );
+        dc.SelectObject( wxNullBitmap );
+        ControlButtonContentInfo info;
+        wxMacCreateBitmapButton( &info, bmp, kControlContentIconRef );
+        SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if (m_toolbarItemRef != NULL)
         {
-            addAttrs = kHIToolbarItemNoAttributes;
-            removeAttrs = kHIToolbarItemSelected;
+            HIToolbarItemSetIconRef( m_toolbarItemRef, info.u.iconRef );
         }
-
-        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 ) ;
+        wxMacReleaseBitmapButton( &info );
     }
     else
     {
-        ControlButtonContentInfo info ;
-        wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
-        SetControlData( m_controlHandle , 0, kControlIconContentTag,
-                        sizeof( info ), (Ptr)&info );
-        wxMacReleaseBitmapButton( &info ) ;
+        ControlButtonContentInfo info;
+        wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef );
+        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 );
     }
 
-    IconTransformType transform = toggle ? kTransformSelected : kTransformNone ;
-    SetControlData( m_controlHandle, 0, kControlIconTransformTag,
-                    sizeof( transform ), (Ptr)&transform );
-    HIViewSetNeedsDisplay( m_controlHandle , true ) ;
+    IconTransformType transform = toggle ? kTransformSelected : kTransformNone;
+    SetControlData(
+        m_controlHandle, 0, kControlIconTransformTag,
+        sizeof(transform), (Ptr)&transform );
+    HIViewSetNeedsDisplay( m_controlHandle, true );
 
 #else
-    ::SetControl32BitValue( m_controlHandle , toggle ) ;
+    ::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)
+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();
 }
@@ -503,22 +518,25 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
 #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)
+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, const wxString& label)
 {
-    return new wxToolBarTool(this, control);
+    return new wxToolBarTool(this, control, label);
 }
 
 void wxToolBar::Init()
@@ -527,58 +545,323 @@ void wxToolBar::Init()
     m_maxHeight = -1;
     m_defaultWidth = kwxMacToolBarToolDefaultWidth;
     m_defaultHeight = kwxMacToolBarToolDefaultHeight;
+
 #if wxMAC_USE_NATIVE_TOOLBAR
-    m_macHIToolbarRef = NULL ;
-    m_macUsesNativeToolbar = false ;
+    m_macHIToolbarRef = NULL;
+    m_macUsesNativeToolbar = false;
 #endif
 }
 
+#define kControlToolbarItemClassID      CFSTR( "org.wxwidgets.controltoolbaritem" )
+
+const EventTypeSpec kEvents[] =
+{
+    { kEventClassHIObject, kEventHIObjectConstruct },
+    { kEventClassHIObject, kEventHIObjectInitialize },
+    { kEventClassHIObject, kEventHIObjectDestruct },
+
+    { kEventClassToolbarItem, kEventToolbarItemCreateCustomView }
+};
+
+const EventTypeSpec kViewEvents[] =
+{
+    { kEventClassControl, kEventControlGetSizeConstraints }
+};
+
+struct ControlToolbarItem
+{
+    HIToolbarItemRef    toolbarItem;
+    HIViewRef           viewRef;
+    wxSize              lastValidSize ;
+};
+
+static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData )
+{
+    OSStatus            result = eventNotHandledErr;
+    ControlToolbarItem* object = (ControlToolbarItem*)inUserData;
+
+    switch ( GetEventClass( inEvent ) )
+    {
+        case kEventClassHIObject:
+            switch ( GetEventKind( inEvent ) )
+            {
+                case kEventHIObjectConstruct:
+                    {
+                        HIObjectRef         toolbarItem;
+                        ControlToolbarItem* item;
+
+                        GetEventParameter( inEvent, kEventParamHIObjectInstance, typeHIObjectRef, NULL,
+                            sizeof( HIObjectRef ), NULL, &toolbarItem );
+
+                        item = (ControlToolbarItem*) malloc(sizeof(ControlToolbarItem)) ;
+                        item->toolbarItem = toolbarItem ;
+                        item->viewRef = NULL ;
+
+                        SetEventParameter( inEvent, kEventParamHIObjectInstance, typeVoidPtr, sizeof( void * ), &item );
+
+                        result = noErr ;
+                    }
+                    break;
+
+                case kEventHIObjectInitialize:
+                    result = CallNextEventHandler( inCallRef, inEvent );
+                    if ( result == noErr )
+                    {
+                        CFDataRef           data;
+                        GetEventParameter( inEvent, kEventParamToolbarItemConfigData, typeCFTypeRef, NULL,
+                            sizeof( CFTypeRef ), NULL, &data );
+
+                        HIViewRef viewRef ;
+
+                        wxASSERT_MSG( CFDataGetLength( data ) == sizeof( viewRef ) , wxT("Illegal Data passed") ) ;
+                        memcpy( &viewRef , CFDataGetBytePtr( data ) , sizeof( viewRef ) ) ;
+
+                        object->viewRef = (HIViewRef) viewRef ;
+
+                        result = noErr ;
+                    }
+                    break;
+
+                case kEventHIObjectDestruct:
+                    {
+                        // we've increased the ref count when creating this, so we decrease manually again in case
+                        // it was never really installed and deinstalled
+                        HIViewRef viewRef = object->viewRef ;
+                        if( viewRef && IsValidControlHandle( viewRef)  )
+                        {
+                            CFIndex count =  CFGetRetainCount( viewRef ) ;
+                            if ( count >= 1 )
+                                CFRelease( viewRef ) ;
+                        }
+	                    free( object ) ;
+    	                result = noErr;
+                    }
+                    break;
+            }
+            break;
+
+        case kEventClassToolbarItem:
+            switch ( GetEventKind( inEvent ) )
+            {
+                case kEventToolbarItemCreateCustomView:
+                {
+                    HIViewRef viewRef = object->viewRef ;
+
+                    HIViewRemoveFromSuperview( viewRef ) ;
+                    HIViewSetVisible(viewRef, true) ;
+                    InstallEventHandler( GetControlEventTarget( viewRef ), ControlToolbarItemHandler,
+                                            GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL );
+
+                    result = SetEventParameter( inEvent, kEventParamControlRef, typeControlRef, sizeof( HIViewRef ), &viewRef );
+                }
+                break;
+            }
+            break;
+
+        case kEventClassControl:
+            switch ( GetEventKind( inEvent ) )
+            {
+                case kEventControlGetSizeConstraints:
+                {
+                    wxWindow* wxwindow = wxFindControlFromMacControl(object->viewRef ) ;
+                    if ( wxwindow )
+                    {
+                        wxSize sz = wxwindow->GetSize() ;
+                        sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
+                        sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
+                        // during toolbar layout the native window sometimes gets negative sizes
+                        // so we always keep the last valid size here, to make sure we survive the
+                        // shuffle ...
+                        if ( sz.x > 0 && sz.y > 0 )
+                            object->lastValidSize = sz ;
+                        else
+                            sz = object->lastValidSize ;
+
+                        HISize min, max;
+                        min.width = max.width = sz.x ;
+                        min.height = max.height = sz.y ;
+
+                        result = SetEventParameter( inEvent, kEventParamMinimumSize, typeHISize,
+                                                        sizeof( HISize ), &min );
+
+                        result = SetEventParameter( inEvent, kEventParamMaximumSize, typeHISize,
+                                                        sizeof( HISize ), &max );
+                        result = noErr ;
+                    }
+                }
+                break;
+            }
+            break;
+    }
+
+    return result;
+}
+
+void RegisterControlToolbarItemClass()
+{
+    static bool sRegistered;
+
+    if ( !sRegistered )
+    {
+        HIObjectRegisterSubclass( kControlToolbarItemClassID, kHIToolbarItemClassID, 0,
+                ControlToolbarItemHandler, GetEventTypeCount( kEvents ), kEvents, 0, NULL );
+
+        sRegistered = true;
+    }
+}
+
+HIToolbarItemRef CreateControlToolbarItem(CFStringRef inIdentifier, CFTypeRef inConfigData)
+{
+    RegisterControlToolbarItemClass();
+
+    OSStatus            err;
+    EventRef            event;
+    UInt32              options = kHIToolbarItemAllowDuplicates;
+    HIToolbarItemRef    result = NULL;
+
+    err = CreateEvent( NULL, kEventClassHIObject, kEventHIObjectInitialize, GetCurrentEventTime(), 0, &event );
+    require_noerr( err, CantCreateEvent );
+
+    SetEventParameter( event, kEventParamAttributes, typeUInt32, sizeof( UInt32 ), &options );
+    SetEventParameter( event, kEventParamToolbarItemIdentifier, typeCFStringRef, sizeof( CFStringRef ), &inIdentifier );
+
+    if ( inConfigData )
+        SetEventParameter( event, kEventParamToolbarItemConfigData, typeCFTypeRef, sizeof( CFTypeRef ), &inConfigData );
+
+    err = HIObjectCreate( kControlToolbarItemClassID, event, (HIObjectRef*)&result );
+    check_noerr( err );
+
+    ReleaseEvent( event );
+CantCreateEvent :
+    return result ;
+}
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+static const EventTypeSpec kToolbarEvents[] =
+{
+    { kEventClassToolbar, kEventToolbarGetDefaultIdentifiers },
+    { kEventClassToolbar, kEventToolbarGetAllowedIdentifiers },
+    { kEventClassToolbar, kEventToolbarCreateItemWithIdentifier },
+};
+
+static OSStatus ToolbarDelegateHandler( EventHandlerCallRef inCallRef, EventRef inEvent, void* inUserData )
+{
+    OSStatus result = eventNotHandledErr;
+    // Not yet needed
+    // wxToolBar* toolbar = (wxToolBar*) inUserData ;
+    CFMutableArrayRef   array;
+
+    switch ( GetEventKind( inEvent ) )
+    {
+        case kEventToolbarGetDefaultIdentifiers:
+            {
+                GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL,
+                    sizeof( CFMutableArrayRef ), NULL, &array );
+                // not implemented yet
+                // GetToolbarDefaultItems( array );
+                result = noErr;
+            }
+            break;
+
+        case kEventToolbarGetAllowedIdentifiers:
+            {
+                GetEventParameter( inEvent, kEventParamMutableArray, typeCFMutableArrayRef, NULL,
+                    sizeof( CFMutableArrayRef ), NULL, &array );
+                // not implemented yet
+                // GetToolbarAllowedItems( array );
+                result = noErr;
+            }
+            break;
+        case kEventToolbarCreateItemWithIdentifier:
+            {
+                HIToolbarItemRef        item = NULL;
+                CFTypeRef               data = NULL;
+                CFStringRef             identifier = NULL ;
+
+                GetEventParameter( inEvent, kEventParamToolbarItemIdentifier, typeCFStringRef, NULL,
+                        sizeof( CFStringRef ), NULL, &identifier );
+
+                GetEventParameter( inEvent, kEventParamToolbarItemConfigData, typeCFTypeRef, NULL,
+                        sizeof( CFTypeRef ), NULL, &data );
+
+                if ( CFStringCompare( kControlToolbarItemClassID, identifier, kCFCompareBackwards ) == kCFCompareEqualTo )
+                {
+                    item = CreateControlToolbarItem( kControlToolbarItemClassID, data );
+                    if ( item )
+                    {
+                        SetEventParameter( inEvent, kEventParamToolbarItem, typeHIToolbarItemRef,
+                            sizeof( HIToolbarItemRef ), &item );
+                        result = noErr;
+                    }
+                }
+
+            }
+            break;
+    }
+    return result ;
+}
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
 // 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, wxDefaultValidator, name ) )
-        return false ;
+    if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
+        return false;
 
-    OSStatus err = 0;
+    FixupStyle();
+
+    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  );
+    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 ;
+        InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler,
+                GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL );
+
+        HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;
+        HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall;
 
         if ( style & wxTB_NOICONS )
-            mode = kHIToolbarDisplayModeLabelOnly ;
+            mode = kHIToolbarDisplayModeLabelOnly;
         else if ( style & wxTB_TEXT )
-            mode = kHIToolbarDisplayModeIconAndLabel ;
+            mode = kHIToolbarDisplayModeIconAndLabel;
         else
-            mode = kHIToolbarDisplayModeIconOnly ;
+            mode = kHIToolbarDisplayModeIconOnly;
 
-        HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef , mode ) ;
-        HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef , displaySize ) ;
+        HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
+        HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, displaySize );
     }
-#endif
+#endif // wxMAC_USE_NATIVE_TOOLBAR
 
-    return (err == 0);
+    return (err == noErr);
 }
 
 wxToolBar::~wxToolBar()
 {
 #if wxMAC_USE_NATIVE_TOOLBAR
-    if ( m_macHIToolbarRef )
+    if (m_macHIToolbarRef != NULL)
     {
         // if this is the installed toolbar, then deinstall it
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
-        CFRelease( (HIToolbarRef) m_macHIToolbarRef );
+        CFIndex count = CFGetRetainCount( m_macHIToolbarRef ) ;
+        wxASSERT_MSG( count == 1 , wxT("Reference Count of native control was not 1 in wxToolBar destructor") );
+
+        CFRelease( (HIToolbarRef)m_macHIToolbarRef );
         m_macHIToolbarRef = NULL;
     }
 #endif
@@ -586,10 +869,9 @@ wxToolBar::~wxToolBar()
 
 bool wxToolBar::Show( bool show )
 {
-    bool bResult;
     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
+    bool bResult = (tlw != NULL);
 
-    bResult = (tlw != NULL);
     if (bResult)
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
@@ -597,12 +879,16 @@ 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 );
+#else
+
+        bResult = wxToolBarBase::Show( show );
+#endif
     }
 
     return bResult;
@@ -613,13 +899,20 @@ bool wxToolBar::IsShown() const
     bool bResult;
 
 #if wxMAC_USE_NATIVE_TOOLBAR
-    bool ownToolbarInstalled ;
+    bool ownToolbarInstalled;
+
     MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
     if (ownToolbarInstalled)
-        bResult = HIViewIsVisible( (HIViewRef)m_macHIToolbarRef );
+    {
+        WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
+        bResult = IsWindowToolbarVisible( tlw );
+    }
     else
-#endif
         bResult = wxToolBarBase::IsShown();
+#else
+
+    bResult = wxToolBarBase::IsShown();
+#endif
 
     return bResult;
 }
@@ -633,7 +926,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;
@@ -641,13 +934,26 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
             *height = boundsR.bottom - boundsR.top;
     }
     else
-#endif
         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)
     {
@@ -683,7 +989,7 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const
     {
         HIToolbarRef curToolbarRef = NULL;
         OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
-        bResultV = ((err == 0) && (curToolbarRef != NULL));
+        bResultV = ((err == noErr) && (curToolbarRef != NULL));
         if (bResultV && (ownToolbarInstalled != NULL))
             *ownToolbarInstalled = (curToolbarRef == m_macHIToolbarRef);
     }
@@ -695,20 +1001,20 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 {
     bool bResult = false;
 
-    WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
-    if (tlw == NULL)
-        return bResult;
-
     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 != 0)
+    if (err != noErr)
         curToolbarRef = NULL;
 
     m_macUsesNativeToolbar = usesNative;
@@ -725,20 +1031,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 };
-            //
-            //
+            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 );
         }
@@ -751,15 +1046,10 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             bResult = true;
 
             ShowHideWindowToolbar( tlw, false, false );
-            ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute );
+            ChangeWindowAttributes( tlw, 0, kWindowToolbarButtonAttribute );
             SetWindowToolbar( tlw, NULL );
 
-            // FIXME: which is best, which is necessary?
             m_peer->SetVisibility( true, true );
-
-            //
-            // wxToolBarBase::Show( true );
-            //
         }
     }
 
@@ -776,19 +1066,11 @@ bool wxToolBar::Realize()
     if (m_tools.GetCount() == 0)
         return false;
 
-#if wxMAC_USE_NATIVE_TOOLBAR
-    // remove all tools, no way to determine how many there are in a toolbar, so just a high number :-(
-    OSStatus err = noErr ;
-    if ( m_macHIToolbarRef != NULL )
-    {
-        for ( CFIndex i = 0 ; i < 100 ; ++i )
-        {
-            err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , i ) ;
-        }
-    }
+    int maxWidth = 0;
+    int maxHeight = 0;
 
-    wxASSERT_MSG( err == noErr, _T("HIToolbarRemoveItemAtIndex failed") );
-#endif // wxMAC_USE_NATIVE_TOOLBAR
+    int maxToolWidth = 0;
+    int maxToolHeight = 0;
 
     int x = m_xMargin + kwxMacToolBarLeftMargin;
     int y = m_yMargin + kwxMacToolBarTopMargin;
@@ -796,18 +1078,12 @@ bool wxToolBar::Realize()
     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();
+    wxToolBarTool *tool;
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node != NULL )
     {
-        wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
-
+        tool = (wxToolBarTool *) node->GetData();
         if ( tool != NULL )
         {
             wxSize  sz = tool->GetSize();
@@ -821,27 +1097,25 @@ bool wxToolBar::Realize()
         node = node->GetNext();
     }
 
-    bool    lastIsRadio = false;
-    bool    curIsRadio = false;
-    bool    setChoiceInGroup = false;
-
-    node = m_tools.GetFirst();
+    bool lastIsRadio = false;
+    bool curIsRadio = false;
 
 #if wxMAC_USE_NATIVE_TOOLBAR
-    CFIndex currentPosition = 0 ;
-#endif // wxMAC_USE_NATIVE_TOOLBAR
+    CFIndex currentPosition = 0;
+    bool insertAll = false;
+#endif
 
+    node = m_tools.GetFirst();
     while ( node != NULL )
     {
-        wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
-
+        tool = (wxToolBarTool*) node->GetData();
         if ( tool == NULL )
         {
             node = node->GetNext();
             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 )
@@ -873,17 +1147,43 @@ bool wxToolBar::Realize()
             HIToolbarItemRef    hiItemRef = tool->GetToolbarItemRef();
             if ( hiItemRef != NULL )
             {
-                OSStatus result = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef , currentPosition ) ;
-                if ( result == 0 )
+                if ( insertAll || (tool->GetIndex() != currentPosition) )
                 {
-                    tool->SetIndex( currentPosition ) ;
-                    currentPosition++ ;
-                    InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(),
-                                         GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
+                    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 // wxMAC_USE_NATIVE_TOOLBAR
+#endif
 
         // update radio button (and group) state
         lastIsRadio = curIsRadio;
@@ -893,17 +1193,14 @@ bool wxToolBar::Realize()
         {
             if ( tool->IsToggled() )
                 DoToggleTool( tool, true );
-
-            setChoiceInGroup = false;
         }
         else
         {
             if ( !lastIsRadio )
             {
-                if ( tool->Toggle(true) )
+                if ( tool->Toggle( true ) )
                 {
                     DoToggleTool( tool, true );
-                    setChoiceInGroup = true;
                 }
             }
             else if ( tool->IsToggled() )
@@ -918,7 +1215,7 @@ bool wxToolBar::Realize()
                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
                         break;
 
-                    if ( toggleTool->Toggle(false) )
+                    if ( toggleTool->Toggle( false ) )
                         DoToggleTool( toggleTool, false );
 
                     nodePrev = nodePrev->GetPrevious();
@@ -972,7 +1269,7 @@ bool wxToolBar::Realize()
     InvalidateBestSize();
 #endif
 
-    SetBestFittingSize();
+    SetInitialSize();
 
     return true;
 }
@@ -986,13 +1283,13 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     if (m_macHIToolbarRef != NULL)
     {
         int maxs = wxMax( size.x, size.y );
-        HIToolbarDisplaySize sizeSpec ;
+        HIToolbarDisplaySize sizeSpec;
         if ( maxs > 32 )
-            sizeSpec = kHIToolbarDisplaySizeNormal ;
+            sizeSpec = kHIToolbarDisplaySizeNormal;
         else if ( maxs > 24 )
-            sizeSpec = kHIToolbarDisplaySizeDefault ;
+            sizeSpec = kHIToolbarDisplaySizeDefault;
         else
-            sizeSpec = kHIToolbarDisplaySizeSmall ;
+            sizeSpec = kHIToolbarDisplaySizeSmall;
 
         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
     }
@@ -1009,29 +1306,56 @@ 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 )
+        Realize();
+#else
+
+    Realize();
 #endif
+}
+
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
     {
-        Realize();
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+
+        // a side-effect of the UpdateToggleImage function is that it always changes the bitmap used on the button.
+        tool->UpdateToggleImage( tool->CanBeToggled() && tool->IsToggled() );
+    }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+
+        // TODO:  what to do for this one?
     }
 }
 
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
+    wxToolBarTool *tool;
     wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
     while ( node != NULL )
     {
-        wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ;
-
+        tool = (wxToolBarTool *)node->GetData();
         if (tool != NULL)
         {
             wxRect2DInt r( tool->GetPosition(), tool->GetSize() );
@@ -1042,22 +1366,22 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
         node = node->GetNext();
     }
 
-    return (wxToolBarToolBase *)NULL;
+    return (wxToolBarToolBase*)NULL;
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {
-    wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
+    wxToolBarToolBase *tool = FindToolForPosition( pt.x, pt.y );
     if ( tool != NULL )
-        return tool->GetShortHelp() ;
+        return tool->GetShortHelp();
 
-    return wxEmptyString ;
+    return wxEmptyString;
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
     if ( t != NULL )
-        ((wxToolBarTool*)t)->DoEnable( enable ) ;
+        ((wxToolBarTool*)t)->DoEnable( enable );
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
@@ -1067,22 +1391,26 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
         tool->UpdateToggleImage( toggle );
 }
 
-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase *toolBase)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 {
-    wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolBase );
+    wxToolBarTool *tool = wx_static_cast( wxToolBarTool*, toolBase );
     if (tool == NULL)
         return false;
 
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef();
     wxSize toolSize = GetToolSize();
-    Rect toolrect = { 0, 0 , toolSize.y , toolSize.x };
+    Rect toolrect = { 0, 0, toolSize.y, toolSize.x };
     ControlRef controlHandle = NULL;
     OSStatus err = 0;
+    tool->Attach( this );
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    HIToolbarItemRef item;
+#endif
 
     switch (tool->GetStyle())
     {
-        case wxTOOL_STYLE_SEPARATOR :
+        case wxTOOL_STYLE_SEPARATOR:
             {
                 wxASSERT( tool->GetControlHandle() == NULL );
                 toolSize.x /= 4;
@@ -1092,111 +1420,122 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                 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 wxMAC_USE_NATIVE_TOOLBAR
+                err = HIToolbarItemCreate(
+                    kHIToolbarSeparatorIdentifier,
+                    kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates,
+                    &item );
                 if (err == noErr)
                     tool->SetToolbarItemRef( item );
-            #endif // wxMAC_USE_NATIVE_TOOLBAR
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
                 CreateSeparatorControl( window, &toolrect, &controlHandle );
                 tool->SetControlHandle( controlHandle );
-        #endif // __WXMAC_OSX__
             }
             break;
 
-        case wxTOOL_STYLE_BUTTON :
+        case wxTOOL_STYLE_BUTTON:
             {
-                wxASSERT( tool->GetControlHandle() == NULL ) ;
-                ControlButtonContentInfo info ;
-                wxMacCreateBitmapButton( &info , tool->GetNormalBitmap()  , kControlContentIconRef ) ;
+                wxASSERT( tool->GetControlHandle() == NULL );
+                ControlButtonContentInfo info;
+                wxMacCreateBitmapButton( &info, tool->GetNormalBitmap(), kControlContentIconRef );
 
                 if ( UMAGetSystemVersion() >= 0x1000)
-                    CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
+                {
+                    CreateIconControl( window, &toolrect, &info, false, &controlHandle );
+                }
                 else
                 {
-                    SInt16 behaviour = kControlBehaviorOffsetContents ;
+                    SInt16 behaviour = kControlBehaviorOffsetContents;
                     if ( tool->CanBeToggled() )
-                        behaviour += kControlBehaviorToggles ;
-                    CreateBevelButtonControl( window , &toolrect , CFSTR("") ,
-                                              kControlBevelButtonNormalBevel ,
-                                              behaviour , &info ,
-                                              0 , 0 , 0 , &controlHandle ) ;
+                        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)
                 {
-                    HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
+                    InstallEventHandler(
+                        HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
+                        GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
+
                     HIToolbarItemSetIconRef( item, info.u.iconRef );
                     HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );
                     tool->SetToolbarItemRef( item );
                 }
 #endif // wxMAC_USE_NATIVE_TOOLBAR
 
-                wxMacReleaseBitmapButton( &info ) ;
-                /*
-                SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
-                UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
-                */
+                wxMacReleaseBitmapButton( &info );
+
+#if 0
+                SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic );
+                UMASetControlTitle( m_controlHandle, label, wxFont::GetDefaultEncoding() );
+#endif
 
-                InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
+                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...
+        case wxTOOL_STYLE_CONTROL:
+
+#if wxMAC_USE_NATIVE_TOOLBAR
             {
+                wxASSERT( tool->GetControl() != NULL );
                 HIToolbarItemRef    item;
-                wxString labelStr = wxString::Format( wxT("%xd"), (int) tool );
-                result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
-                                              kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates,
-                                              &item );
-                if ( result == 0 )
+                HIViewRef viewRef = (HIViewRef) tool->GetControl()->GetHandle() ;
+                // as this control now is part of both the wxToolBar children and the native toolbar, we have to increase the
+                // reference count to make sure we are not dealing with zombie controls after the native toolbar has released its views
+                CFRetain( viewRef ) ;
+                CFDataRef data = CFDataCreate( kCFAllocatorDefault , (UInt8*) &viewRef , sizeof(viewRef) ) ;
+                err = HIToolbarCreateItemWithIdentifier((HIToolbarRef) m_macHIToolbarRef,kControlToolbarItemClassID,
+                    data , &item ) ;
+
+                if (err  == 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 );
                 }
-            }
+                CFRelease( data ) ;
+           }
 
 #else
-                // FIXME: right now there's nothing to do here
+                // right now there's nothing to do here
 #endif
                 break;
 
-        default :
+        default:
             break;
     }
 
-    if ( err == 0 )
+#if wxMAC_USE_NATIVE_TOOLBAR
+    wxString label = tool->GetLabel();
+    if ( !label.empty() )
+    {
+        // strip mnemonics from the label for compatibility
+        // with the usual labels in wxStaticText sense
+        label = wxStripMenuCodes(label);
+
+        HIToolbarItemSetLabel(item,
+                              wxMacCFStringHolder(label, m_font.GetEncoding()));
+    }
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
+    if ( err == noErr )
     {
         if ( controlHandle )
         {
             ControlRef container = (ControlRef) GetHandle();
-            wxASSERT_MSG( container != NULL, wxT("No valid mac container control") );
+            wxASSERT_MSG( container != NULL, wxT("No valid Mac container control") );
 
             UMAShowControl( controlHandle );
             ::EmbedControl( controlHandle, container );
@@ -1206,26 +1545,25 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
             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 );
-        wxASSERT_MSG( false, errMsg.c_str() );
+        wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long)err );
+        wxFAIL_MSG( errMsg.c_str() );
     }
 
-    return( err == 0 );
+    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 *toolbase)
 {
-    wxToolBarTool* tool = wx_static_cast( wxToolBarTool* , toolbase ) ;
+    wxToolBarTool* tool = wx_static_cast( wxToolBarTool*, toolbase );
     wxToolBarToolsList::compatibility_iterator node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
@@ -1239,66 +1577,61 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
         }
     }
 
-    wxSize sz = ((wxToolBarTool*)tool)->GetSize() ;
+    wxSize sz = ((wxToolBarTool*)tool)->GetSize();
 
     tool->Detach();
 
 #if wxMAC_USE_NATIVE_TOOLBAR
     CFIndex removeIndex = tool->GetIndex();
-#endif // wxMAC_USE_NATIVE_TOOLBAR
+#endif
 
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if ( removeIndex != -1 && m_macHIToolbarRef )
+    {
+        HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, removeIndex );
+        tool->SetIndex( -1 );
+    }
+#endif
     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:
-            {
+            if ( tool->GetControl() )
                 tool->GetControl()->Destroy();
-                tool->ClearControl() ;
-            }
             break;
 
         case wxTOOL_STYLE_BUTTON:
         case wxTOOL_STYLE_SEPARATOR:
-            if ( tool->GetControlHandle() )
-            {
-                DisposeControl( (ControlRef) tool->GetControlHandle() ) ;
-#if wxMAC_USE_NATIVE_TOOLBAR
-                if ( removeIndex != -1 && m_macHIToolbarRef )
-                {
-                    HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , removeIndex ) ;
-                    tool->SetIndex( -1 ) ;
-                }
-#endif // wxMAC_USE_NATIVE_TOOLBAR
-                tool->ClearControl() ;
-            }
+            // nothing special
             break;
 
         default:
             break;
     }
+    tool->ClearControl();
 
     // 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 ;
+            pt.x -= sz.x;
 
-        tool2->SetPosition( pt ) ;
+        tool2->SetPosition( pt );
 
 #if wxMAC_USE_NATIVE_TOOLBAR
         if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
-            tool2->SetIndex( tool2->GetIndex() - 1 ) ;
+            tool2->SetIndex( tool2->GetIndex() - 1 );
 #endif
-
     }
 
     InvalidateBestSize();
-    return true ;
+
+    return true;
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
@@ -1306,85 +1639,88 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_macUsesNativeToolbar )
     {
-        event.Skip(true) ;
-        return ;
+        event.Skip(true);
+        return;
     }
 #endif
 
-    wxPaintDC dc(this) ;
+    wxPaintDC dc(this);
+
+    int w, h;
+    GetSize( &w, &h );
+
+    bool drawMetalTheme = MacGetTopLevelWindow()->MacGetMetalAppearance();
+    bool minimumUmaAvailable = (UMAGetSystemVersion() >= 0x1030);
 
-    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 ( !drawMetalTheme && minimumUmaAvailable )
     {
-        if ( UMAGetSystemVersion() >= 0x1030 )
-        {
-            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) ;
-        }
+        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
-    wxMacPortSetter helper(&dc) ;
-
-    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 ;
-*/
-    if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
-    {
-        UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-    }
-    else
+
+    const bool drawBorder = true;
+
+    if (drawBorder)
     {
-#if TARGET_API_MAC_OSX
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-        if ( UMAGetSystemVersion() >= 0x1030 )
+        wxMacPortSetter helper( &dc );
+
+        if ( !drawMetalTheme || !minimumUmaAvailable )
         {
-            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 ) ;
+            Rect toolbarrect = { dc.YLOG2DEVMAC(0), dc.XLOG2DEVMAC(0),
+                dc.YLOG2DEVMAC(h), dc.XLOG2DEVMAC(w) };
 
-            {
-                HIThemeBackgroundDrawInfo drawInfo ;
-                drawInfo.version = 0 ;
-                drawInfo.state = kThemeStateActive ;
-                drawInfo.kind = kThemeBackgroundMetal ;
-                HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ;
-            }
+#if 0
+            if ( toolbarrect.left < 0 )
+                toolbarrect.left = 0;
+            if ( toolbarrect.top < 0 )
+                toolbarrect.top = 0;
+#endif
 
-            QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
+            UMADrawThemePlacard( &toolbarrect, IsEnabled() ? kThemeStateActive : kThemeStateInactive );
         }
         else
-#endif
         {
-            UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        }
+#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 );
+
+#ifndef __LP64__
+            QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
 #endif
+#endif
+        }
     }
 #endif
 
-    event.Skip() ;
+    event.Skip();
 }
 
 #endif // wxUSE_TOOLBAR
-