diff --git a/docs/latex/wx/keycode.tex b/docs/latex/wx/keycode.tex
index 9b39ab66e5..08f4f2ac5f 100644
--- a/docs/latex/wx/keycode.tex
+++ b/docs/latex/wx/keycode.tex
@@ -1,84 +1,119 @@
 \section{Keycodes}\label{keycodes}
 
-Keypresses are represented by an enumerated type, wxKeyCode. The possible values
-are the ASCII character codes, plus the following:
+Keypresses are represented by an enumerated type, wxKeyCode. The possible
+values are the ASCII character codes, plus the following:
 
 {\small
 \begin{verbatim}
- WXK_BACK    = 8
- WXK_TAB     = 9
- WXK_RETURN  = 13
- WXK_ESCAPE  = 27
- WXK_SPACE   = 32
- WXK_DELETE  = 127
+    WXK_BACK    = 8
+    WXK_TAB     = 9
+    WXK_RETURN  = 13
+    WXK_ESCAPE  = 27
+    WXK_SPACE   = 32
+    WXK_DELETE  = 127
 
- WXK_START   = 300
- WXK_LBUTTON
- WXK_RBUTTON
- WXK_CANCEL
- WXK_MBUTTON
- WXK_CLEAR
- WXK_SHIFT
- WXK_CONTROL
- WXK_MENU
- WXK_PAUSE
- WXK_CAPITAL
- WXK_PRIOR
- WXK_NEXT
- WXK_END
- WXK_HOME
- WXK_LEFT
- WXK_UP
- WXK_RIGHT
- WXK_DOWN
- WXK_SELECT
- WXK_PRINT
- WXK_EXECUTE
- WXK_SNAPSHOT
- WXK_INSERT
- WXK_HELP
- WXK_NUMPAD0
- WXK_NUMPAD1
- WXK_NUMPAD2
- WXK_NUMPAD3
- WXK_NUMPAD4
- WXK_NUMPAD5
- WXK_NUMPAD6
- WXK_NUMPAD7
- WXK_NUMPAD8
- WXK_NUMPAD9
- WXK_MULTIPLY
- WXK_ADD
- WXK_SEPARATOR
- WXK_SUBTRACT
- WXK_DECIMAL
- WXK_DIVIDE
- WXK_F1
- WXK_F2
- WXK_F3
- WXK_F4
- WXK_F5
- WXK_F6
- WXK_F7
- WXK_F8
- WXK_F9
- WXK_F10
- WXK_F11
- WXK_F12
- WXK_F13
- WXK_F14
- WXK_F15
- WXK_F16
- WXK_F17
- WXK_F18
- WXK_F19
- WXK_F20
- WXK_F21
- WXK_F22
- WXK_F23
- WXK_F24
- WXK_NUMLOCK
- WXK_SCROLL 
+    WXK_START   = 300
+    WXK_LBUTTON
+    WXK_RBUTTON
+    WXK_CANCEL
+    WXK_MBUTTON
+    WXK_CLEAR
+    WXK_SHIFT
+    WXK_CONTROL
+    WXK_MENU
+    WXK_PAUSE
+    WXK_CAPITAL
+    WXK_PRIOR
+    WXK_NEXT
+    WXK_END
+    WXK_HOME
+    WXK_LEFT
+    WXK_UP
+    WXK_RIGHT
+    WXK_DOWN
+    WXK_SELECT
+    WXK_PRINT
+    WXK_EXECUTE
+    WXK_SNAPSHOT
+    WXK_INSERT
+    WXK_HELP
+    WXK_NUMPAD0
+    WXK_NUMPAD1
+    WXK_NUMPAD2
+    WXK_NUMPAD3
+    WXK_NUMPAD4
+    WXK_NUMPAD5
+    WXK_NUMPAD6
+    WXK_NUMPAD7
+    WXK_NUMPAD8
+    WXK_NUMPAD9
+    WXK_MULTIPLY
+    WXK_ADD
+    WXK_SEPARATOR
+    WXK_SUBTRACT
+    WXK_DECIMAL
+    WXK_DIVIDE
+    WXK_F1
+    WXK_F2
+    WXK_F3
+    WXK_F4
+    WXK_F5
+    WXK_F6
+    WXK_F7
+    WXK_F8
+    WXK_F9
+    WXK_F10
+    WXK_F11
+    WXK_F12
+    WXK_F13
+    WXK_F14
+    WXK_F15
+    WXK_F16
+    WXK_F17
+    WXK_F18
+    WXK_F19
+    WXK_F20
+    WXK_F21
+    WXK_F22
+    WXK_F23
+    WXK_F24
+    WXK_NUMLOCK
+    WXK_SCROLL 
+    WXK_PAGEUP,
+    WXK_PAGEDOWN,
+
+    WXK_NUMPAD_SPACE,
+    WXK_NUMPAD_TAB,
+    WXK_NUMPAD_ENTER,
+    WXK_NUMPAD_F1,
+    WXK_NUMPAD_F2,
+    WXK_NUMPAD_F3,
+    WXK_NUMPAD_F4,
+    WXK_NUMPAD_HOME,
+    WXK_NUMPAD_LEFT,
+    WXK_NUMPAD_UP,
+    WXK_NUMPAD_RIGHT,
+    WXK_NUMPAD_DOWN,
+    WXK_NUMPAD_PRIOR,
+    WXK_NUMPAD_PAGEUP,
+    WXK_NUMPAD_NEXT,
+    WXK_NUMPAD_PAGEDOWN,
+    WXK_NUMPAD_END,
+    WXK_NUMPAD_BEGIN,
+    WXK_NUMPAD_INSERT,
+    WXK_NUMPAD_DELETE,
+    WXK_NUMPAD_EQUAL,
+    WXK_NUMPAD_MULTIPLY,
+    WXK_NUMPAD_ADD,
+    WXK_NUMPAD_SEPARATOR,
+    WXK_NUMPAD_SUBTRACT,
+    WXK_NUMPAD_DECIMAL,
+    WXK_NUMPAD_DIVIDE,
+
+    // the following key codes are only generated under Windows currently
+    WXK_WINDOWS_LEFT,
+    WXK_WINDOWS_RIGHT,
+    WXK_WINDOWS_MENU
 \end{verbatim}
 }
 
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 81bf63b6e4..6a3bbc57e1 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1651,7 +1651,11 @@ enum wxKeyCode
     WXK_NUMPAD_SEPARATOR,
     WXK_NUMPAD_SUBTRACT,
     WXK_NUMPAD_DECIMAL,
-    WXK_NUMPAD_DIVIDE
+    WXK_NUMPAD_DIVIDE,
+
+    WXK_WINDOWS_LEFT,
+    WXK_WINDOWS_RIGHT,
+    WXK_WINDOWS_MENU
 };
 
 // Mapping modes (same values as used by Windows, don't change)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 07f274bdfe..5e72624091 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4860,6 +4860,12 @@ int wxCharCodeMSWToWX(int keySym)
         case VK_OEM_6:      id = ']'; break;
         case VK_OEM_7:      id = '\''; break;
 
+#ifdef VK_APPS
+        case VK_LWIN:       id = WXK_WINDOWS_LEFT; break;
+        case VK_RWIN:       id = WXK_WINDOWS_RIGHT; break;
+        case VK_APPS:       id = WXK_WINDOWS_MENU; break;
+#endif // VK_APPS defined
+
         default:
             id = 0;
     }