cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

supporting disabled tools, fixes #11457

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2010-07-07 08:26:00 +00:00
parent 281448385a
commit 35a11fc70c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/osx/cocoa/toolbar.mm
View File

@ -150,7 +150,7 @@ public:
return wxPoint( m_x, m_y );
}
bool DoEnable( bool enable );
bool Enable( bool enable );
void UpdateImages();
@ -265,6 +265,7 @@ private:
- (void)setImplementation: (wxToolBarTool *) theImplementation;
- (wxToolBarTool*) implementation;
- (void) clickedAction: (id) sender;
- (BOOL) validateToolbarItem:(NSToolbarItem *)theItem;
@end
@ -332,6 +333,12 @@ private:
return impl;
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
{
wxUnusedVar(theItem);
return impl->IsEnabled() ? YES:NO;
}
@end
@implementation wxNSToolbarDelegate
@ -422,8 +429,11 @@ private:
@end
bool wxToolBarTool::DoEnable( bool enable )
bool wxToolBarTool::Enable( bool enable )
{
if ( wxToolBarToolBase::Enable( enable ) == false )
return false;
if ( IsControl() )
{
GetControl()->Enable( enable );
@ -1177,10 +1187,9 @@ wxString wxToolBar::MacGetToolTipString( wxPoint &pt )
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)