deprecated XMLID and friends macros

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 60c5770ed0dbac6f7f337969a720267fb6163b73..4d04491a583e61d7db46932af288a9b58a2d176b 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,11 +14,42 @@
 #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>
+    #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
  */
 /*
    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(_WIN32) || defined(WIN32) || defined(__NT__)
+#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__
     #endif
     #ifndef __WXMSW__
         #define __WXMSW__
     #endif


@@ -39,16 +70,10 @@
     #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 */
 
 #if defined(TWIN32) && !defined(__TWIN32__)
 #endif /* WINE */
 
 #if defined(TWIN32) && !defined(__TWIN32__)


@@ -137,7 +162,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 +194,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