Force wide char environment version initialization in wxGetEnvMap().

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7feddf360935d6f3ab6b0531ee7d748d616a62db..cdd8b9ce4844044f36cdb5c34605579e1f62f9d1 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -14,16 +14,6 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 

-
-
-/*
-    Codewarrior doesn't define any Windows symbols until some headers
-    are included
-*/
-#ifdef __MWERKS__
-#   include <stddef.h>
-#endif
-

 #ifdef __WXMAC_XCODE__
 #    include <unistd.h>
 #    include <TargetConditionals.h>
 #ifdef __WXMAC_XCODE__
 #    include <unistd.h>
 #    include <TargetConditionals.h>


@@ -163,15 +153,6 @@
  */
 #include "wx/setup.h"
 
  */
 #include "wx/setup.h"
 

-#ifdef __GCCXML__
-    /*
-        we're using gccxml to create an XML representation of the entire
-        wxWidgets interface; use a special setup_gccxml.h file to fix some
-        of the stuff #defined by the real setup.h
-    */
-    #include "wx/setup_gccxml.h"
-#endif
-

 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */
 /*
    Convenience for any optional classes that use the wxAnyButton base class.
  */


@@ -236,11 +217,6 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
 #   endif
 #endif /* wxUSE_UNICODE */
 

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

 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo
 
 /*
    test for old versions of Borland C, normally need at least 5.82, Turbo


@@ -397,17 +373,6 @@
 #        endif
 #    endif
 
 #        endif
 #    endif
 

-/*
-   OS: Classic Mac OS
- */
-#elif defined(applec) || \
-      defined(THINK_C) || \
-      (defined(__MWERKS__) && !defined(__INTEL__))
-      /* MacOS */
-#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-#        define wxSIZE_T_IS_ULONG
-#    endif
-

 /*
    OS: OS/2
  */
 /*
    OS: OS/2
  */


@@ -446,9 +411,9 @@
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard

-       one (_MSC_VER) is also defined by Metrowerks compiler
+       one (_MSC_VER) is also defined by some other compilers.

      */
      */

-#    if defined(_MSC_VER) && !defined(__MWERKS__)
+#    if defined(_MSC_VER)

 #        define __VISUALC__ _MSC_VER
 
     /*
 #        define __VISUALC__ _MSC_VER
 
     /*