Try to display '...' text on editor buttons more consistently on wxGTK. This is done...

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

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index a3aedf7db67057819155a646d67c8d7709c49cb4..f1ff79cd4caaec3c51a8d448c71afa6e3b5a5a45 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:


@@ -20,7 +20,7 @@
 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

 #include "wx/geometry.h"
 #include "wx/sysopt.h"
 
 #include "wx/geometry.h"
 #include "wx/sysopt.h"
 


@@ -32,9 +32,6 @@ const short kwxMacToolBarLeftMargin =  4;
 const short kwxMacToolBorder = 0;
 const short kwxMacToolSpacing = 6;
 
 const short kwxMacToolBorder = 0;
 const short kwxMacToolSpacing = 6;
 

-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-

 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint )
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT( wxToolBar::OnPaint )
 END_EVENT_TABLE()


@@ -43,7 +40,6 @@ END_EVENT_TABLE()
 #pragma mark -
 #pragma mark Tool Implementation
 
 #pragma mark -
 #pragma mark Tool Implementation
 

-

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


@@ -163,19 +159,22 @@ public:
         return wxPoint( m_x, m_y );
     }
 
         return wxPoint( m_x, m_y );
     }
 

-    bool DoEnable( bool enable );
+    virtual bool Enable( bool enable );

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

-#if wxOSX_USE_NATIVE_TOOLBAR
-    void SetToolbarItemRef( HIToolbarItemRef ref )
+    virtual bool Toggle(bool toggle)

     {
     {

-        if ( m_controlHandle )
-            HideControl( m_controlHandle );
-        if ( m_toolbarItemRef )
-            CFRelease( m_toolbarItemRef );
-
-        m_toolbarItemRef = ref;
+        if ( wxToolBarToolBase::Toggle( toggle ) == false )
+            return false;
+            
+        UpdateToggleImage(toggle);
+        return true;
+    }
+    
+    void UpdateHelpStrings()
+    {
+#if wxOSX_USE_NATIVE_TOOLBAR            

         if ( m_toolbarItemRef )
         {
             wxFontEncoding enc = GetToolBarFontEncoding();
         if ( m_toolbarItemRef )
         {
             wxFontEncoding enc = GetToolBarFontEncoding();


@@ -185,27 +184,37 @@ public:
                 wxCFStringRef( GetShortHelp(), enc ),
                 wxCFStringRef( GetLongHelp(), enc ) );
         }
                 wxCFStringRef( GetShortHelp(), enc ),
                 wxCFStringRef( GetLongHelp(), enc ) );
         }

+#endif

     }
     }

-
-    HIToolbarItemRef GetToolbarItemRef() const
+    
+    virtual bool SetShortHelp(const wxString& help)

     {
     {

-        return m_toolbarItemRef;
+        if ( wxToolBarToolBase::SetShortHelp( help ) == false )
+            return false;
+            
+        UpdateHelpStrings();        
+        return true;

     }
     }

-
-    void SetIndex( CFIndex idx )
+    
+    virtual bool SetLongHelp(const wxString& help)

     {
     {

-        m_index = idx;
+        if ( wxToolBarToolBase::SetLongHelp( help ) == false )
+            return false;
+
+        UpdateHelpStrings();
+        return true;

     }
 
     }
 

-    CFIndex GetIndex() const
+    virtual void SetNormalBitmap(const wxBitmap& bmp) 

     {
     {

-        return m_index;
+        wxToolBarToolBase::SetNormalBitmap(bmp);
+        UpdateToggleImage(CanBeToggled() && IsToggled());

     }
     }

-
+        

     virtual void SetLabel(const wxString& label)
     {
         wxToolBarToolBase::SetLabel(label);
     virtual void SetLabel(const wxString& label)
     {
         wxToolBarToolBase::SetLabel(label);

-
+#if wxOSX_USE_NATIVE_TOOLBAR

         if ( m_toolbarItemRef )
         {
             // strip mnemonics from the label for compatibility with the usual
         if ( m_toolbarItemRef )
         {
             // strip mnemonics from the label for compatibility with the usual


@@ -216,6 +225,34 @@ public:
                 m_toolbarItemRef,
                 wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
         }
                 m_toolbarItemRef,
                 wxCFStringRef(labelStr, GetToolBarFontEncoding()) );
         }

+#endif
+    }
+
+#if wxOSX_USE_NATIVE_TOOLBAR
+    void SetToolbarItemRef( HIToolbarItemRef ref )
+    {
+        if ( m_controlHandle )
+            HideControl( m_controlHandle );
+        if ( m_toolbarItemRef )
+            CFRelease( m_toolbarItemRef );
+
+        m_toolbarItemRef = ref;
+        UpdateHelpStrings();
+    }
+
+    HIToolbarItemRef GetToolbarItemRef() const
+    {
+        return m_toolbarItemRef;
+    }
+
+    void SetIndex( CFIndex idx )
+    {
+        m_index = idx;
+    }
+
+    CFIndex GetIndex() const
+    {
+        return m_index;

     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR
 
     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR
 


@@ -224,7 +261,6 @@ private:
     wxFontEncoding GetToolBarFontEncoding() const
     {
         wxFont f;
     wxFontEncoding GetToolBarFontEncoding() const
     {
         wxFont f;

-        wxFontEncoding enc;

         if ( GetToolBar() )
             f = GetToolBar()->GetFont();
         return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();
         if ( GetToolBar() )
             f = GetToolBar()->GetFont();
         return f.IsOk() ? f.GetEncoding() : wxFont::GetDefaultEncoding();


@@ -389,8 +425,11 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarEventHandler )
 
 #endif
 
 
 #endif
 

-bool wxToolBarTool::DoEnable( bool enable )
+bool wxToolBarTool::Enable( bool enable )

 {
 {

+    if ( wxToolBarToolBase::Enable( enable ) == false )
+        return false;
+    

     if ( IsControl() )
     {
         GetControl()->Enable( enable );
     if ( IsControl() )
     {
         GetControl()->Enable( enable );


@@ -562,7 +601,7 @@ void wxToolBar::Init()
     m_defaultHeight = kwxMacToolBarToolDefaultHeight;
 
 #if wxOSX_USE_NATIVE_TOOLBAR
     m_defaultHeight = kwxMacToolBarToolDefaultHeight;
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-    m_macHIToolbarRef = NULL;
+    m_macToolbar = NULL;

     m_macUsesNativeToolbar = false;
 #endif
 }
     m_macUsesNativeToolbar = false;
 #endif
 }


@@ -652,8 +691,6 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
                             CFIndex count =  CFGetRetainCount( viewRef ) ;
                             if ( count >= 1 )
                             {
                             CFIndex count =  CFGetRetainCount( viewRef ) ;
                             if ( count >= 1 )
                             {

-                                wxFAIL_MSG("Reference count of native tool was illegal before removal");
-

                                 CFRelease( viewRef ) ;
                             }
                         }
                                 CFRelease( viewRef ) ;
                             }
                         }


@@ -857,11 +894,11 @@ bool wxToolBar::Create(
         wxString labelStr = wxString::Format( wxT("%p"), this );
         err = HIToolbarCreate(
           wxCFStringRef( labelStr, wxFont::GetDefaultEncoding() ), 0,
         wxString labelStr = wxString::Format( wxT("%p"), this );
         err = HIToolbarCreate(
           wxCFStringRef( labelStr, wxFont::GetDefaultEncoding() ), 0,

-          (HIToolbarRef*) &m_macHIToolbarRef );
+          (HIToolbarRef*) &m_macToolbar );

 
 

-        if (m_macHIToolbarRef != NULL)
+        if (m_macToolbar != NULL)

         {
         {

-            InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macHIToolbarRef ), ToolbarDelegateHandler,
+            InstallEventHandler( HIObjectGetEventTarget((HIToolbarRef)m_macToolbar ), ToolbarDelegateHandler,

                     GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL );
 
             HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;
                     GetEventTypeCount( kToolbarEvents ), kToolbarEvents, this, NULL );
 
             HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;


@@ -874,8 +911,8 @@ bool wxToolBar::Create(
             else
                 mode = kHIToolbarDisplayModeIconOnly;
 
             else
                 mode = kHIToolbarDisplayModeIconOnly;
 

-            HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
-          HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, displaySize );
+            HIToolbarSetDisplayMode( (HIToolbarRef) m_macToolbar, mode );
+          HIToolbarSetDisplaySize( (HIToolbarRef) m_macToolbar, displaySize );

        }
     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR
        }
     }
 #endif // wxOSX_USE_NATIVE_TOOLBAR


@@ -886,13 +923,13 @@ bool wxToolBar::Create(
 wxToolBar::~wxToolBar()
 {
 #if wxOSX_USE_NATIVE_TOOLBAR
 wxToolBar::~wxToolBar()
 {
 #if wxOSX_USE_NATIVE_TOOLBAR

-    if (m_macHIToolbarRef != NULL)
+    if (m_macToolbar != NULL)

     {
         // if this is the installed toolbar, then deinstall it
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
     {
         // if this is the installed toolbar, then deinstall it
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 

-        CFIndex count = CFGetRetainCount( m_macHIToolbarRef ) ;
+        CFIndex count = CFGetRetainCount( m_macToolbar ) ;

         // Leopard seems to have one refcount more, so we cannot check reliably at the moment
         if ( UMAGetSystemVersion() < 0x1050 )
         {
         // Leopard seems to have one refcount more, so we cannot check reliably at the moment
         if ( UMAGetSystemVersion() < 0x1050 )
         {


@@ -901,8 +938,8 @@ wxToolBar::~wxToolBar()
                 wxFAIL_MSG("Reference count of native control was not 1 in wxToolBar destructor");
             }
         }
                 wxFAIL_MSG("Reference count of native control was not 1 in wxToolBar destructor");
             }
         }

-        CFRelease( (HIToolbarRef)m_macHIToolbarRef );
-        m_macHIToolbarRef = NULL;
+        CFRelease( (HIToolbarRef)m_macToolbar );
+        m_macToolbar = NULL;

     }
 #endif
 }
     }
 #endif
 }


@@ -967,7 +1004,7 @@ void wxToolBar::DoGetSize( int *width, int *height ) const
     if ( ownToolbarInstalled )
     {
         // TODO: is this really a control ?
     if ( ownToolbarInstalled )
     {
         // TODO: is this really a control ?

-        GetControlBounds( (ControlRef) m_macHIToolbarRef, &boundsR );
+        GetControlBounds( (ControlRef) m_macToolbar, &boundsR );

         if ( width != NULL )
             *width = boundsR.right - boundsR.left;
         if ( height != NULL )
         if ( width != NULL )
             *width = boundsR.right - boundsR.left;
         if ( height != NULL )


@@ -995,7 +1032,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
     wxToolBarBase::SetWindowStyleFlag( style );
 
 #if wxOSX_USE_NATIVE_TOOLBAR
     wxToolBarBase::SetWindowStyleFlag( style );
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-    if (m_macHIToolbarRef != NULL)
+    if (m_macToolbar != NULL)

     {
         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;
 
     {
         HIToolbarDisplayMode mode = kHIToolbarDisplayModeDefault;
 


@@ -1006,7 +1043,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
         else
             mode = kHIToolbarDisplayModeIconOnly;
 
         else
             mode = kHIToolbarDisplayModeIconOnly;
 

-       HIToolbarSetDisplayMode( (HIToolbarRef) m_macHIToolbarRef, mode );
+       HIToolbarSetDisplayMode( (HIToolbarRef) m_macToolbar, mode );

     }
 #endif
 }
     }
 #endif
 }


@@ -1031,7 +1068,7 @@ bool wxToolBar::MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const
         OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
         bResultV = ((err == noErr) && (curToolbarRef != NULL));
         if (bResultV && (ownToolbarInstalled != NULL))
         OSStatus err = GetWindowToolbar( tlw, &curToolbarRef );
         bResultV = ((err == noErr) && (curToolbarRef != NULL));
         if (bResultV && (ownToolbarInstalled != NULL))

-            *ownToolbarInstalled = (curToolbarRef == m_macHIToolbarRef);
+            *ownToolbarInstalled = (curToolbarRef == m_macToolbar);

     }
 
     return bResultV;
     }
 
     return bResultV;


@@ -1041,7 +1078,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
 {
     bool bResult = false;
 
 {
     bool bResult = false;
 

-    if (usesNative && (m_macHIToolbarRef == NULL))
+    if (usesNative && (m_macToolbar == NULL))

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


@@ -1066,7 +1103,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
         {
             bResult = true;
 
         {
             bResult = true;
 

-            SetWindowToolbar( tlw, (HIToolbarRef) m_macHIToolbarRef );
+            SetWindowToolbar( tlw, (HIToolbarRef) m_macToolbar );

             ShowHideWindowToolbar( tlw, true, false );
             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );
             ShowHideWindowToolbar( tlw, true, false );
             ChangeWindowAttributes( tlw, kWindowToolbarButtonAttribute, 0 );
             SetAutomaticControlDragTrackingEnabledForWindow( tlw, true );


@@ -1080,7 +1117,7 @@ bool wxToolBar::MacInstallNativeToolbar(bool usesNative)
     else
     {
         // only deinstall toolbar if this is the installed one
     else
     {
         // only deinstall toolbar if this is the installed one

-        if (m_macHIToolbarRef == curToolbarRef)
+        if (m_macToolbar == curToolbarRef)

         {
             bResult = true;
 
         {
             bResult = true;
 


@@ -1143,7 +1180,7 @@ bool wxToolBar::Realize()
     CFIndex currentPosition = 0;
     bool insertAll = false;
 
     CFIndex currentPosition = 0;
     bool insertAll = false;
 

-    HIToolbarRef refTB = (HIToolbarRef)m_macHIToolbarRef;
+    HIToolbarRef refTB = (HIToolbarRef)m_macToolbar;

     wxFont f;
     wxFontEncoding enc;
     f = GetFont();
     wxFont f;
     wxFontEncoding enc;
     f = GetFont();


@@ -1197,10 +1234,6 @@ bool wxToolBar::Realize()
             {
                 // since setting the help texts is non-virtual we have to update
                 // the strings now
             {
                 // since setting the help texts is non-virtual we have to update
                 // the strings now

-                HIToolbarItemSetHelpText( hiItemRef,
-                    wxCFStringRef( tool->GetShortHelp(), enc ),
-                    wxCFStringRef( tool->GetLongHelp(), enc ) );
-

                 if ( insertAll || (tool->GetIndex() != currentPosition) )
                 {
                     OSStatus err = noErr;
                 if ( insertAll || (tool->GetIndex() != currentPosition) )
                 {
                     OSStatus err = noErr;


@@ -1370,7 +1403,7 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     m_defaultHeight = size.y + kwxMacToolBorder;
 
 #if wxOSX_USE_NATIVE_TOOLBAR
     m_defaultHeight = size.y + kwxMacToolBorder;
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-    if (m_macHIToolbarRef != NULL)
+    if (m_macToolbar != NULL)

     {
         int maxs = wxMax( size.x, size.y );
         HIToolbarDisplaySize sizeSpec;
     {
         int maxs = wxMax( size.x, size.y );
         HIToolbarDisplaySize sizeSpec;


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

-        HIToolbarSetDisplaySize( (HIToolbarRef) m_macHIToolbarRef, sizeSpec );
+        HIToolbarSetDisplaySize( (HIToolbarRef) m_macToolbar, sizeSpec );

     }
 #endif
 }
     }
 #endif
 }


@@ -1468,17 +1501,14 @@ wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
+void wxToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(enable))

 {
 {

-    if ( t != NULL )
-        ((wxToolBarTool*)t)->DoEnable( enable );
+    // everything already done in the tool's implementation

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

-    wxToolBarTool *tool = (wxToolBarTool *)t;
-    if ( ( tool != NULL ) && tool->IsButton() )
-        tool->UpdateToggleImage( toggle );
+    // everything already done in the tool's implementation

 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 }
 
 bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)


@@ -1495,7 +1525,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 #if wxOSX_USE_NATIVE_TOOLBAR
     wxString label = tool->GetLabel();
 
 #if wxOSX_USE_NATIVE_TOOLBAR
     wxString label = tool->GetLabel();

-    if (m_macHIToolbarRef && !label.empty() )
+    if (m_macToolbar && !label.empty() )

     {
         // strip mnemonics from the label for compatibility
         // with the usual labels in wxStaticText sense
     {
         // strip mnemonics from the label for compatibility
         // with the usual labels in wxStaticText sense


@@ -1517,7 +1547,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
                 // in flat style we need a visual separator
 #if wxOSX_USE_NATIVE_TOOLBAR
 
                 // in flat style we need a visual separator
 #if wxOSX_USE_NATIVE_TOOLBAR

-                if (m_macHIToolbarRef != NULL)
+                if (m_macToolbar != NULL)

                 {
                     HIToolbarItemRef item;
                     err = HIToolbarItemCreate(
                 {
                     HIToolbarItemRef item;
                     err = HIToolbarItemCreate(


@@ -1561,7 +1591,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 }
 
 #if wxOSX_USE_NATIVE_TOOLBAR
                 }
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-                if (m_macHIToolbarRef != NULL)
+                if (m_macToolbar != NULL)

                 {
                     HIToolbarItemRef item;
                     wxString labelStr = wxString::Format(wxT("%p"), tool);
                 {
                     HIToolbarItemRef item;
                     wxString labelStr = wxString::Format(wxT("%p"), tool);


@@ -1606,13 +1636,13 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
         case wxTOOL_STYLE_CONTROL:
 
 #if wxOSX_USE_NATIVE_TOOLBAR
         case wxTOOL_STYLE_CONTROL:
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-            if (m_macHIToolbarRef != NULL)
+            if (m_macToolbar != 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) ) ;
             {
                 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,
+                err = HIToolbarCreateItemWithIdentifier((HIToolbarRef) m_macToolbar,kControlToolbarItemClassID,

                     data , &item ) ;
 
                 if (err  == noErr)
                     data , &item ) ;
 
                 if (err  == noErr)


@@ -1662,7 +1692,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {

-    wxFAIL_MSG( wxT("not implemented") );
+    // nothing to do

 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 }
 
 bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)


@@ -1688,11 +1718,11 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
 #endif
 
 #if wxOSX_USE_NATIVE_TOOLBAR
 #endif
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-    if (m_macHIToolbarRef != NULL)
+    if (m_macToolbar != NULL)

     {
     {

-        if ( removeIndex != -1 && m_macHIToolbarRef )
+        if ( removeIndex != -1 && m_macToolbar )

         {
         {

-            HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macHIToolbarRef, removeIndex );
+            HIToolbarRemoveItemAtIndex( (HIToolbarRef) m_macToolbar, removeIndex );

             tool->SetIndex( -1 );
         }
     }
             tool->SetIndex( -1 );
         }
     }


@@ -1715,7 +1745,7 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolbase)
         tool2->SetPosition( pt );
 
 #if wxOSX_USE_NATIVE_TOOLBAR
         tool2->SetPosition( pt );
 
 #if wxOSX_USE_NATIVE_TOOLBAR

-        if (m_macHIToolbarRef != NULL)
+        if (m_macToolbar != NULL)

         {
             if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
                 tool2->SetIndex( tool2->GetIndex() - 1 );
         {
             if ( removeIndex != -1 && tool2->GetIndex() > removeIndex )
                 tool2->SetIndex( tool2->GetIndex() - 1 );