correct access for virtuals

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

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index fb6b8f9bb644e3267e8eb75e739c6c00144a3cd2..1e039d424de835ff03d073cc4758018ceadd9026 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -43,41 +43,32 @@
     #define _WIN32_WINNT 0x0600
 #endif
 
     #define _WIN32_WINNT 0x0600
 #endif
 

+/* Deal with clash with __WINDOWS__ include guard */
+#if defined(__WXWINCE__) && defined(__WINDOWS__)
+#undef __WINDOWS__
+#endif

 
 #include <windows.h>
 
 
 #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__
-
+#if defined(__WXWINCE__) && !defined(__WINDOWS__)
+#define __WINDOWS__
+#endif

 
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
 
 
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
 

-// 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__)
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
+// in the WINAPI SDK (they are an integral type that is the size of a
+// pointer) on MSVC 7 and later. However, they are not available in older 
+// Platform SDKs, and since they are typedefs and not #defines we simply 
+// overwrite them if there is a chance that they're not defined
+#if !defined(_MSC_VER) || (_MSC_VER < 1300)

     #define UINT_PTR unsigned int
     #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
     #define UINT_PTR unsigned int
     #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long

-#endif // !__WIN64__
+#endif // !defined(_MSC_VER) || _MSC_VER < 1300

 
 #endif // _WX_WRAPWIN_H_
 
 
 #endif // _WX_WRAPWIN_H_