Initial/Best size fixes for wxRadioBox, wxSlider and wxStaticText on wxMSW

[wxWidgets.git] / include / wx / msw / wrapwin.h

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index 84141ec67b1741e00a44280fdf7532d7174e7893..04b9d59ed33c19295b98b34b555359e890dd452a 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -1,8 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wrapwin.h
+// Name:        msw/wrapwin.h
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
+// Author:      Vaclav Slavik
 // Created:     2003/07/22
 // RCS-ID:      $Id$
+// Copyright:   (c) 2003 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,23 +17,36 @@
     #define STRICT 1
 #endif
 
-// define _WIN32_IE to a high value because we always check for the version
-// of installed DLLs at runtime anyway:
-#ifndef _WIN32_IE
-    // for compilers that use w32api headers: w32api must be >= 1.1:
-    #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-        defined( __CYGWIN__ ) || \
-        (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || \
-        defined(__DIGITALMARS__)
-        #if wxCHECK_W32API_VERSION(1,1)
-            #define _WIN32_IE 0x400
-        #endif
-    #else
-        #define _WIN32_IE 0x400
-    #endif
-#endif
-
 #include <windows.h>
+
+#ifdef __WXWINCE__
+    // this doesn't make any sense knowing that windows.h includes all these
+    // headers anyhow, but the fact remains that when building using eVC 4 the
+    // functions and constants from these headers are not defined unless we
+    // explicitly include them ourselves -- how is it possible is beyond me...
+    #include <winbase.h>
+    #include <wingdi.h>
+    #include <winuser.h>
+
+    // this one OTOH contains many useful CE-only functions
+    #include <shellapi.h>
+#endif // __WXWINCE__
+
 #include "wx/msw/winundef.h"
 
-#endif
+// types DWORD_PTR, ULONG_PTR and so on might be not defined in old headers but
+// unfortunately I don't know of any standard way to test for this (as they're
+// typedefs and not #defines), so simply overwrite them in any case in Win32
+// mode -- and if compiling for Win64 they'd better have new headers anyhow
+//
+// this is ugly but what else can we do? even testing for compiler version
+// wouldn't help as you can perfectly well be using an older compiler (VC6)
+// with newer SDK headers
+#if !defined(__WIN64__) && !defined(__WXWINCE__)
+    #define UINT_PTR unsigned int
+    #define ULONG_PTR unsigned long
+    #define DWORD_PTR unsigned long
+#endif // !__WIN64__
+
+#endif // _WX_WRAPWIN_H_
+