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 68fe507d825c205c1f0fc8ea85081c786db47166..a6f6f0ba66762d938ee3522bbba6238b98d6fb66 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -6,7 +6,7 @@
  * Created:     29.10.01 (extracted from wx/defs.h)
  * RCS-ID:      $Id$
  * Copyright:   (c) 1997-2001 wxWindows team
- * Licence:     wxWindows license
+ * Licence:     wxWindows licence
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -14,6 +14,15 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
+
+/*
+    Codewarrior doesn't define any Windows symbols until some headers
+    are included
+*/
+#if __MWERKS__
+    #include <stddef.h>
+#endif
+
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -43,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 */
@@ -61,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
@@ -74,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
@@ -82,9 +105,9 @@
    either case
  */
 #if !wxUSE_IOSTREAMH
-  #define wxSTD std::
+    #define wxSTD std::
 #else
- #define wxSTD
+    #define wxSTD
 #endif
 
 /*
@@ -179,6 +202,9 @@
     #ifndef __POWERPC__
         #define __POWERPC__ 1
     #endif
+    #ifndef TARGET_CARBON
+        #define TARGET_CARBON 1
+    #endif
 
     #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
         #define wxSIZE_T_IS_ULONG
@@ -279,5 +305,25 @@
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
+#ifdef __SC__
+    #ifdef __DMC__
+         #define __DIGITALMARS__
+    #else
+         #define __SYMANTEC__
+    #endif
+#endif
+
+#if defined (__WXMSW__)
+    #if !defined(__WATCOMC__)
+        #define wxHAVE_RAW_BITMAP
+    #endif
+#endif
+
+#if defined (__WXMAC__)
+    #ifndef WORDS_BIGENDIAN
+        #define WORDS_BIGENDIAN 1
+    #endif
+#endif
+
 #endif /* _WX_PLATFORM_H_ */