X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..aa2444bd9ef48c616e0f518722aa447a1c062d32:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index cc55d41996..d1815b969d 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -176,7 +176,7 @@ void wxMenuItem::Init() SetMarginWidth(GetMarginWidth()); // tell the owner drawing code to show the accel string as well - SetAccelString(m_text.AfterFirst(_T('\t'))); + SetAccelString(m_text.AfterFirst(wxT('\t'))); #endif // wxUSE_OWNER_DRAWN } @@ -203,12 +203,20 @@ WXWPARAM wxMenuItem::GetMSWId() const bool wxMenuItem::IsChecked() const { - // fix that RTTI is always getting the correct state (separators cannot be checked, but the call below - // returns true + // fix that RTTI is always getting the correct state (separators cannot be + // checked, but the Windows call below returns true if ( IsSeparator() ) - return false ; + return false; - int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetMSWId(), MF_BYCOMMAND); + // the item might not be attached to a menu yet + // + // TODO: shouldn't we just always call the base class version? It seems + // like it ought to always be in sync + if ( !m_parentMenu ) + return wxMenuItemBase::IsChecked(); + + HMENU hmenu = GetHMenuOf(m_parentMenu); + int flag = ::GetMenuState(hmenu, GetMSWId(), MF_BYCOMMAND); return (flag & MF_CHECKED) != 0; } @@ -224,7 +232,7 @@ void wxMenuItem::SetAsRadioGroupStart() void wxMenuItem::SetRadioGroupStart(int start) { wxASSERT_MSG( !m_isRadioGroupStart, - _T("should only be called for the next radio items") ); + wxT("should only be called for the next radio items") ); m_radioGroup.start = start; } @@ -232,7 +240,7 @@ void wxMenuItem::SetRadioGroupStart(int start) void wxMenuItem::SetRadioGroupEnd(int end) { wxASSERT_MSG( m_isRadioGroupStart, - _T("should only be called for the first radio item") ); + wxT("should only be called for the first radio item") ); m_radioGroup.end = end; } @@ -245,13 +253,17 @@ void wxMenuItem::Enable(bool enable) if ( m_isEnabled == enable ) return; - long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), - GetMSWId(), - MF_BYCOMMAND | - (enable ? MF_ENABLED : MF_GRAYED)); + if ( m_parentMenu ) + { + long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), + GetMSWId(), + MF_BYCOMMAND | + (enable ? MF_ENABLED : MF_GRAYED)); - if ( rc == -1 ) { - wxLogLastError(wxT("EnableMenuItem")); + if ( rc == -1 ) + { + wxLogLastError(wxT("EnableMenuItem")); + } } wxMenuItemBase::Enable(enable); @@ -264,74 +276,78 @@ void wxMenuItem::Check(bool check) if ( m_isChecked == check ) return; - int flags = check ? MF_CHECKED : MF_UNCHECKED; - HMENU hmenu = GetHMenuOf(m_parentMenu); - - if ( GetKind() == wxITEM_RADIO ) + if ( m_parentMenu ) { - // it doesn't make sense to uncheck a radio item - what would this do? - if ( !check ) - return; + int flags = check ? MF_CHECKED : MF_UNCHECKED; + HMENU hmenu = GetHMenuOf(m_parentMenu); - // 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 + if ( GetKind() == wxITEM_RADIO ) { - // get the radio group end from the start item - start = m_radioGroup.start; - end = items.Item(start)->GetData()->m_radioGroup.end; - } + // it doesn't make sense to uncheck a radio item -- what would this + // do? + 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, + wxT("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, - start, // the first radio group item - end, // the last one - pos, // the one to check - MF_BYPOSITION) ) - { - wxLogLastError(_T("CheckMenuRadioItem")); - } + // 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, + wxT("invalid ::CheckMenuRadioItem() parameter(s)") ); + + if ( !::CheckMenuRadioItem(hmenu, + start, // the first radio group item + end, // the last one + pos, // the one to check + MF_BYPOSITION) ) + { + wxLogLastError(wxT("CheckMenuRadioItem")); + } #endif // __WIN32__ - // also uncheck all the other items in this radio group - wxMenuItemList::compatibility_iterator node = items.Item(start); - for ( int n = start; n <= end && node; n++ ) - { - if ( n != pos ) + // also uncheck all the other items in this radio group + wxMenuItemList::compatibility_iterator node = items.Item(start); + for ( int n = start; n <= end && node; n++ ) { - node->GetData()->m_isChecked = false; - } + if ( n != pos ) + { + node->GetData()->m_isChecked = false; + } - node = node->GetNext(); + node = node->GetNext(); + } } - } - else // check item - { - if ( ::CheckMenuItem(hmenu, - GetMSWId(), - MF_BYCOMMAND | flags) == (DWORD)-1 ) + else // check item { - wxFAIL_MSG( _T("CheckMenuItem() failed, item not in the menu?") ); + if ( ::CheckMenuItem(hmenu, + GetMSWId(), + MF_BYCOMMAND | flags) == (DWORD)-1 ) + { + wxFAIL_MSG(wxT("CheckMenuItem() failed, item not in the menu?")); + } } } @@ -355,72 +371,62 @@ void wxMenuItem::SetItemLabel(const wxString& txt) OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(m_text) ); #if wxUSE_OWNER_DRAWN // tell the owner drawing code to to show the accel string as well - SetAccelString(m_text.AfterFirst(_T('\t'))); + SetAccelString(m_text.AfterFirst(wxT('\t'))); #endif - HMENU hMenu = GetHMenuOf(m_parentMenu); - wxCHECK_RET( hMenu, wxT("menuitem without menu") ); + // the item can be not attached to any menu yet and SetItemLabel() is still + // valid to call in this case and should do nothing else + if ( !m_parentMenu ) + return; #if wxUSE_ACCEL m_parentMenu->UpdateAccel(this); #endif // wxUSE_ACCEL - UINT id = GetMSWId(); - UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); - if ( flagsOld == 0xFFFFFFFF ) + const UINT id = GetMSWId(); + HMENU hMenu = GetHMenuOf(m_parentMenu); + if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 ) + return; + +#if wxUSE_OWNER_DRAWN + if ( IsOwnerDrawn() ) { - // It's not an error, it means that the menu item doesn't exist - //wxLogLastError(wxT("GetMenuState")); + // we don't need to do anything for owner drawn items, they will redraw + // themselves using the new text the next time they're displayed + return; } +#endif // owner drawn + + // update the text of the native menu item + WinStruct info; + + // surprisingly, calling SetMenuItemInfo() with just MIIM_STRING doesn't + // work as it resets the menu bitmap, so we need to first get the old item + // state and then modify it + const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95; + info.fMask = MIIM_STATE | + MIIM_ID | + MIIM_SUBMENU | + MIIM_CHECKMARKS | + MIIM_DATA; + if ( isLaterThanWin95 ) + info.fMask |= MIIM_BITMAP | MIIM_FTYPE; else + info.fMask |= MIIM_TYPE; + if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) ) { - if ( IsSubMenu() ) - { - // high byte contains the number of items in a submenu for submenus - flagsOld &= 0xFF; - flagsOld |= MF_POPUP; - } - - LPCTSTR data; - -#if wxUSE_OWNER_DRAWN - if ( IsOwnerDrawn() ) - { - flagsOld |= MF_OWNERDRAW; - data = (LPCTSTR)this; - } - else -#endif //owner drawn - { - flagsOld |= MF_STRING; - data = (wxChar*) m_text.wx_str(); - } + wxLogLastError(wxT("GetMenuItemInfo")); + return; + } -#ifdef __WXWINCE__ - // FIXME: complete this, applying the old - // flags. - // However, the WinCE doc for SetMenuItemInfo - // says that you can't use it to set the menu - // item state; only data, id and type. - MENUITEMINFO info; - wxZeroMemory(info); - info.cbSize = sizeof(info); - info.fMask = MIIM_TYPE; - info.fType = MFT_STRING; - info.cch = m_text.length(); - info.dwTypeData = (LPTSTR) data ; - if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) ) - { - wxLogLastError(wxT("SetMenuItemInfo")); - } -#else - if ( ::ModifyMenu(hMenu, id, - MF_BYCOMMAND | flagsOld, - id, data) == (int)0xFFFFFFFF ) - { - wxLogLastError(wxT("ModifyMenu")); - } -#endif + if ( isLaterThanWin95 ) + info.fMask |= MIIM_STRING; + //else: MIIM_TYPE already specified + info.dwTypeData = (LPTSTR)m_text.wx_str(); + info.cch = m_text.length(); + if ( !::SetMenuItemInfo(hMenu, id, FALSE, &info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); } }