Compilation fix.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index d670308a9f3e017e7980a299f86ea4c493911e96..0374b532cd6710a535e9bd91be69aca928295888 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -136,10 +136,6 @@
 
 #ifndef VK_OEM_1
     #define VK_OEM_1        0xBA
-    #define VK_OEM_PLUS     0xBB
-    #define VK_OEM_COMMA    0xBC
-    #define VK_OEM_MINUS    0xBD
-    #define VK_OEM_PERIOD   0xBE
     #define VK_OEM_2        0xBF
     #define VK_OEM_3        0xC0
     #define VK_OEM_4        0xDB
@@ -148,6 +144,13 @@
     #define VK_OEM_7        0xDE
 #endif
 
+#ifndef VK_OEM_COMMA
+    #define VK_OEM_PLUS     0xBB
+    #define VK_OEM_COMMA    0xBC
+    #define VK_OEM_MINUS    0xBD
+    #define VK_OEM_PERIOD   0xBE
+#endif
+
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
@@ -697,7 +700,7 @@ void wxWindowMSW::MSWDeviceToLogical (float *x, float *y) const
 // ---------------------------------------------------------------------------
 
 // convert wxHORIZONTAL/wxVERTICAL to SB_HORZ/SB_VERT
-static inline wxDirToWinStyle(int orient)
+static inline int wxDirToWinStyle(int orient)
 {
     return orient == wxHORIZONTAL ? SB_HORZ : SB_VERT;
 }