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

check for m_parentMenu being NULL in IsChecked/Checked/Enable() too (closes #10460)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-01 12:30:27 +00:00
parent 64894596ea
commit 654c223bc7
1 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/msw/menuitem.cpp
View File

@@ -203,12 +203,20 @@ WXWPARAM wxMenuItem::GetMSWId() const
bool wxMenuItem::IsChecked() const bool wxMenuItem::IsChecked() const
{ {
// fix that RTTI is always getting the correct state (separators cannot be checked, but the call below // fix that RTTI is always getting the correct state (separators cannot be
// returns true // checked, but the Windows call below returns true
if ( IsSeparator() ) 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; return (flag & MF_CHECKED) != 0;
} }
@@ -245,14 +253,18 @@ void wxMenuItem::Enable(bool enable)
if ( m_isEnabled == enable ) if ( m_isEnabled == enable )
return; return;
if ( m_parentMenu )
{
long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
GetMSWId(), GetMSWId(),
MF_BYCOMMAND | MF_BYCOMMAND |
(enable ? MF_ENABLED : MF_GRAYED)); (enable ? MF_ENABLED : MF_GRAYED));
if ( rc == -1 ) { if ( rc == -1 )
{
wxLogLastError(wxT("EnableMenuItem")); wxLogLastError(wxT("EnableMenuItem"));
} }
}
wxMenuItemBase::Enable(enable); wxMenuItemBase::Enable(enable);
} }
@@ -264,12 +276,15 @@ void wxMenuItem::Check(bool check)
if ( m_isChecked == check ) if ( m_isChecked == check )
return; return;
if ( m_parentMenu )
{
int flags = check ? MF_CHECKED : MF_UNCHECKED; int flags = check ? MF_CHECKED : MF_UNCHECKED;
HMENU hmenu = GetHMenuOf(m_parentMenu); HMENU hmenu = GetHMenuOf(m_parentMenu);
if ( GetKind() == wxITEM_RADIO ) if ( GetKind() == wxITEM_RADIO )
{ {
// it doesn't make sense to uncheck a radio item - what would this do? // it doesn't make sense to uncheck a radio item -- what would this
// do?
if ( !check ) if ( !check )
return; return;
@@ -298,8 +313,8 @@ void wxMenuItem::Check(bool check)
#ifdef __WIN32__ #ifdef __WIN32__
// calling CheckMenuRadioItem() with such parameters hangs my system // calling CheckMenuRadioItem() with such parameters hangs my system
// (NT4 SP6) and I suspect this could happen to the others as well - so // (NT4 SP6) and I suspect this could happen to the others as well,
// don't do it! // so don't do it!
wxCHECK_RET( start != -1 && end != -1, wxCHECK_RET( start != -1 && end != -1,
_T("invalid ::CheckMenuRadioItem() parameter(s)") ); _T("invalid ::CheckMenuRadioItem() parameter(s)") );
@@ -334,6 +349,7 @@ void wxMenuItem::Check(bool check)
wxFAIL_MSG(_T("CheckMenuItem() failed, item not in the menu?")); wxFAIL_MSG(_T("CheckMenuItem() failed, item not in the menu?"));
} }
} }
}
wxMenuItemBase::Check(check); wxMenuItemBase::Check(check);
} }
@@ -358,16 +374,15 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
SetAccelString(m_text.AfterFirst(_T('\t'))); SetAccelString(m_text.AfterFirst(_T('\t')));
#endif #endif
#if wxUSE_ACCEL
if ( m_parentMenu )
m_parentMenu->UpdateAccel(this);
#endif // wxUSE_ACCEL
// the item can be not attached to any menu yet and SetItemLabel() is still // 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 // valid to call in this case and should do nothing else
if ( !m_parentMenu ) if ( !m_parentMenu )
return; return;
#if wxUSE_ACCEL
m_parentMenu->UpdateAccel(this);
#endif // wxUSE_ACCEL
const UINT id = GetMSWId(); const UINT id = GetMSWId();
HMENU hMenu = GetHMenuOf(m_parentMenu); HMENU hMenu = GetHMenuOf(m_parentMenu);
if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 ) if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )