Fix typo in last commit

[wxWidgets.git] / src / msw / uiaction.cpp

diff --git a/src/msw/uiaction.cpp b/src/msw/uiaction.cpp
index d421b9a18f993515499029e3dd6f9f6e75c562e3..e8c7d94df88ed826f1ed7cf098b671e54e330b84 100644 (file)
--- a/src/msw/uiaction.cpp
+++ b/src/msw/uiaction.cpp
@@ -1,11 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/uiaction.cpp
 // Purpose:     wxUIActionSimulator implementation
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/uiaction.cpp
 // Purpose:     wxUIActionSimulator implementation

-// Author:      Kevin Ollivier
+// Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin

 // Modified by:
 // Created:     2010-03-06
 // Modified by:
 // Created:     2010-03-06

-// RCS-ID:      $Id: menu.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Kevin Ollivier
 // Copyright:   (c) Kevin Ollivier

+//              (c) 2010 Steven Lamerton
+//              (c) 2010 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,35 +16,36 @@
 #if wxUSE_UIACTIONSIMULATOR
 
 #include "wx/uiaction.h"
 #if wxUSE_UIACTIONSIMULATOR
 
 #include "wx/uiaction.h"

-

 #include "wx/msw/wrapwin.h"
 
 #include "wx/msw/wrapwin.h"
 

+#include "wx/msw/private/keyboard.h"
+
+#include "wx/math.h"
+
+namespace
+{
+

 DWORD EventTypeForMouseButton(int button, bool isDown)
 {
     switch (button)
     {
         case wxMOUSE_BTN_LEFT:
 DWORD EventTypeForMouseButton(int button, bool isDown)
 {
     switch (button)
     {
         case wxMOUSE_BTN_LEFT:

-            if (isDown)
-                return MOUSEEVENTF_LEFTDOWN;
-            else
-                return MOUSEEVENTF_LEFTUP;
+            return isDown ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_LEFTUP;
+

         case wxMOUSE_BTN_RIGHT:
         case wxMOUSE_BTN_RIGHT:

-            if (isDown)
-                return MOUSEEVENTF_RIGHTDOWN;
-            else
-                return MOUSEEVENTF_RIGHTUP;
+            return isDown ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_RIGHTUP;
+

         case wxMOUSE_BTN_MIDDLE:
         case wxMOUSE_BTN_MIDDLE:

-            if (isDown)
-                return MOUSEEVENTF_MIDDLEDOWN;
-            else
-                return MOUSEEVENTF_MIDDLEUP;
+            return isDown ? MOUSEEVENTF_MIDDLEDOWN : MOUSEEVENTF_MIDDLEUP;

 
         default:
             wxFAIL_MSG("Unsupported button passed in.");
 
         default:
             wxFAIL_MSG("Unsupported button passed in.");

-            return -1;
+            return (DWORD)-1;

     }
 }
 
     }
 }
 

+} // anonymous namespace
+

 bool wxUIActionSimulator::MouseDown(int button)
 {
     POINT p;
 bool wxUIActionSimulator::MouseDown(int button)
 {
     POINT p;


@@ -53,7 +56,15 @@ bool wxUIActionSimulator::MouseDown(int button)
 
 bool wxUIActionSimulator::MouseMove(long x, long y)
 {
 
 bool wxUIActionSimulator::MouseMove(long x, long y)
 {

-    mouse_event(MOUSEEVENTF_MOVE, x, y, 0, 0);
+    // Because MOUSEEVENTF_ABSOLUTE takes measurements scaled between 0 & 65535
+    // we need to scale our input too
+    int displayx, displayy;
+    wxDisplaySize(&displayx, &displayy);
+
+    int scaledx = wxRound(((float)x / displayx) * 65535);
+    int scaledy = wxRound(((float)y / displayy) * 65535);
+    mouse_event(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, scaledx, scaledy, 0, 0);
+

     return true;
 }
 
     return true;
 }
 


@@ -65,12 +76,20 @@ bool wxUIActionSimulator::MouseUp(int button)
     return true;
 }
 
     return true;
 }
 

-bool wxUIActionSimulator::Key(int keycode, bool isDown, bool shiftDown, bool cmdDown, bool altDown)
+bool
+wxUIActionSimulator::DoKey(int keycode, int WXUNUSED(modifiers), bool isDown)

 {
 {

+    bool isExtended;
+    DWORD vkkeycode = wxMSWKeyboard::WXToVK(keycode, &isExtended);
+

     DWORD flags = 0;
     DWORD flags = 0;

-    if (!isDown)
-        flags = KEYEVENTF_KEYUP;
-    keybd_event(keycode, 0, flags, 0);
+    if ( isExtended )
+        flags |= KEYEVENTF_EXTENDEDKEY;
+    if ( !isDown )
+        flags |= KEYEVENTF_KEYUP;
+
+    keybd_event(vkkeycode, 0, flags, 0);
+

     return true;
 }
 
     return true;
 }