GetIcon() returns wxIconLocation, not wxIcon, now

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 24d8e5a99f0d0174524accf2087c763da9a837c3..a6f6f0ba66762d938ee3522bbba6238b98d6fb66 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -21,14 +21,8 @@
 */
 #if __MWERKS__
     #include <stddef.h>
-    #if defined(WIN32) || defined(_WIN32)
-        #ifndef WINVER
-            #define WINVER  0x0400
-        #endif
-    #endif
 #endif
 
-
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -58,8 +52,17 @@
         #define __WIN32__
     #endif
 
+    /*
+       see MSDN for the description of possible WINVER values, this one is a
+       good default and, anyhow, we check for most of the features we use
+       during run-time.
+     */
+    #ifndef WINVER
+        #define WINVER  0x0400
+    #endif
+
     /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */
-    #if !defined(__WIN95__) && defined(WINVER) && (WINVER >= 0x0400)
+    #if !defined(__WIN95__) && (WINVER >= 0x0400)
         #define __WIN95__
     #endif
 #endif /* Win32 */
@@ -76,10 +79,6 @@
     #endif
 #endif /* WINE */
 
-#if defined(TWIN32) && !defined(__TWIN32__)
-    #define __TWIN32__
-#endif /* Twin32 */
-
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -89,6 +88,15 @@
 /* check the consistency of the settings in setup.h */
 #include "wx/chkconf.h"
 
+/*
+   some compilers don't support iostream.h any longer, so override the users
+   setting here in such case.
+ */
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
+    #undef wxUSE_IOSTREAMH
+    #define wxUSE_IOSTREAMH 0
+#endif /* compilers not supporting iostream.h */
+
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace
    while the new, standard ones (like <iostream>) do it in std:: namespace
@@ -97,9 +105,9 @@
    either case
  */
 #if !wxUSE_IOSTREAMH
-  #define wxSTD std::
+    #define wxSTD std::
 #else
- #define wxSTD
+    #define wxSTD
 #endif
 
 /*
@@ -311,5 +319,11 @@
     #endif
 #endif
 
+#if defined (__WXMAC__)
+    #ifndef WORDS_BIGENDIAN
+        #define WORDS_BIGENDIAN 1
+    #endif
+#endif
+
 #endif /* _WX_PLATFORM_H_ */