cleanup - reformatting

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

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index da2442ba0ab4da5c84d77e43680d0fc9429740f1..01be9247439e4a57b1a1d673f9b53c5b585703e6 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -6,13 +6,9 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // 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/wxprec.h"
 
 #if wxUSE_TOOLBAR


@@ -21,22 +17,17 @@
 #include "wx/bitmap.h"
 #include "wx/toolbar.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()
-

 #include "wx/mac/uma.h"
 #include "wx/geometry.h"
 
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"
 

+

 #ifdef __WXMAC_OSX__
 const short kwxMacToolBarToolDefaultWidth = 16 ;
 const short kwxMacToolBarToolDefaultHeight = 16 ;
 #ifdef __WXMAC_OSX__
 const short kwxMacToolBarToolDefaultWidth = 16 ;
 const short kwxMacToolBarToolDefaultHeight = 16 ;

-const short kwxMacToolBarTopMargin = 4 ; // 1 ;      // used to be 4
-const short kwxMacToolBarLeftMargin =  4 ; //1 ;     // used to be 4
-const short kwxMacToolBorder = 0 ;                // used to be 0
-const short kwxMacToolSpacing = 6 ; // 2 ;               // used to be 6
+const short kwxMacToolBarTopMargin = 4 ;
+const short kwxMacToolBarLeftMargin =  4 ;
+const short kwxMacToolBorder = 0 ;
+const short kwxMacToolSpacing = 6 ;

 #else
 const short kwxMacToolBarToolDefaultWidth = 24 ;
 const short kwxMacToolBarToolDefaultHeight = 22 ;
 #else
 const short kwxMacToolBarToolDefaultWidth = 24 ;
 const short kwxMacToolBarToolDefaultHeight = 22 ;


@@ -46,6 +37,14 @@ const short kwxMacToolBorder = 4 ;
 const short kwxMacToolSpacing = 0 ;
 #endif
 
 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
 
 #pragma mark -
 #pragma mark Tool Implementation
 


@@ -68,7 +67,7 @@ public:
                   wxObject *clientData,
                   const wxString& shortHelp,
                   const wxString& longHelp) ;
                   wxObject *clientData,
                   const wxString& shortHelp,
                   const wxString& longHelp) ;

-                  
+

     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {
     wxToolBarTool(wxToolBar *tbar, wxControl *control)
         : wxToolBarToolBase(tbar, control)
     {


@@ -76,38 +75,40 @@ public:
         if (control != NULL)
             SetControlHandle( (ControlRef) control->GetHandle() ) ;
     }
         if (control != NULL)
             SetControlHandle( (ControlRef) control->GetHandle() ) ;
     }

-    
+

     ~wxToolBarTool()
     {
     ~wxToolBarTool()
     {

-       ClearControl() ;
+        ClearControl() ;

         if ( m_controlHandle )
             DisposeControl( m_controlHandle ) ;
         if ( m_controlHandle )
             DisposeControl( m_controlHandle ) ;

+

 #if wxMAC_USE_NATIVE_TOOLBAR
         if ( m_toolbarItemRef )
             CFRelease( m_toolbarItemRef ) ;
 #endif
     }
 #if wxMAC_USE_NATIVE_TOOLBAR
         if ( m_toolbarItemRef )
             CFRelease( m_toolbarItemRef ) ;
 #endif
     }

-    
-    WXWidget GetControlHandle() 
-    { 
-        return (WXWidget) m_controlHandle ; 
+
+    WXWidget GetControlHandle()
+    {
+        return (WXWidget) m_controlHandle ;

     }
     }

-    
-    void SetControlHandle( ControlRef handle ) 
-    { 
-       m_controlHandle = handle ; 
+
+    void SetControlHandle( ControlRef handle )
+    {
+        m_controlHandle = handle ;

     }
 
     void SetPosition( const wxPoint& position ) ;
     }
 
     void SetPosition( const wxPoint& position ) ;

-    
-    void ClearControl() 
-    { 
-       m_control = NULL ; 
+
+    void ClearControl()
+    {
+        m_control = NULL ;
+

 #if wxMAC_USE_NATIVE_TOOLBAR
 #if wxMAC_USE_NATIVE_TOOLBAR

-        m_toolbarItemRef = NULL ; 
-#endif   
+        m_toolbarItemRef = NULL ;
+#endif

     }
     }

-    
+

     wxSize GetSize() const
     {
         if ( IsControl() )
     wxSize GetSize() const
     {
         if ( IsControl() )


@@ -126,59 +127,81 @@ public:
                 sz.y /= 4 ;
             else
                 sz.x /= 4 ;
                 sz.y /= 4 ;
             else
                 sz.x /= 4 ;

+

             return sz ;
         }
     }
             return sz ;
         }
     }

+

     wxPoint GetPosition() const
     {
         return wxPoint(m_x, m_y);
     wxPoint GetPosition() const
     {
         return wxPoint(m_x, m_y);

-    }    
+    }
+

     bool DoEnable( bool enable ) ;
     bool DoEnable( bool enable ) ;

-    
+

     void UpdateToggleImage( bool toggle ) ;
     void UpdateToggleImage( bool toggle ) ;

-    
-#if wxMAC_USE_NATIVE_TOOLBAR    
-    void SetToolbarItemRef( HIToolbarItemRef ref ) 
-    { 
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    void SetToolbarItemRef( HIToolbarItemRef ref )
+    {

         if ( m_controlHandle )
             HideControl( m_controlHandle ) ;
         if ( m_toolbarItemRef )
             CFRelease( m_toolbarItemRef ) ;
         if ( m_controlHandle )
             HideControl( m_controlHandle ) ;
         if ( m_toolbarItemRef )
             CFRelease( m_toolbarItemRef ) ;

-        m_toolbarItemRef = ref ; 
+
+        m_toolbarItemRef = ref ;

         if ( m_toolbarItemRef )
         {
             HIToolbarItemSetHelpText(
         if ( m_toolbarItemRef )
         {
             HIToolbarItemSetHelpText(

-                m_toolbarItemRef, wxMacCFStringHolder( GetShortHelp() , GetToolBar()->GetFont().GetEncoding() ) ,
-                wxMacCFStringHolder( GetLongHelp() , GetToolBar()->GetFont().GetEncoding() ) ) ;
+                m_toolbarItemRef,
+                wxMacCFStringHolder( GetShortHelp(), GetToolBar()->GetFont().GetEncoding() ) ,
+                wxMacCFStringHolder( GetLongHelp(), GetToolBar()->GetFont().GetEncoding() ) ) ;

         }
     }
         }
     }

-    HIToolbarItemRef GetToolbarItemRef() const 
-    { 
-        return m_toolbarItemRef ; 
+
+    HIToolbarItemRef GetToolbarItemRef() const
+    {
+        return m_toolbarItemRef ;
+    }
+
+    void SetIndex( CFIndex idx )
+    {
+        m_index = idx ;
+    }
+
+    CFIndex GetIndex() const
+    {
+        return m_index ;

     }
 #endif
 
 private :
     }
 #endif
 
 private :

-    void Init() 
+    void Init()

     {
         m_controlHandle = NULL ;
     {
         m_controlHandle = NULL ;

+

 #if wxMAC_USE_NATIVE_TOOLBAR
         m_toolbarItemRef = NULL ;
 #if wxMAC_USE_NATIVE_TOOLBAR
         m_toolbarItemRef = NULL ;

+        m_index = -1 ;

 #endif
     }
 #endif
     }

+

     ControlRef m_controlHandle ;
     ControlRef m_controlHandle ;

+    wxCoord     m_x;
+    wxCoord     m_y;
+

 #if wxMAC_USE_NATIVE_TOOLBAR
     HIToolbarItemRef m_toolbarItemRef ;
 #if wxMAC_USE_NATIVE_TOOLBAR
     HIToolbarItemRef m_toolbarItemRef ;

+    // position in its toolbar, -1 means not inserted
+    CFIndex m_index ;

 #endif
 #endif

-    wxCoord     m_x;
-    wxCoord     m_y;

 };
 
 static const EventTypeSpec eventList[] =
 {
 };
 
 static const EventTypeSpec eventList[] =
 {

-       { kEventClassControl , kEventControlHit } ,
+    { kEventClassControl , kEventControlHit } ,

 #ifdef __WXMAC_OSX__
 #ifdef __WXMAC_OSX__

-       { kEventClassControl , kEventControlHitTest } ,
+    { kEventClassControl , kEventControlHitTest } ,

 #endif
 } ;
 
 #endif
 } ;
 


@@ -187,30 +210,33 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;
     OSStatus result = eventNotHandledErr ;
 
     wxMacCarbonEvent cEvent( event ) ;

-    
+

     ControlRef controlRef ;
 
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 
     ControlRef controlRef ;
 
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 

-    switch( GetEventKind( event ) )
+    switch ( GetEventKind( event ) )

     {
         case kEventControlHit :
             {
                 wxToolBarTool* tbartool = (wxToolBarTool*)data ;
     {
         case kEventControlHit :
             {
                 wxToolBarTool* tbartool = (wxToolBarTool*)data ;

-                wxToolBar   *tbar = tbartool != NULL ? ( wxToolBar * ) ( tbartool->GetToolBar() ) : NULL ;
-                if ((tbartool != NULL) && tbartool->CanBeToggled() )
+                wxToolBar   *tbar = tbartool != NULL ? (wxToolBar*) (tbartool->GetToolBar()) : NULL ;
+                if ((tbartool != NULL) && tbartool->CanBeToggled())

                 {
                     bool    shouldToggle;
                 {
                     bool    shouldToggle;

+

 #ifdef __WXMAC_OSX__
                     shouldToggle = !tbartool->IsToggled();
 #else
                     shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 );
 #endif
 #ifdef __WXMAC_OSX__
                     shouldToggle = !tbartool->IsToggled();
 #else
                     shouldToggle = ( GetControl32BitValue((ControlRef) tbartool->GetControlHandle()) != 0 );
 #endif

+

                     tbar->ToggleTool( tbartool->GetId(), shouldToggle );
                 }
                     tbar->ToggleTool( tbartool->GetId(), shouldToggle );
                 }

+

                 if (tbartool != NULL)
                     tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );
                 if (tbartool != NULL)
                     tbar->OnLeftClick( tbartool->GetId(), tbartool->IsToggled() );

-                result = noErr; 
+                result = noErr;

             }
             break ;
 
             }
             break ;
 


@@ -220,7 +246,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
                 HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation) ;
                 HIRect rect ;
                 HIViewGetBounds( controlRef , &rect ) ;
                 HIPoint pt = cEvent.GetParameter<HIPoint>(kEventParamMouseLocation) ;
                 HIRect rect ;
                 HIViewGetBounds( controlRef , &rect ) ;

-                
+

                 ControlPartCode pc = kControlNoPart ;
                 if ( CGRectContainsPoint( rect , pt ) )
                     pc = kControlIconPart ;
                 ControlPartCode pc = kControlNoPart ;
                 if ( CGRectContainsPoint( rect , pt ) )
                     pc = kControlIconPart ;


@@ -233,6 +259,7 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef
         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 


@@ -249,6 +276,7 @@ static pascal OSStatus wxMacToolBarToolEventHandler( EventHandlerCallRef handler
         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 


@@ -262,28 +290,32 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )
 
 static const EventTypeSpec toolBarEventList[] =
 {
 
 static const EventTypeSpec toolBarEventList[] =
 {

-       { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,
+    { kEventClassToolbarItem , kEventToolbarItemPerformAction } ,

 } ;
 
 static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 } ;
 
 static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-    
-    switch( GetEventKind( event ) )
+
+    switch ( GetEventKind( event ) )

     {
         case kEventToolbarItemPerformAction :
             {
                 wxToolBarTool* tbartool = (wxToolBarTool*) data ;
                 if ( tbartool != NULL )
                 {
     {
         case kEventToolbarItemPerformAction :
             {
                 wxToolBarTool* tbartool = (wxToolBarTool*) data ;
                 if ( tbartool != NULL )
                 {

-                    int         toolID = tbartool->GetId();
-                    wxToolBar   *tbar = ( wxToolBar * ) ( tbartool->GetToolBar() );
+                    wxToolBar *tbar = (wxToolBar*)(tbartool->GetToolBar());
+                    int toolID = tbartool->GetId();
+

                     if ( tbartool->CanBeToggled() )
                     {
                     if ( tbartool->CanBeToggled() )
                     {

-                        tbar->ToggleTool(toolID, !tbartool->IsToggled() );
+                        if ( tbar )
+                            tbar->ToggleTool(toolID, !tbartool->IsToggled() );

                     }
                     }

-                    tbar->OnLeftClick( toolID , tbartool -> IsToggled() ) ;
-                    result = noErr; 
+
+                    if ( tbar )
+                        tbar->OnLeftClick( toolID , tbartool->IsToggled() ) ;
+                    result = noErr;

                 }
             }
             break ;
                 }
             }
             break ;


@@ -291,13 +323,15 @@ static pascal OSStatus wxMacToolBarCommandEventHandler( EventHandlerCallRef hand
         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
 static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
 {
     OSStatus result = eventNotHandledErr ;
     return result ;
 }
 
 static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, EventRef event, void *data )
 {
     OSStatus result = eventNotHandledErr ;

-    switch( GetEventClass( event ) )
+
+    switch ( GetEventClass( event ) )

     {
         case kEventClassToolbarItem :
             result = wxMacToolBarCommandEventHandler( handler, event, data ) ;
     {
         case kEventClassToolbarItem :
             result = wxMacToolBarCommandEventHandler( handler, event, data ) ;


@@ -306,6 +340,7 @@ static pascal OSStatus wxMacToolBarEventHandler( EventHandlerCallRef handler, Ev
         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 


@@ -329,7 +364,7 @@ bool wxToolBarTool::DoEnable(bool enable)
     }
     else if ( IsButton() )
     {
     }
     else if ( IsButton() )
     {

-#if wxMAC_USE_NATIVE_TOOLBAR    
+#if wxMAC_USE_NATIVE_TOOLBAR

         if ( m_toolbarItemRef )
             HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ;
 #endif
         if ( m_toolbarItemRef )
             HIToolbarItemSetEnabled( m_toolbarItemRef , enable ) ;
 #endif


@@ -349,6 +384,7 @@ bool wxToolBarTool::DoEnable(bool enable)
 #endif
         }
     }
 #endif
         }
     }

+

     return true ;
 }
 
     return true ;
 }
 


@@ -371,12 +407,12 @@ void wxToolBarTool::SetPosition(const wxPoint& position)
 
     if ( IsButton() )
     {
 
     if ( IsButton() )
     {

-        Rect contrlRect ;       
-        GetControlBounds( m_controlHandle , &contrlRect ) ; 
+        Rect contrlRect ;
+        GetControlBounds( m_controlHandle , &contrlRect ) ;

         int former_mac_x = contrlRect.left ;
         int former_mac_y = contrlRect.top ;
         GetToolBar()->GetToolSize() ;
         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 ) ;
         if ( mac_x != former_mac_x || mac_y != former_mac_y )
         {
             UMAMoveControl( m_controlHandle , mac_x , mac_y ) ;


@@ -388,24 +424,22 @@ void wxToolBarTool::SetPosition(const wxPoint& position)
     }
     else
     {
     }
     else
     {

-        // separator 
+        // separator

 #ifdef __WXMAC_OSX__
 #ifdef __WXMAC_OSX__

-        Rect contrlRect ;       
-        GetControlBounds( m_controlHandle , &contrlRect ) ; 
+        Rect contrlRect ;
+        GetControlBounds( m_controlHandle , &contrlRect ) ;

         int former_mac_x = contrlRect.left ;
         int former_mac_y = contrlRect.top ;
         int former_mac_x = contrlRect.left ;
         int former_mac_y = contrlRect.top ;

-        
+

         if ( mac_x != former_mac_x || mac_y != former_mac_y )
         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
     }
 }
 
 #endif
     }
 }
 

-void wxToolBarTool::UpdateToggleImage( bool toggle ) 
+void wxToolBarTool::UpdateToggleImage( bool toggle )

 {
 {

-#if wxMAC_USE_NATIVE_TOOLBAR    
+#if wxMAC_USE_NATIVE_TOOLBAR

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
 #define kHIToolbarItemSelected   (1 << 7)
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4
 #define kHIToolbarItemSelected   (1 << 7)


@@ -439,30 +473,30 @@ void wxToolBarTool::UpdateToggleImage( bool toggle )
         int h = m_bmpNormal.GetHeight() ;
         wxBitmap bmp( w , h ) ;
         wxMemoryDC dc ;
         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.SelectObject( bmp ) ;
         dc.SetPen( wxNullPen ) ;
         dc.SetBackground( *wxWHITE ) ;
         dc.DrawRectangle( 0 , 0 , w , h ) ;

-        dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ;
+        dc.DrawBitmap( m_bmpNormal , 0 , 0 , true ) ;

         dc.SelectObject( wxNullBitmap ) ;
         ControlButtonContentInfo info ;
         wxMacCreateBitmapButton( &info , bmp ) ;
         dc.SelectObject( wxNullBitmap ) ;
         ControlButtonContentInfo info ;
         wxMacCreateBitmapButton( &info , bmp ) ;

-       SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
-                       (Ptr)&info );
+        SetControlData( m_controlHandle, 0, kControlIconContentTag, sizeof(info), (Ptr)&info );

         wxMacReleaseBitmapButton( &info ) ;
     }
     else
     {
         ControlButtonContentInfo info ;
         wxMacCreateBitmapButton( &info , m_bmpNormal ) ;
         wxMacReleaseBitmapButton( &info ) ;
     }
     else
     {
         ControlButtonContentInfo info ;
         wxMacCreateBitmapButton( &info , m_bmpNormal ) ;

-       SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ),
-                       (Ptr)&info );
+        SetControlData( m_controlHandle , 0, kControlIconContentTag,
+                        sizeof( info ), (Ptr)&info );

         wxMacReleaseBitmapButton( &info ) ;
     }
 
     IconTransformType transform = toggle ? kTransformSelected : kTransformNone ;
         wxMacReleaseBitmapButton( &info ) ;
     }
 
     IconTransformType transform = toggle ? kTransformSelected : kTransformNone ;

-       SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ),
-                       (Ptr)&transform );
+    SetControlData( m_controlHandle, 0, kControlIconTransformTag,
+                    sizeof( transform ), (Ptr)&transform );

     HIViewSetNeedsDisplay( m_controlHandle , true ) ;
 
 #else
     HIViewSetNeedsDisplay( m_controlHandle , true ) ;
 
 #else


@@ -512,6 +546,7 @@ void wxToolBar::Init()
     m_maxHeight = -1;
     m_defaultWidth = kwxMacToolBarToolDefaultWidth;
     m_defaultHeight = kwxMacToolBarToolDefaultHeight;
     m_maxHeight = -1;
     m_defaultWidth = kwxMacToolBarToolDefaultWidth;
     m_defaultHeight = kwxMacToolBarToolDefaultHeight;

+

 #if wxMAC_USE_NATIVE_TOOLBAR
     m_macHIToolbarRef = NULL ;
     m_macUsesNativeToolbar = false ;
 #if wxMAC_USE_NATIVE_TOOLBAR
     m_macHIToolbarRef = NULL ;
     m_macUsesNativeToolbar = false ;


@@ -521,22 +556,25 @@ void wxToolBar::Init()
 // also for the toolbar we have the dual implementation:
 // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar
 //
 // also for the toolbar we have the dual implementation:
 // only when MacInstallNativeToolbar is called is the native toolbar set as the window toolbar
 //

-bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+bool wxToolBar::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name)

 {
 {

-    if ( !wxToolBarBase::Create( parent , id , pos , size , style ) )
+    if ( !wxToolBarBase::Create( parent , id , pos , size , style, wxDefaultValidator, name ) )

         return false ;
 
         return false ;
 

-    OSStatus err = 0;
+    OSStatus err = noErr;

 
 #if wxMAC_USE_NATIVE_TOOLBAR
 
 #if wxMAC_USE_NATIVE_TOOLBAR

-    wxString labelStr;
-    labelStr.Format(wxT("%xd"), (int)this);
+    wxString labelStr = wxString::Format(wxT("%xd"), (int)this);

     err = HIToolbarCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding() ) , 0 ,
                     (HIToolbarRef*) &m_macHIToolbarRef  );
 
     if (m_macHIToolbarRef != NULL)
     err = HIToolbarCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding() ) , 0 ,
                     (HIToolbarRef*) &m_macHIToolbarRef  );
 
     if (m_macHIToolbarRef != NULL)

-    {  
+    {

         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault ;
         HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall ;
 
         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault ;
         HIToolbarDisplaySize displaySize = kHIToolbarDisplaySizeSmall ;
 


@@ -552,11 +590,11 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
     }
 #endif
 
     }
 #endif
 

-    return (err == 0);
+    return (err == noErr);

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()

-{    
+{

 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_macHIToolbarRef )
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_macHIToolbarRef )
     {


@@ -572,24 +610,27 @@ wxToolBar::~wxToolBar()
 
 bool wxToolBar::Show( bool show )
 {
 
 bool wxToolBar::Show( bool show )
 {

-    bool bResult, ownToolbarInstalled = false;
+    bool bResult;

     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());

-    
+

     bResult = (tlw != NULL);
     if (bResult)
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
     bResult = (tlw != NULL);
     if (bResult)
     {
 #if wxMAC_USE_NATIVE_TOOLBAR

+        bool ownToolbarInstalled = false;

         MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
         if (ownToolbarInstalled)
         {
         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
         }
         else
 #endif

+

             bResult = wxToolBarBase::Show( show );
     }
             bResult = wxToolBarBase::Show( show );
     }

-        
+

     return bResult;
 }
 
     return bResult;
 }
 


@@ -601,11 +642,14 @@ bool wxToolBar::IsShown() const
     bool ownToolbarInstalled ;
     MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
     if (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
 #endif
         bResult = wxToolBarBase::IsShown();

-    
+

     return bResult;
 }
 
     return bResult;
 }
 


@@ -614,11 +658,11 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
 #if wxMAC_USE_NATIVE_TOOLBAR
     Rect    boundsR;
     bool    ownToolbarInstalled;
 #if wxMAC_USE_NATIVE_TOOLBAR
     Rect    boundsR;
     bool    ownToolbarInstalled;

-    
+

     MacTopLevelHasNativeToolbar( &ownToolbarInstalled );
     if ( ownToolbarInstalled )
     {
     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;
         GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR );
         if ( width != NULL )
             *width = boundsR.right - boundsR.left;


@@ -630,9 +674,19 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
         wxToolBarBase::DoGetSize( width, height );
 }
 
         wxToolBarBase::DoGetSize( width, height );
 }
 

-void wxToolBar::SetWindowStyleFlag( long style ) 
+wxSize wxToolBar::DoGetBestSize() const
+{
+    int width , height ;
+
+    DoGetSize( &width , &height ) ;
+
+    return wxSize( width , height ) ;
+}
+
+void wxToolBar::SetWindowStyleFlag( long style )

 {
     wxToolBarBase::SetWindowStyleFlag( style );
 {
     wxToolBarBase::SetWindowStyleFlag( style );

+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if (m_macHIToolbarRef != NULL)
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
     if (m_macHIToolbarRef != NULL)
     {


@@ -644,7 +698,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
             mode = kHIToolbarDisplayModeIconAndLabel;
         else
             mode = kHIToolbarDisplayModeIconOnly;
             mode = kHIToolbarDisplayModeIconAndLabel;
         else
             mode = kHIToolbarDisplayModeIconOnly;

- 
+

        HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
     }
 #endif
        HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
     }
 #endif


@@ -676,9 +730,9 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const
     return bResultV;
 }
 
     return bResultV;
 }
 

-bool wxToolBar::MacInstallNativeToolbar(bool usesNative) 
+bool wxToolBar::MacInstallNativeToolbar(bool usesNative)

 {
 {

-    bool       bResult = false;
+    bool bResult = false;

 
     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
     if (tlw == NULL)
 
     WindowRef tlw = MAC_WXHWND(MacGetTopLevelWindowRef());
     if (tlw == NULL)


@@ -686,14 +740,14 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 
     if (usesNative && (m_macHIToolbarRef == NULL))
         return bResult;
 
     if (usesNative && (m_macHIToolbarRef == NULL))
         return bResult;

- 
+

     if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
         return bResult;
     if (usesNative && ((GetWindowStyleFlag() & wxTB_VERTICAL) != 0))
         return bResult;

- 
+

     // check the existing toolbar
     HIToolbarRef curToolbarRef = NULL;
     OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
     // check the existing toolbar
     HIToolbarRef curToolbarRef = NULL;
     OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );

-    if (err != 0)
+    if (err != noErr)

         curToolbarRef = NULL;
 
     m_macUsesNativeToolbar = usesNative;
         curToolbarRef = NULL;
 
     m_macUsesNativeToolbar = usesNative;


@@ -709,21 +763,10 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             ShowHideWindowToolbar( tlw, true, false );
             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
             ShowHideWindowToolbar( tlw, true, false );
             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 );
             m_peer->SetRect( &r );

-            //
-            // FIXME: which is best, which is necessary?
-            //

             SetSize( wxSIZE_AUTO_WIDTH, 0 );
             SetSize( wxSIZE_AUTO_WIDTH, 0 );

-            //

             m_peer->SetVisibility( false, true );
             wxToolBarBase::Show( false );
         }
             m_peer->SetVisibility( false, true );
             wxToolBarBase::Show( false );
         }


@@ -738,13 +781,8 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
             ShowHideWindowToolbar( tlw, false, false );
             ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute );
             SetWindowToolbar( tlw, NULL );
             ShowHideWindowToolbar( tlw, false, false );
             ChangeWindowAttributes( tlw, 0 , kWindowToolbarButtonAttribute );
             SetWindowToolbar( tlw, NULL );

-            
-            // FIXME: which is best, which is necessary?
+

             m_peer->SetVisibility( true, true );
             m_peer->SetVisibility( true, true );

-            
-            //
-            // wxToolBarBase::Show( true );
-            //

         }
     }
 
         }
     }
 


@@ -761,60 +799,65 @@ bool wxToolBar::Realize()
     if (m_tools.GetCount() == 0)
         return false;
 
     if (m_tools.GetCount() == 0)
         return false;
 

-    int x = m_xMargin + kwxMacToolBarLeftMargin;
-    int y = m_yMargin + kwxMacToolBarTopMargin;
-    
-    int tw, th;
-    GetSize( &tw, &th );
-    

     int maxWidth = 0;
     int maxHeight = 0;
     int maxWidth = 0;
     int maxHeight = 0;

-    
+

     int maxToolWidth = 0;
     int maxToolHeight = 0;
     int maxToolWidth = 0;
     int maxToolHeight = 0;

-    
+
+    int x = m_xMargin + kwxMacToolBarLeftMargin;
+    int y = m_yMargin + kwxMacToolBarTopMargin;
+
+    int tw, th;
+    GetSize( &tw, &th );
+

     // find the maximum tool width and height
     wxToolBarToolsList::compatibility_iterator  node = m_tools.GetFirst();
     while ( node != NULL )
     {
         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
     // find the maximum tool width and height
     wxToolBarToolsList::compatibility_iterator  node = m_tools.GetFirst();
     while ( node != NULL )
     {
         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();

-        
+

         if ( tool != NULL )
         {
             wxSize  sz = tool->GetSize();
         if ( tool != NULL )
         {
             wxSize  sz = tool->GetSize();

-            
+

             if ( sz.x > maxToolWidth )
                 maxToolWidth = sz.x;
             if ( sz.y > maxToolHeight )
                 maxToolHeight = sz.y;
         }
             if ( sz.x > maxToolWidth )
                 maxToolWidth = sz.x;
             if ( sz.y > maxToolHeight )
                 maxToolHeight = sz.y;
         }

-        
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

-    
-    bool    lastIsRadio = false;
-    bool    curIsRadio = false;
-    bool    setChoiceInGroup = false;
-    
+
+    bool lastIsRadio = false;
+    bool curIsRadio = false;
+    bool setChoiceInGroup = false;
+
+#if wxMAC_USE_NATIVE_TOOLBAR
+    CFIndex currentPosition = 0 ;
+    bool insertAll = false ;
+#endif
+

     node = m_tools.GetFirst();
     while ( node != NULL )
     {
         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();
     node = m_tools.GetFirst();
     while ( node != NULL )
     {
         wxToolBarTool   *tool = (wxToolBarTool *) node->GetData();

-        
+

         if ( tool == NULL )
         {
             node = node->GetNext();
             continue;
         }
         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 )
             maxWidth = x + cursize.x;
         if ( y + cursize.y > maxHeight )
             maxHeight = y + cursize.y;
         // 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;
         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             int x1 = x + ( maxToolWidth - cursize.x ) / 2;


@@ -825,13 +868,13 @@ bool wxToolBar::Realize()
             int y1 = y + ( maxToolHeight - cursize.y ) / 2;
             tool->SetPosition( wxPoint(x, y1) );
         }
             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;
         // update the item positioning state
         if ( GetWindowStyleFlag() & wxTB_VERTICAL )
             y += cursize.y + kwxMacToolSpacing;
         else
             x += cursize.x + kwxMacToolSpacing;

-        
+

 #if wxMAC_USE_NATIVE_TOOLBAR
         // install in native HIToolbar
         if ( m_macHIToolbarRef != NULL )
 #if wxMAC_USE_NATIVE_TOOLBAR
         // install in native HIToolbar
         if ( m_macHIToolbarRef != NULL )


@@ -839,25 +882,43 @@ bool wxToolBar::Realize()
             HIToolbarItemRef    hiItemRef = tool->GetToolbarItemRef();
             if ( hiItemRef != NULL )
             {
             HIToolbarItemRef    hiItemRef = tool->GetToolbarItemRef();
             if ( hiItemRef != NULL )
             {

-                OSStatus    result = HIToolbarAppendItem( (HIToolbarRef) m_macHIToolbarRef, hiItemRef );
-                if ( result == 0 )
+                if ( insertAll || (tool->GetIndex() != currentPosition) )

                 {
                 {

-                    InstallEventHandler( HIObjectGetEventTarget(hiItemRef), GetwxMacToolBarEventHandlerUPP(),
-                                         GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );
+                    OSStatus err = noErr ;
+                    if ( !insertAll )
+                    {
+                        // if this is the first tool that gets newly inserted or repositioned
+                        // first remove all 'old' tools from here to the right, because of this
+                        // all following tools will have to be reinserted (insertAll). i = 100 because there's
+                        // no way to determine how many there are in a toolbar, so just a high number :-(
+                        for ( CFIndex i = 100 ; i >= currentPosition ; --i )
+                        {
+                            err = HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , i ) ;
+                        }
+                        wxASSERT_MSG( err == noErr, _T("HIToolbarRemoveItemAtIndex failed") );
+                        insertAll = true ;
+                    }
+
+                    err = HIToolbarInsertItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, hiItemRef , currentPosition ) ;
+                    wxASSERT_MSG( err == noErr, _T("HIToolbarInsertItemAtIndex failed") );
+
+                    tool->SetIndex( currentPosition ) ;

                 }
                 }

+
+                currentPosition++ ;

             }
         }
             }
         }

-#endif
-        
+#endif // wxMAC_USE_NATIVE_TOOLBAR
+

         // update radio button (and group) state
         lastIsRadio = curIsRadio;
         curIsRadio = ( tool->IsButton() && (tool->GetKind() == wxITEM_RADIO) );
         // update radio button (and group) state
         lastIsRadio = curIsRadio;
         curIsRadio = ( tool->IsButton() && (tool->GetKind() == wxITEM_RADIO) );

-        
+

         if ( !curIsRadio )
         {
             if ( tool->IsToggled() )
                 DoToggleTool( tool, true );
         if ( !curIsRadio )
         {
             if ( tool->IsToggled() )
                 DoToggleTool( tool, true );

-            
+

             setChoiceInGroup = false;
         }
         else
             setChoiceInGroup = false;
         }
         else


@@ -874,31 +935,31 @@ bool wxToolBar::Realize()
             {
                 if ( tool->IsToggled() )
                     DoToggleTool( tool, true );
             {
                 if ( tool->IsToggled() )
                     DoToggleTool( tool, true );

-                
+

                 wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();
                 while ( nodePrev != NULL )
                 {
                     wxToolBarToolBase   *toggleTool = nodePrev->GetData();
                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
                         break;
                 wxToolBarToolsList::compatibility_iterator  nodePrev = node->GetPrevious();
                 while ( nodePrev != NULL )
                 {
                     wxToolBarToolBase   *toggleTool = nodePrev->GetData();
                     if ( (toggleTool == NULL) || !toggleTool->IsButton() || (toggleTool->GetKind() != wxITEM_RADIO) )
                         break;

-                    
+

                     if ( toggleTool->Toggle(false) )
                         DoToggleTool( toggleTool, false );
                     if ( toggleTool->Toggle(false) )
                         DoToggleTool( toggleTool, false );

-                    
+

                     nodePrev = nodePrev->GetPrevious();
                 }
             }
         }
                     nodePrev = nodePrev->GetPrevious();
                 }
             }
         }

-        
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

-    
+

     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         // if not set yet, only one row
         if ( m_maxRows <= 0 )
             SetRows( 1 );
     if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
     {
         // if not set yet, only one row
         if ( m_maxRows <= 0 )
             SetRows( 1 );

-        
+

         m_minWidth = maxWidth;
         maxWidth = tw;
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;
         m_minWidth = maxWidth;
         maxWidth = tw;
         maxHeight += m_yMargin + kwxMacToolBarTopMargin;


@@ -909,14 +970,14 @@ bool wxToolBar::Realize()
         // if not set yet, have one column
         if ( (GetToolsCount() > 0) && (m_maxRows <= 0) )
             SetRows( GetToolsCount() );
         // if not set yet, have one column
         if ( (GetToolsCount() > 0) && (m_maxRows <= 0) )
             SetRows( GetToolsCount() );

-        
+

         m_minHeight = maxHeight;
         maxHeight = th;
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_minWidth = m_maxWidth = maxWidth;
     }
 
         m_minHeight = maxHeight;
         maxHeight = th;
         maxWidth += m_xMargin + kwxMacToolBarLeftMargin;
         m_minWidth = m_maxWidth = maxWidth;
     }
 

-#if 0    
+#if 0

     // FIXME: should this be OSX-only?
     {
         bool wantNativeToolbar, ownToolbarInstalled;
     // FIXME: should this be OSX-only?
     {
         bool wantNativeToolbar, ownToolbarInstalled;


@@ -931,10 +992,13 @@ bool wxToolBar::Realize()
            InvalidateBestSize();
         }
     }
            InvalidateBestSize();
         }
     }

-#else   
+#else

     SetSize( maxWidth, maxHeight );
     InvalidateBestSize();
 #endif
     SetSize( maxWidth, maxHeight );
     InvalidateBestSize();
 #endif

+
+    SetBestFittingSize();
+

     return true;
 }
 
     return true;
 }
 


@@ -942,7 +1006,7 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
     m_defaultWidth = size.x + kwxMacToolBorder;
     m_defaultHeight = size.y + kwxMacToolBorder;
 {
     m_defaultWidth = size.x + kwxMacToolBorder;
     m_defaultHeight = size.y + kwxMacToolBorder;

-    
+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if (m_macHIToolbarRef != NULL)
     {
 #if wxMAC_USE_NATIVE_TOOLBAR
     if (m_macHIToolbarRef != NULL)
     {


@@ -954,7 +1018,7 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
             sizeSpec = kHIToolbarDisplaySizeDefault ;
         else
             sizeSpec = kHIToolbarDisplaySizeSmall ;
             sizeSpec = kHIToolbarDisplaySizeDefault ;
         else
             sizeSpec = kHIToolbarDisplaySizeSmall ;

-            
+

         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
     }
 #endif
         HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
     }
 #endif


@@ -970,20 +1034,19 @@ void wxToolBar::SetRows(int nRows)
 {
     // avoid resizing the frame uselessly
     if ( nRows != m_maxRows )
 {
     // avoid resizing the frame uselessly
     if ( nRows != m_maxRows )

-    {

         m_maxRows = nRows;
         m_maxRows = nRows;

-    }

 }
 
 }
 

-void wxToolBar::MacSuperChangedPosition() 
+void wxToolBar::MacSuperChangedPosition()

 {
     wxWindow::MacSuperChangedPosition();
 {
     wxWindow::MacSuperChangedPosition();

+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if (! m_macUsesNativeToolbar )
 #if wxMAC_USE_NATIVE_TOOLBAR
     if (! m_macUsesNativeToolbar )

-#endif
-    {

         Realize();
         Realize();

-    }
+#else
+    Realize();
+#endif

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


@@ -1053,17 +1116,21 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                 else
                     toolrect.right = toolSize.x;
 
                 else
                     toolrect.right = toolSize.x;
 

-        #ifdef __WXMAC_OSX__
+#ifdef __WXMAC_OSX__

                 // in flat style we need a visual separator
                 // in flat style we need a visual separator

-               #if wxMAC_USE_NATIVE_TOOLBAR
+#if wxMAC_USE_NATIVE_TOOLBAR

                 HIToolbarItemRef item;
                 HIToolbarItemRef item;

-                err = HIToolbarItemCreate( kHIToolbarSeparatorIdentifier, kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates, &item );
+                err = HIToolbarItemCreate(
+                    kHIToolbarSeparatorIdentifier,
+                    kHIToolbarItemCantBeRemoved | kHIToolbarItemIsSeparator | kHIToolbarItemAllowDuplicates,
+                    &item );

                 if (err == noErr)
                     tool->SetToolbarItemRef( item );
                 if (err == noErr)
                     tool->SetToolbarItemRef( item );

-               #endif
+#endif
+

                 CreateSeparatorControl( window, &toolrect, &controlHandle );
                 tool->SetControlHandle( controlHandle );
                 CreateSeparatorControl( window, &toolrect, &controlHandle );
                 tool->SetControlHandle( controlHandle );

-        #endif
+#endif

             }
             break;
 
             }
             break;
 


@@ -1071,41 +1138,43 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
             {
                 wxASSERT( tool->GetControlHandle() == NULL ) ;
                 ControlButtonContentInfo info ;
             {
                 wxASSERT( tool->GetControlHandle() == NULL ) ;
                 ControlButtonContentInfo info ;

-                wxMacCreateBitmapButton( &info , tool->GetNormalBitmap()  , kControlContentIconRef ) ;
-                
-                       if ( UMAGetSystemVersion() >= 0x1000)
-                       CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
-                       else
-                       {
-                               SInt16 behaviour = kControlBehaviorOffsetContents ;
-                               if ( tool->CanBeToggled() )
-                                   behaviour += kControlBehaviorToggles ;
-                               CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , 
-                                   0 , 0 , 0 , &controlHandle ) ;
-                       }                    
+                wxMacCreateBitmapButton( &info , tool->GetNormalBitmap() , kControlContentIconRef ) ;
+
+                if ( UMAGetSystemVersion() >= 0x1000)
+                    CreateIconControl( window , &toolrect , &info , false , &controlHandle ) ;
+                else
+                {
+                    SInt16 behaviour = kControlBehaviorOffsetContents ;
+                    if ( tool->CanBeToggled() )
+                        behaviour |= kControlBehaviorToggles ;
+                    CreateBevelButtonControl( window ,
+                        &toolrect , CFSTR("") , kControlBevelButtonNormalBevel ,
+                        behaviour , &info , 0 , 0 , 0 , &controlHandle ) ;
+                }

 
 #if wxMAC_USE_NATIVE_TOOLBAR
                 HIToolbarItemRef item ;
 
 #if wxMAC_USE_NATIVE_TOOLBAR
                 HIToolbarItemRef item ;

-                wxString       labelStr;
-                labelStr.Format(wxT("%xd"), (int)tool);
+                wxString labelStr = wxString::Format(wxT("%xd"), (int)tool);

                 err = HIToolbarItemCreate(
                     wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
                     kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
                 if (err  == noErr)
                 {
                 err = HIToolbarItemCreate(
                     wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
                     kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates, &item );
                 if (err  == noErr)
                 {

+                    InstallEventHandler( HIObjectGetEventTarget(item), GetwxMacToolBarEventHandlerUPP(),
+                                         GetEventTypeCount(toolBarEventList), toolBarEventList, tool, NULL );

                     HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
                     HIToolbarItemSetIconRef( item, info.u.iconRef );
                     HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
                     HIToolbarItemSetIconRef( item, info.u.iconRef );

-                    HIToolbarItemSetCommandID( item, tool->GetId() );
+                    HIToolbarItemSetCommandID( item, kHIToolbarCommandPressAction );

                     tool->SetToolbarItemRef( item );
                 }
 #endif
 
                 wxMacReleaseBitmapButton( &info ) ;
                     tool->SetToolbarItemRef( item );
                 }
 #endif
 
                 wxMacReleaseBitmapButton( &info ) ;

-                /*
+#if 0

                 SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
                 UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;
                 SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ;
                 UMASetControlTitle(  m_controlHandle , label , wxFont::GetDefaultEncoding() ) ;

-                */
-                
+#endif
+

                 InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
                     GetEventTypeCount(eventList), eventList, tool, NULL );
 
                 InstallControlEventHandler( (ControlRef) controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
                     GetEventTypeCount(eventList), eventList, tool, NULL );
 


@@ -1119,8 +1188,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
             // FIXME: doesn't work yet...
             {
                 HIToolbarItemRef    item;
             // FIXME: doesn't work yet...
             {
                 HIToolbarItemRef    item;

-                wxString            labelStr;
-                labelStr.Format( wxT("%xd"), (int) tool );
+                wxString labelStr = wxString::Format( wxT("%xd"), (int) tool );

                 result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
                                               kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates,
                                               &item );
                 result = HIToolbarItemCreate( wxMacCFStringHolder(labelStr, wxFont::GetDefaultEncoding()),
                                               kHIToolbarItemCantBeRemoved | kHIToolbarItemAnchoredLeft | kHIToolbarItemAllowDuplicates,
                                               &item );


@@ -1129,20 +1197,20 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
                     HIToolbarItemSetLabel( item, wxMacCFStringHolder(tool->GetLabel(), m_font.GetEncoding()) );
                     HIToolbarItemSetCommandID( item, tool->GetId() );
                     tool->SetToolbarItemRef( item );
                     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") );
                     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 ??
                     ::GetControlBounds( controlHandle, &toolrect );
                     UMAMoveControl( controlHandle, -toolrect.left, -toolrect.top );

-                    
+

                     // FIXME: is this necessary ??
                     InstallControlEventHandler( controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
                                                 GetEventTypeCount(eventList), eventList, tool, NULL );
                 }
             }
                     // FIXME: is this necessary ??
                     InstallControlEventHandler( controlHandle, GetwxMacToolBarToolEventHandlerUPP(),
                                                 GetEventTypeCount(eventList), eventList, tool, NULL );
                 }
             }

-                
+

 #else
                 // FIXME: right now there's nothing to do here
 #endif
 #else
                 // FIXME: right now there's nothing to do here
 #endif


@@ -1151,8 +1219,8 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
         default :
             break;
     }
         default :
             break;
     }

- 
-    if ( err == 0 )
+
+    if ( err == noErr )

     {
         if ( controlHandle )
         {
     {
         if ( controlHandle )
         {


@@ -1172,12 +1240,11 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
     }
     else
     {
     }
     else
     {

-        wxString    errMsg;
-        errMsg.Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err );
+        wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long) err );

         wxASSERT_MSG( false, errMsg.c_str() );
     }
         wxASSERT_MSG( false, errMsg.c_str() );
     }

-    
-    return( err == 0 );
+
+    return (err == noErr);

 }
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 }
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))


@@ -1205,6 +1272,10 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 
     tool->Detach();
 
 
     tool->Detach();
 

+#if wxMAC_USE_NATIVE_TOOLBAR
+    CFIndex removeIndex = tool->GetIndex();
+#endif 
+

     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:
     switch ( tool->GetStyle() )
     {
         case wxTOOL_STYLE_CONTROL:


@@ -1219,10 +1290,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
             if ( tool->GetControlHandle() )
             {
                 DisposeControl( (ControlRef) tool->GetControlHandle() ) ;
             if ( tool->GetControlHandle() )
             {
                 DisposeControl( (ControlRef) tool->GetControlHandle() ) ;

+

 #if wxMAC_USE_NATIVE_TOOLBAR
 #if wxMAC_USE_NATIVE_TOOLBAR

-                               if ( tool->GetToolbarItemRef() )
-                       CFRelease( tool->GetToolbarItemRef() ) ;
+                if ( removeIndex != -1 && m_macHIToolbarRef )
+                {
+                    HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef , removeIndex ) ;
+                    tool->SetIndex( -1 ) ;
+                }

 #endif
 #endif

+

                 tool->ClearControl() ;
             }
             break;
                 tool->ClearControl() ;
             }
             break;


@@ -1232,7 +1308,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
     }
 
     // and finally reposition all the controls after this one
     }
 
     // and finally reposition all the controls after this one

-    
+

     for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
     {
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();
     for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
     {
         wxToolBarTool *tool2 = (wxToolBarTool*) node->GetData();


@@ -1244,9 +1320,15 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
             pt.x -= sz.x ;
 
         tool2->SetPosition( pt ) ;
             pt.x -= sz.x ;
 
         tool2->SetPosition( pt ) ;

+
+#if wxMAC_USE_NATIVE_TOOLBAR
+        if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
+            tool2->SetIndex( tool2->GetIndex() - 1 ) ;
+#endif

     }
     }

-    
+

     InvalidateBestSize();
     InvalidateBestSize();

+

     return true ;
 }
 
     return true ;
 }
 


@@ -1259,21 +1341,22 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         return ;
     }
 #endif
         return ;
     }
 #endif

-    
+

     wxPaintDC dc(this) ;
 
     int w, h ;
     GetSize( &w , &h ) ;
     wxPaintDC dc(this) ;
 
     int w, h ;
     GetSize( &w , &h ) ;

+

 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
     {
         if ( UMAGetSystemVersion() >= 0x1030 )
         {
             HIThemePlacardDrawInfo info ;
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
     {
         if ( UMAGetSystemVersion() >= 0x1030 )
         {
             HIThemePlacardDrawInfo info ;

-            memset( &info, 0 , sizeof( info ) ) ;
+            memset( &info, 0, sizeof(info) ) ;

             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;

-            
+

             CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
             HIRect rect = CGRectMake( 0 , 0 , w , h ) ;
             HIThemeDrawPlacard( &rect , & info , cgContext, kHIThemeOrientationNormal) ;
             CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
             HIRect rect = CGRectMake( 0 , 0 , w , h ) ;
             HIThemeDrawPlacard( &rect , & info , cgContext, kHIThemeOrientationNormal) ;


@@ -1283,17 +1366,19 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
     {
         // leave the background as it is (striped or metal)
     }
     {
         // leave the background as it is (striped or metal)
     }

+

 #else
     wxMacPortSetter helper(&dc) ;
 #else
     wxMacPortSetter helper(&dc) ;

-    
-    Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
+
+    Rect toolbarrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,

         dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
 /*
         dc.YLOG2DEVMAC(h) , dc.XLOG2DEVMAC(w) } ;
 /*

-    if( toolbarrect.left < 0 )
+    if ( toolbarrect.left < 0 )

         toolbarrect.left = 0 ;
     if ( toolbarrect.top < 0 )
         toolbarrect.top = 0 ;
 */
         toolbarrect.left = 0 ;
     if ( toolbarrect.top < 0 )
         toolbarrect.top = 0 ;
 */

+

     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
     {
         UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() )
     {
         UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;


@@ -1304,8 +1389,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
         if ( UMAGetSystemVersion() >= 0x1030 )
         {
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
         if ( UMAGetSystemVersion() >= 0x1030 )
         {

-            HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , 
-            dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) );
+            HIRect hiToolbarrect = CGRectMake(
+                dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) ,
+                dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) );

             CGContextRef cgContext ;
             Rect bounds ;
             GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;
             CGContextRef cgContext ;
             Rect bounds ;
             GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ;


@@ -1318,7 +1404,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
                 drawInfo.version = 0 ;
                 drawInfo.state = kThemeStateActive ;
                 drawInfo.kind = kThemeBackgroundMetal ;
                 drawInfo.version = 0 ;
                 drawInfo.state = kThemeStateActive ;
                 drawInfo.kind = kThemeBackgroundMetal ;

-                HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ;
+                HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext, kHIThemeOrientationNormal) ;

             }
 
             QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;
             }
 
             QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ;