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

load _TrackMouseEvent dynamically to make it possible to run wx programs on systems with comctl32.dll 4.70 (closes 1215615)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-21 15:37:55 +00:00
parent f2346d3fd6
commit aafb997862
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/msw/window.cpp
View File

@@ -93,6 +93,7 @@
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/listctrl.h" #include "wx/listctrl.h"
#include "wx/dynlib.h"
#include <string.h> #include <string.h>
@@ -119,7 +120,7 @@
#endif #endif
#endif #endif
#if defined(TME_LEAVE) && defined(WM_MOUSELEAVE) #if defined(TME_LEAVE) && defined(WM_MOUSELEAVE) && wxUSE_DYNLIB_CLASS
#define HAVE_TRACKMOUSEEVENT #define HAVE_TRACKMOUSEEVENT
#endif // everything needed for TrackMouseEvent() #endif // everything needed for TrackMouseEvent()
@@ -2644,7 +2645,8 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
#ifdef HAVE_TRACKMOUSEEVENT #ifdef HAVE_TRACKMOUSEEVENT
case WM_MOUSELEAVE: case WM_MOUSELEAVE:
// filter out excess WM_MOUSELEAVE events sent after PopupMenu() (on XP at least) // filter out excess WM_MOUSELEAVE events sent after PopupMenu()
// (on XP at least)
if ( m_mouseInWindow ) if ( m_mouseInWindow )
{ {
GenerateMouseLeave(); GenerateMouseLeave();
@@ -4932,14 +4934,41 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
m_mouseInWindow = true; m_mouseInWindow = true;
#ifdef HAVE_TRACKMOUSEEVENT #ifdef HAVE_TRACKMOUSEEVENT
typedef BOOL (WINAPI *_TrackMouseEvent_t)(LPTRACKMOUSEEVENT);
#ifdef __WXWINCE__
static const _TrackMouseEvent_t
s_pfn_TrackMouseEvent = _TrackMouseEvent;
#else // !__WXWINCE__
static _TrackMouseEvent_t s_pfn_TrackMouseEvent;
static bool s_initDone = false;
if ( !s_initDone )
{
wxLogNull noLog;
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
if ( dllComCtl32.IsLoaded() )
{
s_pfn_TrackMouseEvent = (_TrackMouseEvent_t)
dllComCtl32.GetSymbol(_T("_TrackMouseEvent"));
}
s_initDone = true;
// notice that it's ok to unload comctl32.dll here as it won't
// be really unloaded, being still in use because we link to it
// statically too
}
if ( s_pfn_TrackMouseEvent )
#endif // __WXWINCE__/!__WXWINCE__
{
WinStruct<TRACKMOUSEEVENT> trackinfo; WinStruct<TRACKMOUSEEVENT> trackinfo;
trackinfo.dwFlags = TME_LEAVE; trackinfo.dwFlags = TME_LEAVE;
trackinfo.hwndTrack = GetHwnd(); trackinfo.hwndTrack = GetHwnd();
// Use the commctrl.h _TrackMouseEvent(), which will call the real (*s_pfn_TrackMouseEvent)(&trackinfo);
// TrackMouseEvent() if available or emulate it }
_TrackMouseEvent(&trackinfo);
#endif // HAVE_TRACKMOUSEEVENT #endif // HAVE_TRACKMOUSEEVENT
wxMouseEvent event(wxEVT_ENTER_WINDOW); wxMouseEvent event(wxEVT_ENTER_WINDOW);
@@ -4949,7 +4978,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
} }
} }
#ifdef HAVE_TRACKMOUSEEVENT #ifdef HAVE_TRACKMOUSEEVENT
else else // mouse not in window
{ {
// Check if we need to send a LEAVE event // Check if we need to send a LEAVE event
// Windows doesn't send WM_MOUSELEAVE if the mouse has been captured so // Windows doesn't send WM_MOUSELEAVE if the mouse has been captured so