X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be15b995df23c3ca511098676fbdc872f59add80..217c78b80b34f31b4341d6257e28077255d6eb93:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index f69a0a01f9..aae20373f7 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -89,7 +89,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, wxMenu *pSubMenu) : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK) + , wxOwnerDrawn(text, kind == wxITEM_CHECK) #endif // owner drawn { Init(); @@ -104,7 +104,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu, : wxMenuItemBase(parentMenu, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) #if wxUSE_OWNER_DRAWN - , wxOwnerDrawn(GetLabelFromText(text), isCheckable) + , wxOwnerDrawn(text, isCheckable) #endif // owner drawn { Init(); @@ -255,7 +255,7 @@ void wxMenuItem::Check(bool check) start, // the first radio group item end, // the last one pos, // the one to check - MF_BYPOSITION | flags) ) + MF_BYPOSITION) ) { wxLogLastError(_T("CheckMenuRadioItem")); } @@ -283,7 +283,7 @@ void wxMenuItem::Check(bool check) { if ( ::CheckMenuItem(hmenu, GetRealId(), - MF_BYCOMMAND | flags) == -1 ) + MF_BYCOMMAND | flags) == (DWORD)-1 ) { wxLogLastError(wxT("CheckMenuItem")); }