commit e7e75f97f8a93f592be7f618d9f0cd42a81236fd
author Sandro Martini <smartini@apache.org> Thu Mar 24 23:53:39 2011 +0000
committer Sandro Martini <smartini@apache.org> Thu Mar 24 23:53:39 2011 +0000
tree 54cbab89800452fe36e8fa342cd29d9ec7541670
parent 98a72c3a59a126489a2392d2065242026cd03d08

PIVOT-719

git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1085206 13f79535-47bb-0310-9956-ffa450edef68

wtk/src/org/apache/pivot/wtk/Keyboard.java

diff --git a/wtk/src/org/apache/pivot/wtk/Keyboard.java b/wtk/src/org/apache/pivot/wtk/Keyboard.java
index c45d577..21a2973 100644
--- a/wtk/src/org/apache/pivot/wtk/Keyboard.java
+++ b/wtk/src/org/apache/pivot/wtk/Keyboard.java
@@ -113,8 +113,13 @@
                 awtModifiers |= KeyEvent.SHIFT_DOWN_MASK;
             }
 
-            return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
-                + KeyEvent.getKeyText(keyCode);
+            if (awtModifiers != 0x00) {
+                return KeyEvent.getModifiersExText(awtModifiers) + Platform.getKeyStrokeModifierSeparator()
+                    + KeyEvent.getKeyText(keyCode);
+            }
+            else {
+                return KeyEvent.getKeyText(keyCode);
+            }
         }
 
         public static KeyStroke decode(String value) {
@@ -306,4 +311,3 @@
         return dropAction;
     }
 }
-

wtk/src/org/apache/pivot/wtk/Platform.java

diff --git a/wtk/src/org/apache/pivot/wtk/Platform.java b/wtk/src/org/apache/pivot/wtk/Platform.java
index b9119c0..5b29815 100644
--- a/wtk/src/org/apache/pivot/wtk/Platform.java
+++ b/wtk/src/org/apache/pivot/wtk/Platform.java
@@ -45,6 +45,10 @@
             COMMAND_MODIFIER = Modifier.META;
             WORD_NAVIGATION_MODIFIER = Modifier.ALT;
             KEYSTROKE_MODIFIER_SEPARATOR = "";
+        } else if (osName.startsWith("windows")) {
+            COMMAND_MODIFIER = Modifier.CTRL;
+            WORD_NAVIGATION_MODIFIER = Modifier.CTRL;
+            KEYSTROKE_MODIFIER_SEPARATOR = "+";
         } else {
             COMMAND_MODIFIER = Modifier.CTRL;
             WORD_NAVIGATION_MODIFIER = Modifier.CTRL;