AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-03-25 23:28:34 +00:00
parent c0b3964149
commit 50b39f8ffe
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/os2/menuitem.cpp
View File

@ -115,7 +115,7 @@ wxMenuItem::wxMenuItem(
)
: wxMenuItemBase( pParentMenu
,nId
,rsText
,TextToLabel(rsText)
,rsHelp
,eKind
,pSubMenu
@ -141,7 +141,7 @@ wxMenuItem::wxMenuItem(
)
: wxMenuItemBase( pParentMenu
,nId
,rsText
,TextToLabel(rsText)
,rsHelp
,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL
,pSubMenu
@ -302,7 +302,7 @@ void wxMenuItem::Check(
if (m_isChecked == bCheck)
return;
HMENU hMenu = GetHMenuOf(m_parentMenu);
HMENU hMenu = GetHmenuOf(m_parentMenu);
if ( GetKind() == wxITEM_RADIO )
{
@ -376,13 +376,13 @@ void wxMenuItem::Check(
else // check item
{
if (bCheck)
bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
bOk = (bool)::WinSendMsg( hMenu
,MM_SETITEMATTR
,MPFROM2SHORT(GetRealId(), TRUE)
,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
);
else
bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
bOk = (bool)::WinSendMsg( hMenu
,MM_SETITEMATTR
,MPFROM2SHORT(GetRealId(), TRUE)
,MPFROM2SHORT(MIA_CHECKED, FALSE)
@ -403,14 +403,14 @@ void wxMenuItem::SetText(
// Don't do anything if label didn't change
//
wxString Text = TextToLabel(rText);
if (m_text == Text)
wxString sText = TextToLabel(rText);
if (m_text == sText)
return;
wxMenuItemBase::SetText(Text);
OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text));
wxMenuItemBase::SetText(sText);
OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText));
HWND hMenu = GetHMenuOf(m_parentMenu);
HWND hMenu = GetHmenuOf(m_parentMenu);
wxCHECK_RET(hMenu, wxT("menuitem without menu"));
@ -450,7 +450,7 @@ void wxMenuItem::SetText(
#endif //owner drawn
{
uFlagsOld |= MIS_TEXT;
pData = (BYTE*)Text.c_str();
pData = (BYTE*)sText.c_str();
}
//