X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2368dcda39f732b2812683b44d2d8f0449c4c055..993eebf1bae0a595540cb282342e894f23fbb1ee:/src/msw/menuitem.cpp?ds=sidebyside diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 3991334757..aae20373f7 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -89,7 +89,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, wxMenu *pSubMenu) : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK) + , wxOwnerDrawn(text, kind == wxITEM_CHECK) #endif // owner drawn { Init(); @@ -104,7 +104,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, : wxMenuItemBase(parentMenu, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) #if wxUSE_OWNER_DRAWN - , wxOwnerDrawn(GetLabelFromText(text), isCheckable) + , wxOwnerDrawn(text, isCheckable) #endif // owner drawn { Init(); @@ -112,8 +112,8 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, void wxMenuItem::Init() { - m_startRadioGroup = - m_endRadioGroup = -1; + m_radioGroup.start = -1; + m_isRadioGroupStart = FALSE; #if wxUSE_OWNER_DRAWN // set default menu colors @@ -161,6 +161,30 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) return wxStripMenuCodes(text); } +// radio group stuff +// ----------------- + +void wxMenuItem::SetAsRadioGroupStart() +{ + m_isRadioGroupStart = TRUE; +} + +void wxMenuItem::SetRadioGroupStart(int start) +{ + wxASSERT_MSG( !m_isRadioGroupStart, + _T("should only be called for the next radio items") ); + + m_radioGroup.start = start; +} + +void wxMenuItem::SetRadioGroupEnd(int end) +{ + wxASSERT_MSG( m_isRadioGroupStart, + _T("should only be called for the first radio item") ); + + m_radioGroup.end = end; +} + // change item state // ----------------- @@ -197,25 +221,49 @@ void wxMenuItem::Check(bool check) if ( !check ) return; + // get the index of this item in the menu const wxMenuItemList& items = m_parentMenu->GetMenuItems(); int pos = items.IndexOf(this); wxCHECK_RET( pos != wxNOT_FOUND, _T("menuitem not found in the menu items list?") ); + // get the radio group range + int start, + end; + + if ( m_isRadioGroupStart ) + { + // we already have all information we need + start = pos; + end = m_radioGroup.end; + } + else // next radio group item + { + // get the radio group end from the start item + start = m_radioGroup.start; + end = items.Item(start)->GetData()->m_radioGroup.end; + } + #ifdef __WIN32__ + // calling CheckMenuRadioItem() with such parameters hangs my system + // (NT4 SP6) and I suspect this could happen to the others as well - so + // don't do it! + wxCHECK_RET( start != -1 && end != -1, + _T("invalid ::CheckMenuRadioItem() parameter(s)") ); + if ( !::CheckMenuRadioItem(hmenu, - m_startRadioGroup, // first group item - m_endRadioGroup, // last one - pos, // the one to check - MF_BYPOSITION | flags) ) + start, // the first radio group item + end, // the last one + pos, // the one to check + MF_BYPOSITION) ) { wxLogLastError(_T("CheckMenuRadioItem")); } #endif // __WIN32__ // also uncheck all the other items in this radio group - wxMenuItemList::Node *node = items.Item(m_startRadioGroup); - for ( int n = m_startRadioGroup; n <= m_endRadioGroup && node; n++ ) + wxMenuItemList::Node *node = items.Item(start); + for ( int n = start; n <= end && node; n++ ) { if ( n != pos ) { @@ -235,7 +283,7 @@ void wxMenuItem::Check(bool check) { if ( ::CheckMenuItem(hmenu, GetRealId(), - MF_BYCOMMAND | flags) == -1 ) + MF_BYCOMMAND | flags) == (DWORD)-1 ) { wxLogLastError(wxT("CheckMenuItem")); }