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

GetCursorPos returns an error on WinCE, so use GetMessagePos instead.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-13 15:32:41 +00:00
parent 822b9009d7
commit f23255165e
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/msw/window.cpp
View File

@@ -218,6 +218,18 @@ static void EnsureParentHasControlParentStyle(wxWindow *parent)
#endif // !__WXWINCE__ #endif // !__WXWINCE__
#ifdef __WXWINCE__
// On Windows CE, GetCursorPos can return an error, so use this function
// instead
bool GetCursorPosWinCE(POINT* pt)
{
DWORD pos = GetMessagePos();
pt->x = LOWORD(pos);
pt->y = HIWORD(pos);
return true;
}
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// event tables // event tables
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -757,7 +769,11 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor)
// Change the cursor NOW if we're within the correct window // Change the cursor NOW if we're within the correct window
POINT point; POINT point;
#ifdef __WXWINCE__
::GetCursorPosWinCE(&point);
#else
::GetCursorPos(&point); ::GetCursorPos(&point);
#endif
RECT rect = wxGetWindowRect(hWnd); RECT rect = wxGetWindowRect(hWnd);
@@ -1235,7 +1251,11 @@ bool wxWindowMSW::IsMouseInWindow() const
{ {
// get the mouse position // get the mouse position
POINT pt; POINT pt;
#ifdef __WXWINCE__
::GetCursorPosWinCE(&pt);
#else
::GetCursorPos(&pt); ::GetCursorPos(&pt);
#endif
// find the window which currently has the cursor and go up the window // find the window which currently has the cursor and go up the window
// chain until we find this window - or exhaust it // chain until we find this window - or exhaust it
@@ -3490,7 +3510,11 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
// first ask the user code - it may wish to set the cursor in some very // first ask the user code - it may wish to set the cursor in some very
// specific way (for example, depending on the current position) // specific way (for example, depending on the current position)
POINT pt; POINT pt;
#ifdef __WXWINCE__
if ( !::GetCursorPosWinCE(&pt) )
#else
if ( !::GetCursorPos(&pt) ) if ( !::GetCursorPos(&pt) )
#endif
{ {
wxLogLastError(wxT("GetCursorPos")); wxLogLastError(wxT("GetCursorPos"));
} }
@@ -4529,7 +4553,11 @@ void wxWindowMSW::GenerateMouseLeave()
state |= MK_RBUTTON; state |= MK_RBUTTON;
POINT pt; POINT pt;
#ifdef __WXWINCE__
if ( !::GetCursorPosWinCE(&pt) )
#else
if ( !::GetCursorPos(&pt) ) if ( !::GetCursorPos(&pt) )
#endif
{ {
wxLogLastError(_T("GetCursorPos")); wxLogLastError(_T("GetCursorPos"));
} }
@@ -4576,7 +4604,11 @@ wxKeyEvent wxWindowMSW::CreateKeyEvent(wxEventType evType,
// translate the position to client coords // translate the position to client coords
POINT pt; POINT pt;
#ifdef __WXWINCE__
GetCursorPosWinCE(&pt);
#else
GetCursorPos(&pt); GetCursorPos(&pt);
#endif
RECT rect; RECT rect;
GetWindowRect(GetHwnd(),&rect); GetWindowRect(GetHwnd(),&rect);
pt.x -= rect.left; pt.x -= rect.left;
@@ -5797,7 +5829,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
wxPoint wxGetMousePosition() wxPoint wxGetMousePosition()
{ {
POINT pt; POINT pt;
#ifdef __WXWINCE__
GetCursorPosWinCE(&pt);
#else
GetCursorPos( & pt ); GetCursorPos( & pt );
#endif
return wxPoint(pt.x, pt.y); return wxPoint(pt.x, pt.y);
} }