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

Remove support for Win9x from wxMSW.

Browse Source 
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-16 02:33:40 +00:00
parent e3c2531b4c
commit 0d4ad161d5
1036 changed files with 12134 additions and 16801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/msw/window.cpp
View File

@@ -2237,18 +2237,10 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
#if defined(__WXWINCE__)
static const UINT flags = 0;
#else // !__WXWINCE__
UINT flags = TPM_RIGHTBUTTON;
// NT4 doesn't support TPM_RECURSE and simply doesn't show the menu at all
// when it's use, I'm not sure about Win95/98 but prefer to err on the safe
// side and not to use it there neither -- modify the test if it does work
// on these systems
if ( wxGetWinVersion() >= wxWinVersion_5 )
{
// using TPM_RECURSE allows us to show a popup menu while another menu
// is opened which can be useful and is supported by the other
// platforms, so allow it under Windows too
flags |= TPM_RECURSE;
}
// using TPM_RECURSE allows us to show a popup menu while another menu
// is opened which can be useful and is supported by the other
// platforms, so allow it under Windows too
UINT flags = TPM_RIGHTBUTTON | TPM_RECURSE;
#endif // __WXWINCE__/!__WXWINCE__
::TrackPopupMenu(GetHmenuOf(menu), flags, pt.x, pt.y, 0, GetHwnd(), NULL);
@@ -3054,19 +3046,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
processed = HandleNotify((int)wParam, lParam, &rc.result);
break;
// we only need to reply to WM_NOTIFYFORMAT manually when using MSLU,
// otherwise DefWindowProc() does it perfectly fine for us, but MSLU
// apparently doesn't always behave properly and needs some help
#if wxUSE_UNICODE_MSLU && defined(NF_QUERY)
case WM_NOTIFYFORMAT:
if ( lParam == NF_QUERY )
{
processed = true;
rc.result = NFR_UNICODE;
}
break;
#endif // wxUSE_UNICODE_MSLU
// for these messages we must return true if process the message
#ifdef WM_DRAWITEM
case WM_DRAWITEM: