correct hhp2cached path

[wxWidgets.git] / src / mac / carbon / toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 3c9b8da316a292dc39c87500130dd22edba28f96..02778a1791c5dc59914f0436f535bbf336e38049 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -1,616 +1,1753 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        toolbar.cpp
+// Name:        src/mac/carbon/toolbar.cpp

 // Purpose:     wxToolBar
 // Purpose:     wxToolBar

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHORy
+// Copyright:   (c) Stefan Csomor
+// 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"
 
 #if wxUSE_TOOLBAR
 
 #include "wx/toolbar.h"

-#include "wx/notebook.h"
-#include "wx/tabctrl.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/app.h"
+#include "wx/mac/uma.h"
+#include "wx/geometry.h"
+#include "wx/sysopt.h"
+
+
+const short kwxMacToolBarToolDefaultWidth = 16;
+const short kwxMacToolBarToolDefaultHeight = 16;
+const short kwxMacToolBarTopMargin = 4;
+const short kwxMacToolBarLeftMargin =  4;
+const short kwxMacToolBorder = 0;
+const short kwxMacToolSpacing = 6;
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)

 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)

-       EVT_MOUSE_EVENTS( wxToolBar::OnMouse ) 
-       EVT_PAINT( wxToolBar::OnPaint ) 
+    EVT_PAINT( wxToolBar::OnPaint )

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 

-#include <wx/mac/uma.h>
+
+#pragma mark -
+#pragma mark Tool Implementation
+

 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 

+// We have a dual implementation for each tool, ControlRef and HIToolbarItemRef
+
+// when embedding native controls in the native toolbar we must make sure the
+// control does not get deleted behind our backs, so the retain count gets increased
+// (after creation it is 1), first be the creation of the custom HIToolbarItem wrapper
+// object, and second by the code 'creating' the custom HIView (which is the same as the
+// already existing native control, therefore we just increase the ref count)
+// when this view is removed from the native toolbar its count gets decremented again
+// and when the HITooolbarItem wrapper object gets destroyed it is decremented as well
+// so in the end the control lives with a refcount of one and can be disposed of by the
+// wxControl code. For embedded controls on a non-native toolbar this ref count is less
+// so we can only test against a range, not a specific value of the refcount.
+

 class wxToolBarTool : public wxToolBarToolBase
 {
 public:
 class wxToolBarTool : public wxToolBarToolBase
 {
 public:

-    wxToolBarTool(wxToolBar *tbar,
-                  int id,
-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
-                  wxObject *clientData,
-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+    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();
+        if (control != NULL)
+            SetControlHandle( (ControlRef) control->GetHandle() );
+    }
+
+    virtual ~wxToolBarTool()

     {
     {

-        m_nSepCount = 0;
-        m_index = -1 ;
+        ClearControl();

     }
 
     }
 

-    wxToolBarTool(wxToolBar *tbar, wxControl *control)
-        : wxToolBarToolBase(tbar, control)
+    WXWidget GetControlHandle()

     {
     {

-        m_nSepCount = 1;
-        m_index = -1 ;
+        return (WXWidget) m_controlHandle;

     }
 
     }
 

-    // set/get the number of separators which we use to cover the space used by
-    // a control in the toolbar
-    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
-    size_t GetSeparatorsCount() const { return m_nSepCount; }
+    void SetControlHandle( ControlRef handle )
+    {
+        m_controlHandle = handle;
+    }
+
+    void SetPosition( const wxPoint& position );
+
+    void ClearControl()
+    {
+        if ( m_controlHandle )
+        {
+            if ( !IsControl() )
+                DisposeControl( m_controlHandle );
+            else
+            {
+                // the embedded control is not under the responsibility of the tool, it gets disposed of in the
+                // proper wxControl destructor
+            }
+            m_controlHandle = NULL ;
+        }
+        m_control = NULL;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if ( m_toolbarItemRef )
+        {
+            CFIndex count = CFGetRetainCount( m_toolbarItemRef ) ;
+            // different behaviour under Leopard
+            if ( UMAGetSystemVersion() < 0x1050 )
+            {
+                if ( count != 1 )
+                {
+                    wxFAIL_MSG("Reference count of native tool was not 1 in wxToolBarTool destructor");
+                }
+            }
+            wxTheApp->MacAddToAutorelease(m_toolbarItemRef);
+            CFRelease(m_toolbarItemRef);
+            m_toolbarItemRef = NULL;
+        }
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+    }
+
+    wxSize GetSize() const
+    {
+        wxSize curSize;
+
+        if ( IsControl() )
+        {
+            curSize = GetControl()->GetSize();
+        }
+        else if ( IsButton() )
+        {
+            curSize = GetToolBar()->GetToolSize();
+        }
+        else
+        {
+            // 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 );
+    }
+
+    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 )
+        {
+            wxFont f;
+            wxFontEncoding enc;
+            if ( GetToolBar() )
+                f = GetToolBar()->GetFont();
+            if ( f.IsOk() )
+                enc = f.GetEncoding();
+            else
+                enc = wxFont::GetDefaultEncoding();
+
+            HIToolbarItemSetHelpText(
+                m_toolbarItemRef,
+                wxCFStringRef( GetShortHelp(), enc ),
+                wxCFStringRef( GetLongHelp(), enc ) );
+        }
+    }
+
+    HIToolbarItemRef GetToolbarItemRef() const
+    {
+        return m_toolbarItemRef;
+    }
+
+    void SetIndex( CFIndex idx )
+    {
+        m_index = idx;
+    }
+
+    CFIndex GetIndex() const
+    {
+        return m_index;
+    }
+#endif

 
 

-    int                m_index ;

 private:
 private:

-    size_t m_nSepCount;
+    void Init()
+    {
+        m_controlHandle = NULL;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+        m_toolbarItemRef = NULL;
+        m_index = -1;
+#endif
+    }
+
+    ControlRef m_controlHandle;
+    wxCoord     m_x;
+    wxCoord     m_y;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    HIToolbarItemRef m_toolbarItemRef;
+    // position in its toolbar, -1 means not inserted
+    CFIndex m_index;
+#endif

 };
 
 };
 

+static const EventTypeSpec eventList[] =
+{
+    { kEventClassControl, kEventControlHit },
+    { kEventClassControl, kEventControlHitTest },
+};

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef WXUNUSED(handler), EventRef event, void *data )
+{
+    OSStatus result = eventNotHandledErr;
+    ControlRef controlRef;
+    wxMacCarbonEvent cEvent( event );

 
 

-// ----------------------------------------------------------------------------
-// wxToolBarTool
-// ----------------------------------------------------------------------------
+    cEvent.GetParameter( kEventParamDirectObject, &controlRef );
+
+    switch ( GetEventKind( event ) )
+    {
+        case kEventControlHit:
+            {
+                wxToolBarTool *tbartool = (wxToolBarTool*)data;
+                wxToolBar *tbar = tbartool != NULL ? (wxToolBar*) (tbartool->GetToolBar()) : NULL;
+                if ((tbartool != NULL) && tbartool->CanBeToggled())
+                {
+                    bool    shouldToggle;
+
+                    shouldToggle = !tbartool->IsToggled();
+
+                    tbar->ToggleTool( tbartool->GetId(), shouldToggle );
+                }
+
+                if (tbartool != NULL)
+                    tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );
+                result = noErr;
+            }
+            break;
+
+        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;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return result;
+}
+
+static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
+{
+    OSStatus result = eventNotHandledErr;
+
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassControl:
+            result = wxMacToolBarToolControlEventHandler( handler, event, data );
+            break;
+
+        default:
+            break;
+    }
+
+    return result;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+
+static const EventTypeSpec toolBarEventList[] =
+{
+    { kEventClassToolbarItem, kEventToolbarItemPerformAction },
+};
+
+static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef WXUNUSED(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;
+}

 
 

-const short kwxMacToolBarToolDefaultWidth = 24 ;
-const short kwxMacToolBarToolDefaultHeight = 22 ;
-const short kwxMacToolBarTopMargin = 2 ;
-const short kwxMacToolBarLeftMargin = 2 ;
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler )

 
 

+#endif

 
 

-wxToolBarToolBase *wxToolBar::CreateTool(int id,
-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
-                                         wxObject *clientData,
-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+bool wxToolBarTool::DoEnable( bool enable )

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    if ( IsControl() )
+    {
+        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 ( enable )
+                EnableControl( m_controlHandle );
+            else
+                DisableControl( m_controlHandle );
+        }
+    }
+
+    return true;

 }
 
 }
 

-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+void wxToolBarTool::SetPosition( const wxPoint& position )

 {
 {

-    return new wxToolBarTool(this, control);
+    m_x = position.x;
+    m_y = position.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();
+
+        if ( mac_x != former_mac_x || mac_y != former_mac_y )
+        {
+            ::MoveControl( m_controlHandle, mac_x, mac_y );
+        }
+    }
+    else if ( IsControl() )
+    {
+        // embedded native controls are moved by the OS
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if ( ((wxToolBar*)GetToolBar())->MacWantsNativeToolbar() == false )
+#endif
+        {
+            GetControl()->Move( position );
+        }
+    }
+    else
+    {
+        // separator
+        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 )
+            ::MoveControl( m_controlHandle, mac_x, mac_y );
+    }
+}
+
+void wxToolBarTool::UpdateToggleImage( bool toggle )
+{
+    if ( toggle )
+    {
+        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 );
+        SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if (m_toolbarItemRef != NULL)
+        {
+            ControlButtonContentInfo info2;
+            wxMacCreateBitmapButton( &info2, bmp, kControlContentCGImageRef);
+            HIToolbarItemSetImage( m_toolbarItemRef, info2.u.imageRef );
+            wxMacReleaseBitmapButton( &info2 );
+        }
+#endif
+        wxMacReleaseBitmapButton( &info );
+    }
+    else
+    {
+        ControlButtonContentInfo info;
+        wxMacCreateBitmapButton( &info, m_bmpNormal );
+        SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if (m_toolbarItemRef != NULL)
+        {
+            ControlButtonContentInfo info2;
+            wxMacCreateBitmapButton( &info2, m_bmpNormal, kControlContentCGImageRef);
+            HIToolbarItemSetImage( m_toolbarItemRef, info2.u.imageRef );
+            wxMacReleaseBitmapButton( &info2 );
+        }
+#endif
+        wxMacReleaseBitmapButton( &info );
+    }
+
+    IconTransformType transform = toggle ? kTransformSelected : kTransformNone;
+    SetControlData(
+        m_controlHandle, 0, kControlIconTransformTag,
+        sizeof(transform), (Ptr)&transform );
+    HIViewSetNeedsDisplay( m_controlHandle, true );
+
+}
+
+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();
+}
+
+#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 );
+}
+
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
+{
+    return new wxToolBarTool(this, control, label);

 }
 
 void wxToolBar::Init()
 {
 }
 
 void wxToolBar::Init()
 {

-  m_maxWidth = -1;
-  m_maxHeight = -1;
-  m_defaultWidth = kwxMacToolBarToolDefaultWidth;
-  m_defaultHeight = kwxMacToolBarToolDefaultHeight;
+    m_maxWidth = -1;
+    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)
+#define kControlToolbarItemClassID      CFSTR( "org.wxwidgets.controltoolbaritem" )
+
+const EventTypeSpec kEvents[] =

 {
 {

-  
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    { kEventClassHIObject, kEventHIObjectConstruct },
+    { kEventClassHIObject, kEventHIObjectInitialize },
+    { kEventClassHIObject, kEventHIObjectDestruct },

 
 

-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+    { kEventClassToolbarItem, kEventToolbarItemCreateCustomView }
+};

 
 

-  SetName(name);
+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->lastValidSize = wxSize(-1,-1);
+                        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 ;
+                        // make sure we keep that control during our lifetime
+                        CFRetain( object->viewRef ) ;
+
+                        verify_noerr(InstallEventHandler( GetControlEventTarget( viewRef ), ControlToolbarItemHandler,
+                                            GetEventTypeCount( kViewEvents ), kViewEvents, object, NULL ));
+                        result = noErr ;
+                    }
+                    break;
+
+                case kEventHIObjectDestruct:
+                    {
+                        HIViewRef viewRef = object->viewRef ;
+                        if( viewRef && IsValidControlHandle( viewRef)  )
+                        {
+                            // depending whether the wxControl corresponding to this HIView has already been destroyed or
+                            // not, ref counts differ, so we cannot assert a special value
+                            CFIndex count =  CFGetRetainCount( viewRef ) ;
+                            if ( count >= 1 )
+                            {
+                                wxFAIL_MSG("Reference count of native tool was illegal before removal");
+
+                                CFRelease( viewRef ) ;
+                            }
+                        }
+                        free( object ) ;
+                        result = noErr;
+                    }
+                    break;
+            }
+            break;
+
+        case kEventClassToolbarItem:
+            switch ( GetEventKind( inEvent ) )
+            {
+                case kEventToolbarItemCreateCustomView:
+                {
+                    HIViewRef viewRef = object->viewRef ;
+                    HIViewRemoveFromSuperview( viewRef ) ;
+                    HIViewSetVisible(viewRef, true) ;
+                    CFRetain( viewRef ) ;
+                    result = SetEventParameter( inEvent, kEventParamControlRef, typeControlRef, sizeof( HIViewRef ), &viewRef );
+                }
+                break;
+            }
+            break;
+
+        case kEventClassControl:
+            switch ( GetEventKind( inEvent ) )
+            {
+                case kEventControlGetSizeConstraints:
+                {
+                    wxWindow* wxwindow = wxFindControlFromMacControl(object->viewRef ) ;
+                    if ( wxwindow )
+                    {
+                        // during toolbar layout the native window sometimes gets negative sizes,
+                        // sometimes it just gets shrunk behind our back, so in order to avoid
+                        // ever shrinking more, once a valid size is captured, we keep it
+
+                        wxSize sz = object->lastValidSize;
+                        if ( sz.x <= 0 || sz.y <= 0 )
+                        {
+                            sz = wxwindow->GetSize() ;
+                            sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
+                            sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
+                            if ( sz.x > 0 && sz.y > 0 )
+                                object->lastValidSize = sz ;
+                            else
+                                sz = wxSize(0,0) ;
+                        }
+
+                        // Extra width to avoid edge of combobox being cut off
+                        sz.x += 3;
+
+                        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();

 
 

-  m_windowStyle = style;
-  parent->AddChild(this);
+    OSStatus            err;
+    EventRef            event;
+    UInt32              options = kHIToolbarItemAllowDuplicates;
+    HIToolbarItemRef    result = NULL;

 
 

-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
+    err = CreateEvent( NULL, kEventClassHIObject, kEventHIObjectInitialize, GetCurrentEventTime(), 0, &event );
+    require_noerr( err, CantCreateEvent );

 
 

-  if (id == -1)
-      m_windowId = NewControlId();
-  else
-      m_windowId = id;
+    SetEventParameter( event, kEventParamAttributes, typeUInt32, sizeof( UInt32 ), &options );
+    SetEventParameter( event, kEventParamToolbarItemIdentifier, typeCFStringRef, sizeof( CFStringRef ), &inIdentifier );

 
 

-  {
-       m_width = size.x ;
-       m_height = size.y ;
-       int x = pos.x ;
-       int y = pos.y ;
-       AdjustForParentClientOrigin(x, y, wxSIZE_USE_EXISTING);
-       m_x = x ;
-       m_y = y ;
-  }
-  
-  return TRUE;
+    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 WXUNUSED(inCallRef),
+                                       EventRef inEvent,
+                                       void* WXUNUSED(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 )
+{
+    if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
+        return false;
+
+    FixupStyle();
+
+    OSStatus err = noErr;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if (parent->IsKindOf(CLASSINFO(wxFrame)) && wxSystemOptions::GetOptionInt(wxT("mac.toolbar.no-native")) != 1)
+    {
+        wxString labelStr = wxString::Format( wxT("%p"), this );
+        err = HIToolbarCreate(
+          wxCFStringRef( labelStr, wxFont::GetDefaultEncoding() ), 0,
+          (HIToolbarRef*) &m_macHIToolbarRef );
+
+        if (m_macHIToolbarRef != NULL)
+        {
+            InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler,
+                    GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, 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 // wxMAC_USE_NATIVE_TOOLBAR
+
+    return (err == noErr);

 }
 
 wxToolBar::~wxToolBar()
 {
 }
 
 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
-}
-
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) ;
-PicHandle MakePict(GWorldPtr wp, GWorldPtr mask ) 
-{
-       CGrafPtr                origPort ;
-       GDHandle                origDev ;
-       
-       PicHandle               pict;                           // this is the Picture we give back
-
-       RGBColor                gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
-       RGBColor                white = { 0xffff ,0xffff , 0xffff } ;
-       RGBColor                black = { 0x0000 ,0x0000 , 0x0000 } ;
-       
-       unsigned char *maskimage = NULL ;
-       Rect portRect ;
-       GetPortBounds( wp , &portRect ) ;
-       int width = portRect.right - portRect.left ;
-       int height = portRect.bottom - portRect.top ;
-       
-       LockPixels( GetGWorldPixMap( wp ) ) ;
-       GetGWorld( &origPort , &origDev ) ;
-
-       if ( mask )
-       {
-               
-               maskimage = (unsigned char*) malloc( width * height ) ;
-               SetGWorld( mask , NULL ) ;
-               LockPixels( GetGWorldPixMap( mask ) ) ;
-               for ( int y = 0 ; y < height ; ++y )
-               {
-                       for( int x = 0 ; x < width ; ++x )
-                       {
-                               RGBColor col ;
-                               
-                               GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-                               maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks
-                       }
-               }
-               UnlockPixels( GetGWorldPixMap( mask ) ) ;
-       }
-       
-       SetGWorld( wp , NULL ) ;
-       
-       pict = OpenPicture(&portRect);  // open a picture, this disables drawing
-       if(!pict)       
-               return NULL;
-
-       RGBBackColor( &gray ) ;
-       RGBForeColor( &black ) ;
-       EraseRect(&portRect) ;
-       RGBBackColor( &white ) ;
-
-       if ( maskimage )
-       {
-               for ( int y = 0 ; y < height ; ++y )
-               {
-                       for( int x = 0 ; x < width ; ++x )
-                       {
-                               if ( maskimage[y*width + x] )
-                               {
-                                       RGBColor col ;
-                               
-                                       GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-                                       SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-                               }
-                       }
-               }
-               free( maskimage ) ;
-               maskimage = NULL ;
-       }
-       else
-       {
-               CopyBits(GetPortBitMapForCopyBits(wp),                  // src PixMap   - we copy image over itself -
-                               GetPortBitMapForCopyBits(wp),           // dst PixMap   - no drawing occurs -
-                               &portRect,                      // srcRect              - it will be recorded and compressed -
-                               &portRect,                      // dstRect              - into the picture that is open -
-                               srcCopy,NULL);                  // copyMode and no clip region
-
-       }
-       ClosePicture();                                         // We are done recording the picture
-       UnlockPixels( GetGWorldPixMap( wp ) ) ;
-       SetGWorld( origPort , origDev ) ;
-       return pict;                                            // return our groovy pict handle
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if (m_macHIToolbarRef != NULL)
+    {
+        // if this is the installed toolbar, then deinstall it
+        if (m_macUsesNativeToolbar)
+            MacInstallNativeToolbar( false );
+
+        CFIndex count = CFGetRetainCount( m_macHIToolbarRef ) ;
+        // Leopard seems to have one refcount more, so we cannot check reliably at the moment
+        if ( UMAGetSystemVersion() < 0x1050 )
+        {
+            if ( count != 1 )
+            {
+                wxFAIL_MSG("Reference count of native control was not 1 in wxToolBar destructor");
+            }
+        }
+        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()
 {
 bool wxToolBar::Realize()
 {

-  if (m_tools.Number() == 0)
-      return FALSE;
-
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *win ;
-       
-       GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-
-       Rect toolbarrect = { m_y + localOrigin.v , m_x  + localOrigin.h , 
-               m_y + m_height + localOrigin.v  , m_x + m_width + localOrigin.h} ;
-       ControlFontStyleRec             controlstyle ;
-
-       controlstyle.flags = kControlUseFontMask ;
-       controlstyle.font = kControlFontSmallSystemFont ;
-       
-       wxNode *node = m_tools.First();
-       int noButtons = 0;
-       int x = 0 ;
-       wxSize toolSize = GetToolSize() ;
+    if (m_tools.GetCount() == 0)
+        return false;
+
+    int maxWidth = 0;
+    int maxHeight = 0;
+
+    int maxToolWidth = 0;
+    int maxToolHeight = 0;
+
+    int x = m_xMargin + kwxMacToolBarLeftMargin;
+    int y = m_yMargin + kwxMacToolBarTopMargin;
+

     int tw, th;
     int tw, th;

-    GetSize(& tw, & th);
-    
-    int maxWidth = 0 ;
-    int maxHeight = 0 ;
-    
-       while (node)
-       {
-               wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-               wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
-               
-               if(  !tool->IsSeparator()  )
-               {
-                       Rect toolrect = { toolbarrect.top + m_yMargin + kwxMacToolBarTopMargin, toolbarrect.left + x + m_xMargin + kwxMacToolBarLeftMargin , 0 , 0 } ;
-                       toolrect.right = toolrect.left + toolSize.x ;
-                       toolrect.bottom = toolrect.top + toolSize.y ;
-                       
-                       PicHandle       icon = NULL ;
-                       if ( bmap )
-                       {
-                               if ( bmap->m_bitmapType == kMacBitmapTypePict )
-                                       icon = bmap->m_hPict ;
-                               else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
-                               {
-                                       if ( tool->GetBitmap1().GetMask() )
-                                       {
-                                               icon = MakePict( bmap->m_hBitmap , tool->GetBitmap1().GetMask()->GetMaskBitmap() ) ;
-                                       }
-                                       else
-                                       {
-                                               icon = MakePict( bmap->m_hBitmap , NULL ) ;
-                                       }
-                               }
-                       }
-                       
-                       ControlHandle m_macToolHandle ;
-                       
-                       SInt16 behaviour = kControlBehaviorOffsetContents ;
-                       if ( tool->CanBeToggled() )
-                               behaviour += kControlBehaviorToggles ;
-                               
-                       if ( icon )
-                       {
-                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
-                                       behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
-                               ControlButtonContentInfo info ;
-                               
-                               info.contentType = kControlContentPictHandle ;
-                               info.u.picture = icon ;
-                               
-                               UMASetControlData( m_macToolHandle , kControlButtonPart , kControlBevelButtonContentTag , sizeof(info) , (char*) &info ) ;
-                       }
-                       else
-                       {
-                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
-                                               behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
-                       }
-                       m_macToolHandles.Add( m_macToolHandle ) ;
-                       tool->m_index = m_macToolHandles.Count() -1 ;
-                       if ( !tool->IsEnabled() )
-                       {
-                               UMADeactivateControl( m_macToolHandle ) ;
-                       }
-                       if ( tool->CanBeToggled() && tool->IsToggled() )
-                       {
-                               ::SetControlValue( m_macToolHandle , 1 ) ;
-                       }
-                       UMASetControlFontStyle( m_macToolHandle , &controlstyle ) ;
-                       ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
-                       wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
-                       UMAEmbedControl( m_macToolHandle , container ) ;
-                       
-                       x += (int)toolSize.x;
-                       noButtons ++;
-               }
-               else
-               {
-                       m_macToolHandles.Add( NULL ) ;
-                       x += (int)toolSize.x / 4;
-               }
-           if ( toolbarrect.left + x + m_xMargin  + kwxMacToolBarLeftMargin- m_x - localOrigin.h > maxWidth)
-               maxWidth = toolbarrect.left + x  + kwxMacToolBarLeftMargin+ m_xMargin - m_x - localOrigin.h;
-       if (toolbarrect.top + m_yMargin  + kwxMacToolBarTopMargin - m_y - localOrigin.v > maxHeight)
-               maxHeight = toolbarrect.top  + kwxMacToolBarTopMargin + m_yMargin - m_y - localOrigin.v ;
-
-               node = node->Next();
-       }
-
-  if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
-  {
-    if ( m_maxRows == 0 )
+    GetSize( &tw, &th );
+
+    // find the maximum tool width and height
+    wxToolBarTool *tool;
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+    while ( node )
+    {
+        tool = (wxToolBarTool *) node->GetData();
+        if ( tool != NULL )
+        {
+            wxSize  sz = tool->GetSize();
+
+            if ( sz.x > maxToolWidth )
+                maxToolWidth = sz.x;
+            if ( sz.y > maxToolHeight )
+                maxToolHeight = sz.y;
+        }
+
+        node = node->GetNext();
+    }
+
+    bool lastIsRadio = false;
+    bool curIsRadio = false;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    CFIndex currentPosition = 0;
+    bool insertAll = false;
+
+    HIToolbarRef refTB = (HIToolbarRef)m_macHIToolbarRef;
+#endif
+
+    node = m_tools.GetFirst();
+    while ( node )
+    {
+        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;
+        if ( y + cursize.y > maxHeight )
+            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 ( refTB )
+        {
+            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).
+                        for ( wxToolBarToolsList::compatibility_iterator node2 = m_tools.GetLast();
+                              node2 != node;
+                              node2 = node2->GetPrevious() )
+                        {
+                            wxToolBarTool *tool2 = (wxToolBarTool*) node2->GetData();
+
+                            const long idx = tool2->GetIndex();
+                            if ( idx != -1 )
+                            {
+                                if ( tool2->IsControl() )
+                                {
+                                    CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
+                                    if ( count != 3 && count != 2 )
+                                    {
+                                        wxFAIL_MSG("Reference count of native tool was illegal before removal");
+                                    }
+
+                                    wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
+                                }
+                                err = HIToolbarRemoveItemAtIndex(refTB, idx);
+                                if ( err != noErr )
+                                {
+                                    wxLogDebug(wxT("HIToolbarRemoveItemAtIndex(%ld) failed [%ld]"),
+                                               idx, (long)err);
+                                }
+                                if ( tool2->IsControl() )
+                                {
+                                    CFIndex count = CFGetRetainCount( tool2->GetControl()->GetPeer()->GetControlRef() ) ;
+                                    if ( count != 2 )
+                                    {
+                                        wxFAIL_MSG("Reference count of native tool was not 2 after removal");
+                                    }
+
+                                    wxASSERT( IsValidControlHandle(tool2->GetControl()->GetPeer()->GetControlRef() )) ;
+                                }
+
+                                tool2->SetIndex(-1);
+                            }
+                        }
+                    }
+
+                    err = HIToolbarInsertItemAtIndex( refTB, hiItemRef, currentPosition );
+                    if (err != noErr)
+                    {
+                        wxLogDebug( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err );
+                    }
+
+                    tool->SetIndex( currentPosition );
+                    if ( tool->IsControl() )
+                    {
+                        CFIndex count = CFGetRetainCount( tool->GetControl()->GetPeer()->GetControlRef() ) ;
+                        if ( count != 3 && count != 2 )
+                        {
+                            wxFAIL_MSG("Reference count of native tool was illegal before removal");
+                        }
+                        wxASSERT( IsValidControlHandle(tool->GetControl()->GetPeer()->GetControlRef() )) ;
+                    }
+                }
+
+                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 );
+        }
+        else
+        {
+            if ( !lastIsRadio )
+            {
+                if ( tool->Toggle( true ) )
+                {
+                    DoToggleTool( tool, true );
+                }
+            }
+            else if ( tool->IsToggled() )
+            {
+                if ( tool->IsToggled() )
+                    DoToggleTool( tool, true );
+
+                wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();
+                while ( nodePrev )
+                {
+                    wxToolBarToolBase   *toggleTool = nodePrev->GetData();
+                    if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
+                        break;
+
+                    if ( toggleTool->Toggle( false ) )
+                        DoToggleTool( toggleTool, false );
+
+                    nodePrev = nodePrev->GetPrevious();
+                }
+            }
+        }
+
+        node = node->GetNext();
+    }
+
+    if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )

     {
         // if not set yet, only one row
     {
         // if not set yet, only one row

-        SetRows(1);
+        if ( m_maxRows <= 0 )
+            SetRows( 1 );
+
+        m_minWidth = maxWidth;
+        maxWidth = tw;
+        maxHeight += m_yMargin + kwxMacToolBarTopMargin;
+        m_minHeight = m_maxHeight = maxHeight;

     }
     }

-       maxWidth = tw ; 
-    maxHeight += toolSize.y;
-       maxHeight += m_yMargin + kwxMacToolBarTopMargin;
-       m_maxHeight = maxHeight ;
-  }
-  else
-  {
-    if ( noButtons > 0 && m_maxRows == 0 )
+    else

     {
         // if not set yet, have one column
     {
         // if not set yet, have one column

-        SetRows(noButtons);
+        if ( (GetToolsCount() > 0) && (m_maxRows <= 0) )
+            SetRows( GetToolsCount() );
+
+        m_minHeight = maxHeight;
+        maxHeight = th;
+        maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
+        m_minWidth = m_maxWidth = maxWidth;

     }
     }

-    maxHeight = th ;
-    maxWidth += toolSize.x;
-       maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
-       m_maxWidth = maxWidth ;
-  }

 
 

-  SetSize(maxWidth, maxHeight);
+#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)
+        {
+           SetSize( maxWidth, maxHeight );
+           InvalidateBestSize();
+        }
+    }
+#else
+    SetSize( maxWidth, maxHeight );
+    InvalidateBestSize();
+#endif
+
+    SetInitialSize();

 
 

-  return TRUE;
+    return true;

 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
 }
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {

-    m_defaultWidth = size.x+2; m_defaultHeight = size.y+2;
+    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
 {
 }
 
 // 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::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxToolBar::SetRows(int nRows)

 {
 {

-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( m_macToolHandles[index] == (void*) control )
-               {
-                       wxToolBarTool *tool = (wxToolBarTool *)m_tools.Nth( index )->Data();
-                       if ( tool->CanBeToggled() )
-               {
-                       tool->Toggle( GetControlValue( control ) ) ;
-               }
-                       OnLeftClick( tool->GetId() , tool -> IsToggled() ) ;
-                       break ;
-               }
-       }
+    // avoid resizing the frame uselessly
+    if ( nRows != m_maxRows )
+        m_maxRows = nRows;

 }
 
 }
 

-void wxToolBar::SetRows(int 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 )

 {
 {

-    if ( nRows == m_maxRows )
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )

     {
     {

-        // avoid resizing the frame uselessly
-        return;
+        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."));

 
 

-    m_maxRows = nRows;
+        tool->SetDisabledBitmap(bitmap);
+
+        // TODO:  what to do for this one?
+    }

 }
 
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {
 }
 
 wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 {

-    MacClientToRootWindow( &x , &y ) ;
-    Point pt = { y ,x } ;
-
-       int index = 0 ;
-       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-       {
-               if ( m_macToolHandles[index] )
-               {
-                       Rect bounds ;
-                       GetControlBounds((ControlHandle) m_macToolHandles[index], &bounds ) ;
-                       if ( PtInRect( pt , &bounds ) )
-                       {
-                               return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
-                       }
-               }
-       }
+    wxToolBarTool *tool;
+    wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+    while ( node )
+    {
+        tool = (wxToolBarTool *)node->GetData();
+        if (tool != NULL)
+        {
+            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 )
 {
 }
 
 wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
 {

-       wxToolBarToolBase* tool = FindToolForPosition( pt.x , pt.y ) ;
-       if ( tool )
-       {
-               return tool->GetShortHelp() ;
-       }
-       return "" ;
+    wxToolBarToolBase *tool = FindToolForPosition( pt.x, pt.y );
+    if ( tool != NULL )
+        return tool->GetShortHelp();
+
+    return wxEmptyString;

 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
 }
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {

-        wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-               return ;
-               
-        ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-
-               if ( enable )
-                       UMAActivateControl( control ) ;
-               else
-                       UMADeactivateControl( control ) ;
+    if ( t != NULL )
+        ((wxToolBarTool*)t)->DoEnable( enable );

 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
 }
 
 void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {

-       wxToolBarTool *tool = (wxToolBarTool *)t;
-        if ( tool->m_index < 0 )
-               return ;
-        
-       ControlHandle control = (ControlHandle) m_macToolHandles[ tool->m_index ] ;
-               ::SetControlValue( control , toggle ) ;
+    wxToolBarTool *tool = (wxToolBarTool *)t;
+    if ( ( tool != NULL ) && tool->IsButton() )
+        tool->UpdateToggleImage( toggle );

 }
 
 }
 

-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase *tool)
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)

 {
 {

-    // nothing special to do here - we really create the toolbar buttons in
-    // Realize() later
-    tool->Attach(this);
+    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 };
+    ControlRef controlHandle = NULL;
+    OSStatus err = 0;
+    tool->Attach( this );
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    wxString label = tool->GetLabel();
+    if (m_macHIToolbarRef && !label.empty() )
+    {
+        // strip mnemonics from the label for compatibility
+        // with the usual labels in wxStaticText sense
+        label = wxStripMenuCodes(label);
+    }
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
+    switch (tool->GetStyle())
+    {
+        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;
+
+                // in flat style we need a visual separator
+#if wxMAC_USE_NATIVE_TOOLBAR
+                if (m_macHIToolbarRef != NULL)
+                {
+                    HIToolbarItemRef item;
+                    err = HIToolbarItemCreate(
+                        kHIToolbarSeparatorIdentifier,
+                        kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates,
+                        &item );
+                    if (err == noErr)
+                        tool->SetToolbarItemRef( item );
+                }
+                else
+                    err = noErr;
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
+                CreateSeparatorControl( window, &toolrect, &controlHandle );
+                tool->SetControlHandle( controlHandle );
+            }
+            break;
+
+        case wxTOOL_STYLE_BUTTON:
+            {
+                wxASSERT( tool->GetControlHandle() == NULL );
+                ControlButtonContentInfo info;
+                wxMacCreateBitmapButton( &info, tool->GetNormalBitmap() );
+
+                if ( UMAGetSystemVersion() >= 0x1000)
+                {
+                    // contrary to the docs this control only works with iconrefs
+                    ControlButtonContentInfo info;
+                    wxMacCreateBitmapButton( &info, tool->GetNormalBitmap(), kControlContentIconRef );
+                    CreateIconControl( window, &toolrect, &info, false, &controlHandle );
+                    wxMacReleaseBitmapButton( &info );
+                }
+                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
+                if (m_macHIToolbarRef != NULL)
+                {
+                    HIToolbarItemRef item;
+                    wxString labelStr = wxString::Format(wxT("%p"), tool);
+                    err = HIToolbarItemCreate(
+                        wxCFStringRef(labelStr, wxFont::GetDefaultEncoding()),
+                        kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
+                    if (err  == noErr)
+                    {
+                        ControlButtonContentInfo info2;
+                        wxMacCreateBitmapButton( &info2, tool->GetNormalBitmap(), kControlContentCGImageRef);
+
+                        InstallEventHandler(
+                            HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
+                            GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
+                        HIToolbarItemSetLabel( item, wxCFStringRef(label, GetFont().GetEncoding()) );
+                        HIToolbarItemSetImage( item, info2.u.imageRef );
+                        HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );
+                        tool->SetToolbarItemRef( item );
+
+                        wxMacReleaseBitmapButton( &info2 );
+                    }
+                }
+                else
+                    err = noErr;
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+
+                wxMacReleaseBitmapButton( &info );
+
+#if 0
+                SetBevelButtonTextPlacement( m_controlHandle, kControlBevelButtonPlaceBelowGraphic );
+                SetControlTitleWithCFString( m_controlHandle , wxCFStringRef( label, wxFont::GetDefaultEncoding() );
+#endif
+
+                InstallControlEventHandler(
+                    (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
+                    GetEventTypeCount(eventList), eventList, tool, NULL );
+
+                tool->SetControlHandle( controlHandle );
+            }
+            break;
+
+        case wxTOOL_STYLE_CONTROL:
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+            if (m_macHIToolbarRef != NULL)
+            {
+                wxCHECK_MSG( tool->GetControl(), false, _T("control must be non-NULL") );
+                HIToolbarItemRef    item;
+                HIViewRef viewRef = (HIViewRef) tool->GetControl()->GetHandle() ;
+                CFDataRef data = CFDataCreate( kCFAllocatorDefault , (UInt8*) &viewRef , sizeof(viewRef) ) ;
+                err = HIToolbarCreateItemWithIdentifier((HIToolbarRef) m_macHIToolbarRef,kControlToolbarItemClassID,
+                    data , &item ) ;
+
+                if (err  == noErr)
+                {
+                    tool->SetToolbarItemRef( item );
+                }
+                CFRelease( data ) ;
+           }
+           else
+           {
+               err = noErr;
+               break;
+           }
+#else
+                // right now there's nothing to do here
+#endif
+                break;
+
+        default:
+            break;
+    }
+
+    if ( err == noErr )
+    {
+        if ( controlHandle )
+        {
+            ControlRef container = (ControlRef) GetHandle();
+            wxASSERT_MSG( container != NULL, wxT("No valid Mac container control") );

 
 

-    return TRUE;
+            SetControlVisibility( controlHandle, true, true );
+            ::EmbedControl( controlHandle, container );
+        }
+
+        if ( tool->CanBeToggled() && tool->IsToggled() )
+            tool->UpdateToggleImage( true );
+
+        // nothing special to do here - we relayout in Realize() later
+        InvalidateBestSize();
+    }
+    else
+    {
+        wxFAIL_MSG( wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long)err ) );
+    }
+
+    return (err == noErr);

 }
 
 }
 

-void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
+void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))

 {
 {

-       wxToolBarTool *tool = (wxToolBarTool *)t;
-       // TODO: set toggle state
+    wxFAIL_MSG( wxT("not implemented") );

 }
 
 }
 

-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)

 {
 {

-               return TRUE ;
+    wxToolBarTool* tool = wx_static_cast( wxToolBarTool*, toolbase );
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool2 = node->GetData();
+        if ( tool2 == tool )
+        {
+            // let node point to the next node in the list
+            node = node->GetNext();
+
+            break;
+        }
+    }
+
+    wxSize sz = ((wxToolBarTool*)tool)->GetSize();
+
+    tool->Detach();
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    CFIndex removeIndex = tool->GetIndex();
+#endif
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if (m_macHIToolbarRef != NULL)
+    {
+        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();
+            break;
+
+        case wxTOOL_STYLE_BUTTON:
+        case wxTOOL_STYLE_SEPARATOR:
+            // 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() )
+    {
+        wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
+        wxPoint pt = tool2->GetPosition();
+
+        if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+            pt.y -= sz.y;
+        else
+            pt.x -= sz.x;
+
+        tool2->SetPosition( pt );
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if (m_macHIToolbarRef != NULL)
+        {
+            if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
+                tool2->SetIndex( tool2->GetIndex() - 1 );
+        }
+#endif
+    }
+
+    InvalidateBestSize();
+
+    return true;

 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {
 }
 
 void wxToolBar::OnPaint(wxPaintEvent& event)
 {

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *win ;
-       
-       GetParent()->MacGetPortParams( &localOrigin , &clipRect , &window , &win ) ;
-       if ( window && win )
-       {
-               wxMacDrawingHelper help( win ) ;
-               // the mac control manager always assumes to have the origin at 0,0
-               SetOrigin( 0 , 0 ) ;
-               
-               bool                    hasTabBehind = false ;
-               wxWindow* parent = GetParent() ;
-               while ( parent )
-               {
-                       if( parent->MacGetWindowData() )
-                       {
-                               UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                               break ;
-                       }
-                       
-                       if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                       {
-                               if ( ((wxControl*)parent)->GetMacControl() )
-                                       SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
-                               break ;
-                       }
-                       
-                       parent = parent->GetParent() ;
-               } 
-
-               Rect toolbarrect = { m_y + localOrigin.v , m_x + localOrigin.h , 
-                       m_y  + localOrigin.v + m_height , m_x + localOrigin.h + m_width } ;
-
-               UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-               {
-                       int index = 0 ;
-                       for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
-                       {
-                               if ( m_macToolHandles[index] )
-                               {
-                                       UMADrawControl( (ControlHandle) m_macToolHandles[index] ) ;
-                               }
-                       }
-               }
-               UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-       }
-}
-
-void  wxToolBar::OnMouse( wxMouseEvent &event ) 
-{
-               
-       if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-       {
-                       
-               int x = event.m_x ;
-               int y = event.m_y ;
-               
-               MacClientToRootWindow( &x , &y ) ;
-                       
-               ControlHandle   control ;
-               Point           localwhere ;
-               GrafPtr         port ;
-               SInt16          controlpart ;
-               WindowRef       window = GetMacRootWindow() ;
-               
-               localwhere.h = x ;
-               localwhere.v = y ;
-       
-               short modifiers = 0;
-               
-               if ( !event.m_leftDown && !event.m_rightDown )
-                       modifiers  |= btnState ;
-       
-               if ( event.m_shiftDown )
-                       modifiers |= shiftKey ;
-                       
-               if ( event.m_controlDown )
-                       modifiers |= controlKey ;
-       
-               if ( event.m_altDown )
-                       modifiers |= optionKey ;
-       
-               if ( event.m_metaDown )
-                       modifiers |= cmdKey ;
-       
-               controlpart = FindControl( localwhere , window , &control ) ;
-               {
-                       if ( control && UMAIsControlActive( control ) )
-                       {
-                               {
-                                       if ( controlpart == kControlIndicatorPart && !UMAHasAppearance() )
-                                               controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) NULL ) ;
-                                       else
-                                               controlpart = UMAHandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
-                                       wxTheApp->s_lastMouseDown = 0 ;
-                                       if ( controlpart && ! ( ( UMAHasAppearance() || (controlpart != kControlIndicatorPart) ) 
-                                               && (IsKindOf( CLASSINFO( wxScrollBar ) ) ) ) ) // otherwise we will get the event twice
-                                       {
-                                               MacHandleControlClick( control , controlpart ) ;
-                                       }
-                               }
-                       }
-               }
-       }
+#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();
+
+    if ( !drawMetalTheme  )
+    {
+        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)
+    }
+
+    event.Skip();

 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR

-