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

corrections after last commit, (see #10452 comment:6)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-31 21:53:03 +00:00
parent 180d62d808
commit d4290fa5b8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/menuitem.cpp
View File

@@ -383,11 +383,15 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
// work as it resets the menu bitmap, so we need to first get the old item // work as it resets the menu bitmap, so we need to first get the old item
// state and then modify it // state and then modify it
const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95; const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95;
info.fMask = MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA; info.fMask = MIIM_STATE |
MIIM_ID |
MIIM_SUBMENU |
MIIM_CHECKMARKS |
MIIM_DATA;
if ( isLaterThanWin95 ) if ( isLaterThanWin95 )
info.fMask |= MIIM_BITMAP | MIIM_FTYPE; info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
else else
info.fMask = MIIM_TYPE; info.fMask |= MIIM_TYPE;
if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) ) if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) )
{ {
wxLogLastError(wxT("GetMenuItemInfo")); wxLogLastError(wxT("GetMenuItemInfo"));