don't distribute extra space between 0 width cells in justified paragraphs (this...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 91f11101ecff7c9a5b3595a0e495cd134e1368f5..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
                #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
        #else
                #define __WXMAC_OSX__ 0
                #if TARGET_CARBON


@@ -117,6 +120,13 @@
 #    endif
 #endif /* WINE */
 
 #    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
 /*
    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
 #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 */
 #    undef wxUSE_IOSTREAMH
 #    define wxUSE_IOSTREAMH 1
 #endif /* compilers not supporting iostream.h */


@@ -311,7 +321,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
 
     /*


@@ -360,6 +370,11 @@
 #    endif
 #endif
 
 #    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:
 
 /*
    This macro can be used to test the gcc version and can be used like this: