undef CreateWindow too, even if we don't use it ourselves it's still a very common...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 0d618367466c02261b3fe9523ba641f8e627bb1d..03ae2586795055cb41940436af69e0c4a9c9a409 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -31,16 +31,16 @@
 */
 #ifdef __WXMAC__
 #    if defined(__MACH__)
 */
 #ifdef __WXMAC__
 #    if defined(__MACH__)

-#        define __WXMAC_OSX__ 1
-#        define __WXMAC_CARBON__ 1
+#        define __WXMAC_OSX__
+#        define __WXMAC_CARBON__

 #        ifdef __WXMAC_XCODE__
 #            include "wx/mac/carbon/config_xcode.h"
 #        endif
 #    else
 #        if TARGET_CARBON
 #        ifdef __WXMAC_XCODE__
 #            include "wx/mac/carbon/config_xcode.h"
 #        endif
 #    else
 #        if TARGET_CARBON

-#            define __WXMAC_CARBON__ 1
+#            define __WXMAC_CARBON__

 #        else
 #        else

-#            define __WXMAC_CLASSIC__ 1
+#            define __WXMAC_CLASSIC__

 #        endif
 #    endif
 #endif
 #        endif
 #    endif
 #endif


@@ -465,7 +465,9 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */

-#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if defined(__PALMOS__)
+#    include "wx/palmos/gccpriv.h"
+#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)