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

making wxMSW MSLU(unicows)-friendly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-17 00:28:31 +00:00
parent e168b6acfd
commit eb5e4d9ac1
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/window.cpp
View File

@@ -968,11 +968,11 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
wxAssociateWinWithHandle(hwnd, this);
m_oldWndProc = (WXFARPROC)::GetWindowLong(hwnd, GWL_WNDPROC);
m_oldWndProc = (WXFARPROC)::GetWindowLong((HWND)hWnd, GWL_WNDPROC);
// we don't need to subclass the window of our own class (in the Windows
// sense of the word)
if ( (WXFARPROC) m_oldWndProc != (WXFARPROC) wxWndProc )
if ( !wxCheckWindowWndProc(hWnd, (WXFARPROC)wxWndProc) )
{
::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
}
@@ -997,8 +997,7 @@ void wxWindowMSW::UnsubclassWin()
if ( m_oldWndProc )
{
FARPROC wndProc = (FARPROC)::GetWindowLong(hwnd, GWL_WNDPROC);
if ( wndProc != (FARPROC) m_oldWndProc )
if ( !wxCheckWindowWndProc((WXHWND)hwnd, m_oldWndProc) )
{
::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) m_oldWndProc);
}
@@ -1008,6 +1007,35 @@ void wxWindowMSW::UnsubclassWin()
}
}
bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
{
#if wxUSE_UNICODE_MSLU
// VS: We can't use GetWindowLong(hwnd, GWL_WNDPROC) together with unicows.dll
// because it doesn't return pointer to the real wnd proc but rather a handle
// of a fake proc that does Unicode<->ANSI translation.
//
// The hack bellow works, because WNDCLASS contains original window handler
// rather that the unicows fake one. This may not be on purpose, though; if
// it stops working with future versions of unicows.dll, we can override
// unicows hooks by setting Unicows_{Set,Get}WindowLong and
// Unicows_RegisterClass to our own versions that keep track of
// fake<->real wnd proc mapping.
//
// FIXME: Doesn't handle wnd procs set by SetWindowLong, only these set
// with RegisterClass!!
static wxChar buffer[512];
WNDCLASS cls;
::GetClassName((HWND)hWnd, buffer, 512);
::GetClassInfo(wxGetInstance(), buffer, &cls);
return wndProc == (WXFARPROC)cls.lpfnWndProc;
#else
return wndProc == (WXFARPROC)::GetWindowLong((HWND)hWnd, GWL_WNDPROC);
#endif
}
// Make a Windows extended style from the given wxWindows window style
WXDWORD wxWindowMSW::MakeExtendedStyle(long style, bool eliminateBorders)
{