Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-05-17 19:51:02 +00:00
parent 7051e6c79c
commit 3f3071dcd5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/window.cpp
View File

@@ -136,10 +136,6 @@
#ifndef VK_OEM_1 #ifndef VK_OEM_1
#define VK_OEM_1 0xBA #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_2 0xBF
#define VK_OEM_3 0xC0 #define VK_OEM_3 0xC0
#define VK_OEM_4 0xDB #define VK_OEM_4 0xDB
@@ -148,6 +144,13 @@
#define VK_OEM_7 0xDE #define VK_OEM_7 0xDE
#endif #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 // global variables
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -697,7 +700,7 @@ void wxWindowMSW::MSWDeviceToLogical (float *x, float *y) const
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// convert wxHORIZONTAL/wxVERTICAL to SB_HORZ/SB_VERT // 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; return orient == wxHORIZONTAL ? SB_HORZ : SB_VERT;
} }