added wxInitialize() overload taking char**, to make use from main() easier

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d6c317db1fd71b7ffe8d31f5118aac8454345556..6e07657e07dec00371106ae16e5a6143b57aff40 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -35,17 +35,17 @@
 
 /* backwards compatible define, until configure gets updated */
 #if defined __WXMAC__
 
 /* backwards compatible define, until configure gets updated */
 #if defined __WXMAC__

-#define __WXOSX_CARBON__
+#define __WXOSX_CARBON__ 1

 #endif
 
 #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 
 #endif
 
 #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 

-#   define __WXOSX__
+#   define __WXOSX__ 1

 #endif
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
 #   ifndef __WXMAC__
 #endif
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
 #   ifndef __WXMAC__

-#       define __WXMAC__
+#       define __WXMAC__ 1

 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>


@@ -57,7 +57,7 @@
 #       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
 #           error "incorrect SDK for a Mac OS X build"
 #       endif
 #       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
 #           error "incorrect SDK for a Mac OS X build"
 #       endif

-#       define __WXOSX_MAC__
+#       define __WXOSX_MAC__ 1

 #   else
 #       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
 #   endif
 #   else
 #       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
 #   endif


@@ -100,7 +100,7 @@
 
  */
 #if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
 
  */
 #if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))

-#   define __WXOSX_OR_COCOA__
+#   define __WXOSX_OR_COCOA__ 1

 #endif
 
 #ifdef __WXOSX_OR_COCOA__
 #endif
 
 #ifdef __WXOSX_OR_COCOA__


@@ -233,6 +233,10 @@
 #   endif
 #endif
 
 #   endif
 #endif
 

+#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
+    #define __EVC4__
+#endif
+

 #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
 #   define __WXHANDHELD__
 #endif
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
 #   define __WXHANDHELD__
 #endif


@@ -244,16 +248,18 @@
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */
    Note that it must be included before defining hardware symbols below as they
    could be already defined by configure
  */

+#include "wx/setup.h"
+

 #ifdef __GCCXML__
     /*
         we're using gccxml to create an XML representation of the entire
 #ifdef __GCCXML__
     /*
         we're using gccxml to create an XML representation of the entire

-        wxWidgets interface; pass it a special setup.h file
+        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"
     */
     #include "wx/setup_gccxml.h"

-#else
-    #include "wx/setup.h"

 #endif
 
 #endif
 

+

 /*
    Hardware platform detection.
 
 /*
    Hardware platform detection.
 


@@ -332,18 +338,22 @@
 
 
 /*
 
 
 /*

-   This macro can be used to test the Open Watcom version.
+   Define Watcom-specific macros.

 */
 #ifndef __WATCOMC__
 #   define wxWATCOM_VERSION(major,minor) 0
 #   define wxCHECK_WATCOM_VERSION(major,minor) 0
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
 */
 #ifndef __WATCOMC__
 #   define wxWATCOM_VERSION(major,minor) 0
 #   define wxCHECK_WATCOM_VERSION(major,minor) 0
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0

-#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
-#   error "Only Open Watcom is supported in this release"
+#   define WX_WATCOM_ONLY_CODE( x )

 #else
 #else

+#   if __WATCOMC__ < 1200
+#       error "Only Open Watcom is supported in this release"
+#   endif
+

 #   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
 #   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
 #   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
 #   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )

+#   define WX_WATCOM_ONLY_CODE( x )  x

 #endif
 
 /*
 #endif
 
 /*