AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

making tool enable consistent (was using mix of enable and activate controls before)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-08-23 14:24:36 +00:00
parent 7d0cfe71cf
commit a2fe01c96d
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mac/carbon/toolbar.cpp
View File

@ -66,6 +66,7 @@ public:
void SetSize(const wxSize& size) ; void SetSize(const wxSize& size) ;
void SetPosition( const wxPoint& position ) ; void SetPosition( const wxPoint& position ) ;
wxSize GetSize() const wxSize GetSize() const
{ {
if ( IsControl() ) if ( IsControl() )
@ -88,6 +89,7 @@ public:
{ {
return wxPoint(m_x, m_y); return wxPoint(m_x, m_y);
} }
bool DoEnable( bool enable ) ;
private : private :
void Init() void Init()
{ {
@ -159,6 +161,28 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler )
// wxToolBarTool // wxToolBarTool
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxToolBarTool::DoEnable(bool enable)
{
if ( IsControl() )
{
GetControl()->Enable( enable ) ;
}
else if ( IsButton() )
{
#if TARGET_API_MAC_OSX
if ( enable )
EnableControl( m_controlHandle ) ;
else
DisableControl( m_controlHandle ) ;
#else
if ( enable )
ActivateControl( m_controlHandle ) ;
else
DeactivateControl( m_controlHandle ) ;
#endif
}
return true ;
}
void wxToolBarTool::SetSize(const wxSize& size) void wxToolBarTool::SetSize(const wxSize& size)
{ {
if ( IsControl() ) if ( IsControl() )
@ -240,8 +264,6 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar,
GetEventTypeCount(eventList), eventList, this,NULL); GetEventTypeCount(eventList), eventList, this,NULL);
UMAShowControl( m_controlHandle ) ; UMAShowControl( m_controlHandle ) ;
if ( !IsEnabled() )
DisableControl( m_controlHandle ) ;
if ( CanBeToggled() && IsToggled() ) if ( CanBeToggled() && IsToggled() )
::SetControl32BitValue( m_controlHandle , 1 ) ; ::SetControl32BitValue( m_controlHandle , 1 ) ;
@ -443,18 +465,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
if (!IsShown()) if (!IsShown())
return ; return ;
wxToolBarTool *tool = (wxToolBarTool *)t; ((wxToolBarTool*)t)->DoEnable( enable ) ;
if ( tool->IsControl() )
{
tool->GetControl()->Enable( enable ) ;
}
else if ( tool->IsButton() )
{
if ( enable )
UMAActivateControl( (ControlRef) tool->GetControlHandle() ) ;
else
UMADeactivateControl( (ControlRef) tool->GetControlHandle() ) ;
}
} }
void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle) void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)