// ----
// return the id for calling Win32 API functions
-int wxMenuItem::GetRealId() const
+unsigned wxMenuItem::GetMSWId() const
{
- return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
+ // we must use ids in unsigned short range with Windows functions, if we
+ // pass ids > USHRT_MAX to them they get very confused (e.g. start
+ // generating WM_COMMAND messages with negative high word of wParam), so
+ // use the cast to ensure the id is in range
+ return m_subMenu ? wx_reinterpret_cast(unsigned, m_subMenu->GetHMenu())
+ : wx_static_cast(unsigned short, GetId());
}
// get item state
if ( GetId() == wxID_SEPARATOR )
return false ;
- int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
+ int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetMSWId(), MF_BYCOMMAND);
return (flag & MF_CHECKED) != 0;
}
/* static */
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
return wxStripMenuCodes(text);
}
return;
long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
- GetRealId(),
+ GetMSWId(),
MF_BYCOMMAND |
(enable ? MF_ENABLED : MF_GRAYED));
else // check item
{
if ( ::CheckMenuItem(hmenu,
- GetRealId(),
+ GetMSWId(),
MF_BYCOMMAND | flags) == (DWORD)-1 )
{
wxFAIL_MSG( _T("CheckMenuItem() failed, item not in the menu?") );
wxMenuItemBase::Check(check);
}
-void wxMenuItem::SetText(const wxString& txt)
+void wxMenuItem::SetItemLabel(const wxString& txt)
{
wxString text = txt;
return;
// wxMenuItemBase will do stock ID checks
- wxMenuItemBase::SetText(text);
+ wxMenuItemBase::SetItemLabel(text);
// m_text could now be different from 'text' if we are a stock menu item,
// so use only m_text below
m_parentMenu->UpdateAccel(this);
#endif // wxUSE_ACCEL
- UINT id = GetRealId();
+ UINT id = GetMSWId();
UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
if ( flagsOld == 0xFFFFFFFF )
{
#endif //owner drawn
{
flagsOld |= MF_STRING;
- data = (wxChar*) m_text.c_str();
+ data = (wxChar*) m_text.wx_str();
}
#ifdef __WXWINCE__