Added/Fixed some things in wxGetKeyState

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index bfb79581381851d4498cd01c55e856c832177f57..465ef52384bb67b0a455df99ddba542c92ac9c58 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -1762,6 +1762,7 @@ int wxKeyCodeToMacModifier(wxKeyCode key)
     switch (key)
     {
     case WXK_START:
     switch (key)
     {
     case WXK_START:

+    case WXK_MENU:

         return cmdKey;
 
     case WXK_SHIFT:
         return cmdKey;
 
     case WXK_SHIFT:


@@ -1770,8 +1771,8 @@ int wxKeyCodeToMacModifier(wxKeyCode key)
     case WXK_CAPITAL:
         return alphaLock;
 
     case WXK_CAPITAL:
         return alphaLock;
 

-//    case WXK_OPTION:
-//        return optionKey;
+    case WXK_ALT:
+        return optionKey;

 
     case WXK_CONTROL:
         return controlKey;
 
     case WXK_CONTROL:
         return controlKey;

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index bfb79581381851d4498cd01c55e856c832177f57..465ef52384bb67b0a455df99ddba542c92ac9c58 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1762,6 +1762,7 @@ int wxKeyCodeToMacModifier(wxKeyCode key)
     switch (key)
     {
     case WXK_START:
     switch (key)
     {
     case WXK_START:

+    case WXK_MENU:

         return cmdKey;
 
     case WXK_SHIFT:
         return cmdKey;
 
     case WXK_SHIFT:


@@ -1770,8 +1771,8 @@ int wxKeyCodeToMacModifier(wxKeyCode key)
     case WXK_CAPITAL:
         return alphaLock;
 
     case WXK_CAPITAL:
         return alphaLock;
 

-//    case WXK_OPTION:
-//        return optionKey;
+    case WXK_ALT:
+        return optionKey;

 
     case WXK_CONTROL:
         return controlKey;
 
     case WXK_CONTROL:
         return controlKey;