Implemented wxGetKeyState for wxGTK (and wxX11 too, but I havn't

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6085934aa8b6297d9e7dfe82547ce631e7ca025c..d9670ec48e6745f2e344dfdcd5ea7897ecba5acb 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -34,6 +34,9 @@
                #define __WXMAC_OSX__ 1
                #define __WXMAC_CARBON__ 1
                #define __WXMAC_CLASSIC__ 0
+        #ifdef __WXMAC_XCODE__
+            #include "wx/mac/carbon/config_xcode.h"
+        #endif
        #else
                #define __WXMAC_OSX__ 0
                #if TARGET_CARBON
@@ -117,6 +120,13 @@
 #    endif
 #endif /* WINE */
 
+/* detect SmartPhone */
+#if defined( WIN32_PLATFORM_WFSP )
+#    ifndef __SMARTPHONE__
+#        define __SMARTPHONE__
+#    endif
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -164,7 +174,7 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 0
-#elif defined(__DMC__)
+#elif defined(__DMC__) || defined(__WATCOMC__)
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */
@@ -360,6 +370,11 @@
 #    endif
 #endif
 
+/* Force linking against required libraries under Windows CE: */
+#ifdef __WXWINCE__
+#   include "wx/msw/wince/libraries.h"
+#endif
+
 /*
    This macro can be used to test the gcc version and can be used like this: