supporting disabled tools, fixes #11457

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 0add59ad0093a5f5dab02216f9db051ef4e29bfd..30858e2119911736f0d39e4083984f3cd4672420 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -150,7 +150,7 @@ public:
         return wxPoint( m_x, m_y );
     }
 
         return wxPoint( m_x, m_y );
     }
 

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

 
     void UpdateImages();
 
 
     void UpdateImages();
 


@@ -265,6 +265,7 @@ private:
 - (void)setImplementation: (wxToolBarTool *) theImplementation;
 - (wxToolBarTool*) implementation;
 - (void) clickedAction: (id) sender;
 - (void)setImplementation: (wxToolBarTool *) theImplementation;
 - (wxToolBarTool*) implementation;
 - (void) clickedAction: (id) sender;

+- (BOOL) validateToolbarItem:(NSToolbarItem *)theItem;

 
 @end
 
 
 @end
 


@@ -332,6 +333,12 @@ private:
     return impl;
 }
 
     return impl;
 }
 

+- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
+{
+    wxUnusedVar(theItem);
+    return impl->IsEnabled() ? YES:NO;
+}
+

 @end
 
 @implementation wxNSToolbarDelegate
 @end
 
 @implementation wxNSToolbarDelegate


@@ -422,8 +429,11 @@ private:
 
 @end
 
 
 @end
 

-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 );


@@ -1177,10 +1187,9 @@ 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 Enable implementation

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