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

Use dedicated function to check whether menu item is a radio button

Browse Source 
No real changes, just refactoring.
This commit is contained in:
Artur Wieczorek 2017-08-20 21:28:46 +02:00
parent e56cb112d3
commit 0624108acc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/menu.cpp
View File

@ -360,7 +360,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
// the group, but inserting non-radio item breaks it into two subgroups.) // the group, but inserting non-radio item breaks it into two subgroups.)
// //
bool checkInitially = false; bool checkInitially = false;
if ( pItem->GetKind() == wxITEM_RADIO ) if ( pItem->IsRadio() )
{ {
if ( !m_radioData ) if ( !m_radioData )
m_radioData = new wxMenuRadioItemsData; m_radioData = new wxMenuRadioItemsData;
@ -627,7 +627,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
{ {
if ( m_radioData->UpdateOnRemoveItem(pos) ) if ( m_radioData->UpdateOnRemoveItem(pos) )
{ {
wxASSERT_MSG( item->GetKind() == wxITEM_RADIO, wxASSERT_MSG( item->IsRadio(),
wxT("Removing non radio button from radio group?") ); wxT("Removing non radio button from radio group?") );
} }
//else: item being removed is not in a radio group //else: item being removed is not in a radio group
@ -778,7 +778,7 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
wxMenuItem * const item = FindItem(id); wxMenuItem * const item = FindItem(id);
if ( item ) if ( item )
{ {
if ( (item->GetKind() == wxITEM_RADIO) && item->IsChecked() ) if ( item->IsRadio() && item->IsChecked() )
return true; return true;
if ( item->IsCheckable() ) if ( item->IsCheckable() )