added virtual dtor to wxDateTimeHolidayAuthority (patch 753947)

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index bed5fd62c2fd4bf36b21a0ee9f1f3765eef77c15..0f9f485fae2a2905f335a388d7c0aaadf21c14a7 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
  * 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 */
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */


@@ -14,10 +14,35 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
 #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
  */
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */

+#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
+    && !defined(__WXX11__)
+    /* for Cygwin, default to wxMSW unless otherwise specified */
+    #ifndef __WXMSW__
+        #define __WXMSW__
+    #endif
+
+    #ifndef _WIN32
+        #define _WIN32
+    #endif
+
+    #ifndef WIN32
+        #define WIN32
+    #endif
+#endif
+

 #if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
     #ifndef __WXMSW__
         #define __WXMSW__
 #if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
     #ifndef __WXMSW__
         #define __WXMSW__


@@ -27,8 +52,17 @@
         #define __WIN32__
     #endif
 
         #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+ */
     /* 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 */
         #define __WIN95__
     #endif
 #endif /* Win32 */


@@ -39,22 +73,12 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#ifdef __WXWINE__
-    #ifndef __WIN32__
-        #define __WIN32__
-    #endif
+#ifdef __WINE__

     #ifndef __WIN95__
         #define __WIN95__
     #endif
     #ifndef __WIN95__
         #define __WIN95__
     #endif

-    #ifndef STRICT
-        #define STRICT
-    #endif

 #endif /* WINE */
 
 #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
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options


@@ -64,6 +88,15 @@
 /* check the consistency of the settings in setup.h */
 #include "wx/chkconf.h"
 
 /* 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
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace
    while the new, standard ones (like <iostream>) do it in std:: namespace


@@ -72,9 +105,9 @@
    either case
  */
 #if !wxUSE_IOSTREAMH
    either case
  */
 #if !wxUSE_IOSTREAMH

-  #define wxSTD std::
+    #define wxSTD std::

 #else
 #else

- #define wxSTD
+    #define wxSTD

 #endif
 
 /*
 #endif
 
 /*


@@ -137,7 +170,7 @@
         #define __HPUX__
     #endif /* HP-UX */
 
         #define __HPUX__
     #endif /* HP-UX */
 

-    #if defined(__CYGWIN__)
+    #if defined(__CYGWIN__) || defined(__WINE__)

         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
         #endif
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
         #endif


@@ -169,6 +202,9 @@
     #ifndef __POWERPC__
         #define __POWERPC__ 1
     #endif
     #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
 
     #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
         #define wxSIZE_T_IS_ULONG


@@ -269,5 +305,19 @@
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
     #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
+

 #endif /* _WX_PLATFORM_H_ */
 
 #endif /* _WX_PLATFORM_H_ */