Compilation fix for VC++ 5 and 6

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7d82a9cef5d9d6b49ae24cc694f070aba7cc85fb..035b7e78ae0b92f21079ada59ba6a2b5b9a21f22 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -5,7 +5,7 @@
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
 * RCS-ID:      $Id$
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
 * RCS-ID:      $Id$

-* Copyright:   (c) 1997-2001 wxWidgets team
+* Copyright:   (c) 1997-2001 Vadim Zeitlin

 * Licence:     wxWindows licence
 */
 
 * Licence:     wxWindows licence
 */
 


@@ -34,6 +34,7 @@
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #        ifdef __WXMAC_XCODE__
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #        ifdef __WXMAC_XCODE__

+#            include <unistd.h>

 #            include "wx/mac/carbon/config_xcode.h"
 #        endif
 #    else
 #            include "wx/mac/carbon/config_xcode.h"
 #        endif
 #    else


@@ -309,12 +310,13 @@
 
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace
 
 /*
    old C++ headers (like <iostream.h>) declare classes in the global namespace

-   while the new, standard ones (like <iostream>) do it in std:: namespace
+   while the new, standard ones (like <iostream>) do it in std:: namespace,
+   unless it's an old gcc version.

 
    using this macro allows constuctions like "wxSTD iostream" to work in
    either case
  */
 
    using this macro allows constuctions like "wxSTD iostream" to work in
    either case
  */

-#if !wxUSE_IOSTREAMH
+#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))

 #    define wxSTD std::
 #else
 #    define wxSTD
 #    define wxSTD std::
 #else
 #    define wxSTD


@@ -508,6 +510,12 @@
 #   include "wx/msw/wince/libraries.h"
 #endif
 
 #   include "wx/msw/wince/libraries.h"
 #endif
 

+/* Force inclusion of main PalmOS header: */
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
+#   undef Abs
+#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:
 


@@ -526,12 +534,14 @@
    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(__WXPALMOS__)
-#    include "wx/palmos/gccpriv.h"
-#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \

-    !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+    !defined(__DOS__) && \
+    !defined(__WXMOTIF__) && \
+    !defined(__WXGTK__) && \
+    !defined(__WXX11__) && \
+    !defined(__WXPALMOS__)

 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION