X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f95255e2e7e617ffc48d9d83c6aa1f922ea85b8d..763f55468e441e94e65a72b127c8fc2a48c91e91:/src/os2/menu.cpp diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp index 2ed0039e5a..ccf5fce86f 100644 --- a/src/os2/menu.cpp +++ b/src/os2/menu.cpp @@ -188,6 +188,14 @@ void wxMenu::Break() #if wxUSE_ACCEL +void wxMenu::EndRadioGroup() +{ + // + // We're not inside a radio group any longer + // + m_nStartRadioGroup = -1; +} // end of wxMenu::EndRadioGroup + int wxMenu::FindAccel( int nId ) const @@ -406,18 +414,18 @@ bool wxMenu::DoAppend( { int nCount = GetMenuItemCount(); - if (m_lStartRadioGroup == -1) + if (m_nStartRadioGroup == -1) { // // Start a new radio group // - m_lStartRadioGroup = lCount; + m_nStartRadioGroup = nCount; // // For now it has just one element // pItem->SetAsRadioGroupStart(); - pItem->SetRadioGroupEnd(m_startRadioGroup); + pItem->SetRadioGroupEnd(m_nStartRadioGroup); // // Ensure that we have a checked item in the radio group @@ -429,12 +437,12 @@ bool wxMenu::DoAppend( // // We need to update its end item // - pItem->SetRadioGroupStart(m_lStartRadioGroup); - wxMenuItemList::Node *node = GetMenuItems().Item(m_startRadioGroup); + pItem->SetRadioGroupStart(m_nStartRadioGroup); + wxMenuItemList::Node* pNode = GetMenuItems().Item(m_nStartRadioGroup); - if (node) + if (pNode) { - node->GetData()->SetRadioGroupEnd(count); + pNode->GetData()->SetRadioGroupEnd(nCount); } else {