From 3a02672de8f6d1bdf9588f27be0113baf9d76f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 24 Feb 2017 16:36:46 +0200 Subject: [PATCH] Use MIIM_FTYPE rather than MIIM_TYPE in wxMSW There is no need to use the old symbol any more now that we don't support Windows 9x any longer. --- src/msw/window.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index dcb92c885a..7534a69cb0 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5685,19 +5685,13 @@ int wxWindowMSW::HandleMenuChar(int chAccel, WinStruct mii; - // we could use MIIM_FTYPE here as we only need to know if the item is - // ownerdrawn or not and not dwTypeData which MIIM_TYPE also returns, but - // MIIM_FTYPE is not supported under Win95 - mii.fMask = MIIM_TYPE | MIIM_DATA; + // use MIIM_FTYPE to know if the item is ownerdrawn or not + mii.fMask = MIIM_FTYPE | MIIM_DATA; // find if we have this letter in any owner drawn item const int count = ::GetMenuItemCount(hmenu); for ( int i = 0; i < count; i++ ) { - // previous loop iteration could modify it, reset it back before - // calling GetMenuItemInfo() to prevent it from overflowing dwTypeData - mii.cch = 0; - if ( ::GetMenuItemInfo(hmenu, i, TRUE, &mii) ) { if ( mii.fType == MFT_OWNERDRAW )