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

wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-21 17:00:07 +00:00
parent 7a893a3152
commit 6670f56440
56 changed files with 1547 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/os2/menuitem.cpp
View File

@@ -175,13 +175,13 @@ int wxMenuItem::GetRealId() const
// --------------
bool wxMenuItem::IsChecked() const
{
USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
,MM_QUERYITEMATTR
,MPFROM2SHORT(GetId(), TRUE)
,MPFROMSHORT(MIA_CHECKED)
));
USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu)
,MM_QUERYITEMATTR
,MPFROM2SHORT(GetId(), TRUE)
,MPFROMSHORT(MIA_CHECKED)
));
return (uFlag & MIA_CHECKED);
return (uFlag & MIA_CHECKED) == MIA_CHECKED ;
} // end of wxMenuItem::IsChecked
wxString wxMenuItemBase::GetLabelFromText(
@@ -211,7 +211,7 @@ wxString wxMenuItemBase::GetLabelFromText(
//
void wxMenuItem::SetAsRadioGroupStart()
{
m_bIsRadioGroupStart = TRUE;
m_bIsRadioGroupStart = true;
} // end of wxMenuItem::SetAsRadioGroupStart
void wxMenuItem::SetRadioGroupStart(
@@ -367,9 +367,7 @@ void wxMenuItem::Check(
wxMenuItemBase::Check(bCheck);
} // end of wxMenuItem::Check
void wxMenuItem::SetText(
const wxString& rText
)
void wxMenuItem::SetText( const wxString& rText )
{
//
// Don't do anything if label didn't change
@@ -393,9 +391,9 @@ void wxMenuItem::SetText(
m_parentMenu->UpdateAccel(this);
#endif // wxUSE_ACCEL
USHORT uId = GetRealId();
MENUITEM vItem;
USHORT uFlagsOld;
USHORT uId = (USHORT)GetRealId();
MENUITEM vItem;
USHORT uFlagsOld;
if (!::WinSendMsg( hMenu
,MM_QUERYITEM
@@ -483,4 +481,3 @@ wxMenuItem* wxMenuItemBase::New(
,pSubMenu
);
} // end of wxMenuItemBase::New