1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d1c131e03e33c857c94646c48b464bec75c2eea6..6085934aa8b6297d9e7dfe82547ce631e7ca025c 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -23,6 +23,29 @@
 #    include <stddef.h>
 #endif
 
 #    include <stddef.h>
 #endif
 

+/*
+       WXMAC variants
+       __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
+       carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
+       builds, running under 10.2 + only
+*/
+#ifdef __WXMAC__
+       #if defined(__MACH__)
+               #define __WXMAC_OSX__ 1
+               #define __WXMAC_CARBON__ 1
+               #define __WXMAC_CLASSIC__ 0
+       #else
+               #define __WXMAC_OSX__ 0
+               #if TARGET_CARBON
+                       #define __WXMAC_CARBON__ 1
+                       #define __WXMAC_CLASSIC__ 0
+               #else
+                       #define __WXMAC_CARBON__ 0
+                       #define __WXMAC_CLASSIC__ 1
+               #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


@@ -129,7 +152,10 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
 #   endif
 #endif /* wxUSE_UNICODE */
 

-
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+// otherwise MSL headers bring in WIN32 dependant APIs
+#undef UNICODE
+#endif

 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here
 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here


@@ -285,7 +311,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__

-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"

 #    endif
 
     /*
 #    endif
 
     /*