Use GetCursorPos on WinCE wherever possible (otherwise the wrong

cursor is shown)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 76b0b095edcad8f4aec147100b9e20eec079d463..11937618438adce72cdf2843101c3f2e60b43308 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -223,9 +223,12 @@ static void EnsureParentHasControlParentStyle(wxWindow *parent)
 // instead
 bool GetCursorPosWinCE(POINT* pt)
 {
-    DWORD pos = GetMessagePos();
-    pt->x = LOWORD(pos);
-    pt->y = HIWORD(pos);
+    if (!GetCursorPos(pt))
+    {
+        DWORD pos = GetMessagePos();
+        pt->x = LOWORD(pos);
+        pt->y = HIWORD(pos);
+    }
     return true;
 }
 #endif
@@ -3516,10 +3519,10 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
     // specific way (for example, depending on the current position)
     POINT pt;
 #ifdef __WXWINCE__
-    if ( !::GetCursorPosWinCE(&pt) )
+    if ( !::GetCursorPosWinCE(&pt))
 #else
     if ( !::GetCursorPos(&pt) )
-#endif
+#endif        
     {
         wxLogLastError(wxT("GetCursorPos"));
     }