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

Use new CanBeToggled function inside wxAuiToolBar where appropriate

Browse Source
This commit is contained in:
Ian McInerney
2020-08-21 23:29:08 +01:00
parent afbb334a26
commit c0bfaf4104
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/aui/auibar.cpp
View File

@@ -1546,7 +1546,7 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state)
{ {
wxAuiToolBarItem* tool = FindTool(tool_id); wxAuiToolBarItem* tool = FindTool(tool_id);
if (tool && (tool->m_kind == wxITEM_CHECK || tool->m_kind == wxITEM_RADIO)) if ( tool && tool->CanBeToggled() )
{ {
if (tool->m_kind == wxITEM_RADIO) if (tool->m_kind == wxITEM_RADIO)
{ {
@@ -1587,13 +1587,8 @@ bool wxAuiToolBar::GetToolToggled(int tool_id) const
{ {
wxAuiToolBarItem* tool = FindTool(tool_id); wxAuiToolBarItem* tool = FindTool(tool_id);
if (tool) if ( tool && tool->CanBeToggled() )
{
if ( (tool->m_kind != wxITEM_CHECK) && (tool->m_kind != wxITEM_RADIO) )
return false;
return (tool->m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; return (tool->m_state & wxAUI_BUTTON_STATE_CHECKED) ? true : false;
}
return false; return false;
} }