From: Václav Slavík <vslavik@fastmail.fm>
Date: Sat, 31 Jan 2004 14:44:46 +0000 (+0000)
Subject: cleanup: all definitions missing from std headers should be in missing.h
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ae54422d9d02ebd0a244998ef9117beff1432268

cleanup: all definitions missing from std headers should be in missing.h


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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index dd7ad37b2d..b5123ae576 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -526,5 +526,40 @@ typedef struct {
 
 #endif
 
+// This didn't appear in mingw until 2.95.2
+#ifndef SIF_TRACKPOS
+#define SIF_TRACKPOS 16
+#endif
+
+#if wxUSE_MOUSEWHEEL
+    #ifndef WM_MOUSEWHEEL
+        #define WM_MOUSEWHEEL           0x020A
+    #endif
+    #ifndef WHEEL_DELTA
+        #define WHEEL_DELTA             120
+    #endif
+    #ifndef SPI_GETWHEELSCROLLLINES
+        #define SPI_GETWHEELSCROLLLINES 104
+    #endif
+#endif // wxUSE_MOUSEWHEEL
+
+#ifndef VK_OEM_1
+    #define VK_OEM_1        0xBA
+    #define VK_OEM_2        0xBF
+    #define VK_OEM_3        0xC0
+    #define VK_OEM_4        0xDB
+    #define VK_OEM_5        0xDC
+    #define VK_OEM_6        0xDD
+    #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
+
+
 #endif
     // _WX_MISSING_H_
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 659e65db10..bbca2e056f 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -114,52 +114,12 @@
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
-#if defined(__GNUG__) || defined(__DMC__)
 #include "wx/msw/missing.h"
-#endif
 
 #if defined(__WXWINCE__)
 #include "wx/msw/wince/missing.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// standard constants not available with all compilers/headers
-// ----------------------------------------------------------------------------
-
-// This didn't appear in mingw until 2.95.2
-#ifndef SIF_TRACKPOS
-#define SIF_TRACKPOS 16
-#endif
-
-#if wxUSE_MOUSEWHEEL
-    #ifndef WM_MOUSEWHEEL
-        #define WM_MOUSEWHEEL           0x020A
-    #endif
-    #ifndef WHEEL_DELTA
-        #define WHEEL_DELTA             120
-    #endif
-    #ifndef SPI_GETWHEELSCROLLLINES
-        #define SPI_GETWHEELSCROLLLINES 104
-    #endif
-#endif // wxUSE_MOUSEWHEEL
-
-#ifndef VK_OEM_1
-    #define VK_OEM_1        0xBA
-    #define VK_OEM_2        0xBF
-    #define VK_OEM_3        0xC0
-    #define VK_OEM_4        0xDB
-    #define VK_OEM_5        0xDC
-    #define VK_OEM_6        0xDD
-    #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
 // ---------------------------------------------------------------------------