Add a helper wxApp::GetValidTraits() method.

[wxWidgets.git] / src / common / uiactioncmn.cpp

diff --git a/src/common/uiactioncmn.cpp b/src/common/uiactioncmn.cpp
index 90c5f4201b068110dbe85a10763778b426b20618..0df4aea34b54692b17e82ba16a4f8ef95b173437 100644 (file)
--- a/src/common/uiactioncmn.cpp
+++ b/src/common/uiactioncmn.cpp
@@ -25,6 +25,8 @@ bool wxUIActionSimulator::MouseClick(int button)
     return true;
 }
 
+#ifndef __WXOSX__
+
 bool wxUIActionSimulator::MouseDblClick(int button)
 {
     MouseDown(button);
@@ -35,18 +37,19 @@ bool wxUIActionSimulator::MouseDblClick(int button)
     return true;
 }
 
-bool
-wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
+bool wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
                                    int button)
 {
     MouseMove(x1, y1);
     MouseDown(button);
     MouseMove(x2, y2);
     MouseUp(button);
-
+    
     return true;
 }
 
+#endif
+
 bool
 wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
 {
@@ -83,43 +86,43 @@ bool wxUIActionSimulator::Char(int keycode, int modifiers)
     switch(keycode)
     {
     case '0':
-        keycode = WXK_NUMPAD0;
+        keycode = '0';
         break;
     case '1':
-        keycode = WXK_NUMPAD1;
+        keycode = '1';
         break;
     case '2':
-        keycode = WXK_NUMPAD2;
+        keycode = '2';
         break;
     case '3':
-        keycode = WXK_NUMPAD3;
+        keycode = '3';
         break;
     case '4':
-        keycode = WXK_NUMPAD4;
+        keycode = '4';
         break;
     case '5':
-        keycode = WXK_NUMPAD5;
+        keycode = '5';
         break;
     case '6':
-        keycode = WXK_NUMPAD6;
+        keycode = '6';
         break;
     case '7':
-        keycode = WXK_NUMPAD7;
+        keycode = '7';
         break;
     case '8':
-        keycode = WXK_NUMPAD8;
+        keycode = '8';
         break;
     case '9':
-        keycode = WXK_NUMPAD9;
+        keycode = '9';
         break;
     case '+':
-        keycode = WXK_NUMPAD_ADD;
+        keycode = '+';
         break;
     case '-':
-        keycode = WXK_NUMPAD_SUBTRACT;
+        keycode = '-';
         break;
     case '.':
-        keycode = WXK_NUMPAD_DECIMAL;
+        keycode = '.';
         break;
     default:
         break;