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 a174b2e706294811b4a2061d6b3f2e81305bceee..6e07657e07dec00371106ae16e5a6143b57aff40 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -21,18 +21,50 @@
 */
 #ifdef __MWERKS__
 #   include <stddef.h>
 */
 #ifdef __MWERKS__
 #   include <stddef.h>

+
+#  if !defined(__WXMAC__) && !defined(__WINDOWS__) && !defined(WIN32) && !defined(_WIN32_WCE)
+#    define __PALMOS__ 0x05000000
+#  endif

 #endif
 
 /*
 #endif
 
 /*

-    WXMAC variants
-    __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
-    carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
-    builds, running under 10.2 + only
+    WXOSX targets
+    __WXOSX_MAC__ means Mac OS X, non embedded
+    __WXOSX_IPHONE__ means OS X iPhone

 */
 */

-#ifdef __WXMAC__
+
+/* backwards compatible define, until configure gets updated */
+#if defined __WXMAC__
+#define __WXOSX_CARBON__ 1
+#endif
+
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) 
+#   define __WXOSX__ 1
+#endif
+
+#ifdef __WXOSX__
+/* for backwards compatibility of code (including our own) define __WXMAC__ */
+#   ifndef __WXMAC__
+#       define __WXMAC__ 1
+#   endif
+/* setup precise defines according to sdk used */
+#   include <TargetConditionals.h>
+#   if defined(__WXOSX_IPHONE__) 
+#       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+#           error "incorrect SDK for an iPhone build"
+#       endif
+#   elif defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__)
+#       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+#           error "incorrect SDK for a Mac OS X build"
+#       endif
+#       define __WXOSX_MAC__ 1
+#   else
+#       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
+#   endif
+#endif
+
+#ifdef __WXOSX_MAC__

 #    if defined(__MACH__)
 #    if defined(__MACH__)

-#        define __WXMAC_OSX__
-#        define __WXMAC_CARBON__ /* for backwards compat in user code still defined */

 #        include <AvailabilityMacros.h>
 #        ifndef MAC_OS_X_VERSION_10_4
 #           define MAC_OS_X_VERSION_10_4 1040
 #        include <AvailabilityMacros.h>
 #        ifndef MAC_OS_X_VERSION_10_4
 #           define MAC_OS_X_VERSION_10_4 1040


@@ -40,9 +72,8 @@
 #        ifndef MAC_OS_X_VERSION_10_5
 #           define MAC_OS_X_VERSION_10_5 1050
 #        endif
 #        ifndef MAC_OS_X_VERSION_10_5
 #           define MAC_OS_X_VERSION_10_5 1050
 #        endif

-#        ifdef __WXMAC_XCODE__
-#            include <unistd.h>
-#            include "wx/mac/carbon/config_xcode.h"
+#        ifndef MAC_OS_X_VERSION_10_6
+#           define MAC_OS_X_VERSION_10_6 1060

 #        endif
 #    else
 #        error "only mach-o configurations are supported"
 #        endif
 #    else
 #        error "only mach-o configurations are supported"


@@ -50,13 +81,13 @@
 #endif
 
 /*
 #endif
 
 /*

-    __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+    __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.

 
     DO NOT use this define in base library code.  Although wxMac has its own
 
     DO NOT use this define in base library code.  Although wxMac has its own

-    private base library (and thus __WXOSX__,__WXMAC__ and related defines are
+    private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are

     valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
 
     valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
 

-    To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when
+    To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when

     not compiling the base library.  We determine this by first checking if
     wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
     the base library, and possibly not building wx at all (but actually building
     not compiling the base library.  We determine this by first checking if
     wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
     the base library, and possibly not building wx at all (but actually building


@@ -68,10 +99,18 @@
     using OS X libraries like Carbon or CoreServices.
 
  */
     using OS X libraries like Carbon or CoreServices.
 
  */

-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
-#   define __WXOSX__
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#   define __WXOSX_OR_COCOA__ 1

 #endif
 
 #endif
 

+#ifdef __WXOSX_OR_COCOA__
+#    ifdef __WXMAC_XCODE__
+#        include <unistd.h>
+#        include <TargetConditionals.h>
+#        include <AvailabilityMacros.h>
+#        include "wx/osx/config_xcode.h"
+#    endif
+#endif

 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined


@@ -80,25 +119,17 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif

-
-#    ifndef _WIN32
-#        define _WIN32
-#    endif
-
-#    ifndef WIN32
-#        define WIN32
-#    endif

 #endif
 
 #if defined(__PALMOS__)
 #   if __PALMOS__ == 0x06000000
 #endif
 
 #if defined(__PALMOS__)
 #   if __PALMOS__ == 0x06000000

-#       define __WXPALMOS6__
+#       define __WXPALMOS6__ 1

 #   endif
 #   if __PALMOS__ == 0x05000000
 #   endif
 #   if __PALMOS__ == 0x05000000

-#       define __WXPALMOS5__
+#       define __WXPALMOS5__ 1

 #   endif
 #   ifndef __WXPALMOS__
 #   endif
 #   ifndef __WXPALMOS__

-#       define __WXPALMOS__
+#       define __WXPALMOS__ 1

 #   endif
 #   ifdef __WXMSW__
 #       undef __WXMSW__
 #   endif
 #   ifdef __WXMSW__
 #       undef __WXMSW__


@@ -137,17 +168,25 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif

-
-#    ifndef __WIN32__
-#        define __WIN32__
-#    endif

 #endif /* Win32 */
 
 #endif /* Win32 */
 

-#if defined(__WXMSW__) || defined(__WIN32__)
+#if defined(__WXMSW__)

 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif

-#endif
+
+#   ifndef _WIN32
+#        define _WIN32
+#   endif
+
+#   ifndef WIN32
+#        define WIN32
+#   endif
+
+#   ifndef __WIN32__
+#        define __WIN32__
+#   endif
+#endif /* __WXMSW__ */

 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )


@@ -194,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


@@ -207,6 +250,16 @@
  */
 #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
+
+

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


@@ -269,31 +322,38 @@
 #endif
 
 
 #endif
 
 

-/* test for old versions of Borland C, normally need at least 5.82, Turbo explorer, 
-   available for free at http://www.turboexplorer.com/downloads 
+/*
+   test for old versions of Borland C, normally need at least 5.82, Turbo
+   explorer, available for free at http://www.turboexplorer.com/downloads

 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)

-#error "This version of wxWidgets requires a newer version of Borland - we recommend 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."

 #endif /* __BORLANDC__ */
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
 #endif /* __BORLANDC__ */
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)

-#error "This version of wxWidgets has problems with Borland 5.6; we recommend getting Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   ifndef _USE_OLD_RW_STL
+#       error "wxWidgets is incompatible with default Borland C++ 5.6 STL library, please add -D_USE_OLD_RW_STL to your bcc32.cfg to use RogueWave STL implementation."
+#   endif

 #endif /* __BORLANDC__ */
 
 
 /*
 #endif /* __BORLANDC__ */
 
 
 /*

-   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
 
 /*


@@ -353,6 +413,10 @@
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR

+#    endif
+#    if defined(__INNOTEK_LIBC__)
+        /* Ensure visibility of strnlen declaration */
+#        define _GNU_SOURCE

 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */
 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */


@@ -458,6 +522,27 @@
      */
 #    if defined(_MSC_VER) && !defined(__MWERKS__)
 #        define __VISUALC__ _MSC_VER
      */
 #    if defined(_MSC_VER) && !defined(__MWERKS__)
 #        define __VISUALC__ _MSC_VER

+
+    /*
+       define special symbols for different VC version instead of writing tests
+       for magic numbers such as 1200, 1300 &c repeatedly
+     */
+#   if __VISUALC__ < 1100
+#       error "This Visual C++ version is too old and not supported any longer."
+#   elif __VISUALC__ < 1200
+#       define __VISUALC5__
+#   elif __VISUALC__ < 1300
+#       define __VISUALC6__
+#   elif __VISUALC__ < 1400
+#       define __VISUALC7__
+#   elif __VISUALC__ < 1500
+#       define __VISUALC8__
+#   elif __VISUALC__ < 1600
+#       define __VISUALC9__
+#   else
+#       pragma message("Please update this code for the next VC++ version")
+#   endif
+

 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #    elif defined(__WATCOMC__)
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #    elif defined(__WATCOMC__)


@@ -467,7 +552,7 @@
 
     /* size_t is the same as unsigned int for all Windows compilers we know, */
     /* so define it if it hadn't been done by configure yet */
 
     /* size_t is the same as unsigned int for all Windows compilers we know, */
     /* so define it if it hadn't been done by configure yet */

-#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)

 #        define wxSIZE_T_IS_UINT
 #    endif
 #endif  /* OS */
 #        define wxSIZE_T_IS_UINT
 #    endif
 #endif  /* OS */


@@ -532,6 +617,17 @@
 #define wxNEEDS_CHARPP
 #endif
 
 #define wxNEEDS_CHARPP
 #endif
 

+/*
+   This macro can be used to test the Visual C++ version.
+*/
+#ifndef __VISUALC__
+#   define wxVISUALC_VERSION(major) 0
+#   define wxCHECK_VISUALC_VERSION(major) 0
+#else
+#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
+#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
+#endif
+

 /*
    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


@@ -563,12 +659,6 @@
     #define wxCHECK_SUNCC_VERSION(maj, min) (0)
 #endif
 
     #define wxCHECK_SUNCC_VERSION(maj, min) (0)
 #endif
 

-#if defined (__WXMSW__)
-#    if !defined(__WATCOMC__)
-#        define wxHAVE_RAW_BITMAP
-#    endif
-#endif
-

 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-
     specific case since no sane compiler should be defining either
 /*
     Handle Darwin gcc universal compilation.  Don't do this in an Apple-
     specific case since no sane compiler should be defining either


@@ -586,7 +676,24 @@
 /*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
 #    warning "Compiling wxMac with probably wrong endianness"
 #endif
 /*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
 #    warning "Compiling wxMac with probably wrong endianness"
 #endif

-
+/* also the 32/64 bit universal builds must be handled accordingly */
+#ifdef __DARWIN__
+#      ifdef __LP64__
+#              undef SIZEOF_VOID_P 
+#              undef SIZEOF_LONG 
+#              undef SIZEOF_SIZE_T 
+#              define SIZEOF_VOID_P 8
+#              define SIZEOF_LONG 8
+#              define SIZEOF_SIZE_T 8
+#      else
+#              undef SIZEOF_VOID_P 
+#              undef SIZEOF_LONG 
+#              undef SIZEOF_SIZE_T 
+#              define SIZEOF_VOID_P 4
+#              define SIZEOF_LONG 4
+#              define SIZEOF_SIZE_T 4
+#      endif
+#endif

 /*
    check the consistency of the settings in setup.h: note that this must be
    done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
 /*
    check the consistency of the settings in setup.h: note that this must be
    done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h


@@ -634,6 +741,15 @@
 # define wxVMS_USE_STD
 #endif
 
 # define wxVMS_USE_STD
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif
+#endif
+

 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.


@@ -653,7 +769,7 @@
  */
 
 #ifndef wxUSE_FILECONFIG
  */
 
 #ifndef wxUSE_FILECONFIG

-#    if wxUSE_CONFIG
+#    if wxUSE_CONFIG && wxUSE_TEXTFILE

 #        define wxUSE_FILECONFIG 1
 #    else
 #        define wxUSE_FILECONFIG 0
 #        define wxUSE_FILECONFIG 1
 #    else
 #        define wxUSE_FILECONFIG 0


@@ -677,4 +793,29 @@
     #include <AvailabilityMacros.h>
 #endif
 
     #include <AvailabilityMacros.h>
 #endif
 

+#if defined (__WXPALMOS__)
+#include "wx/palmos/missing.h"
+#endif // __WXPALMOS__
+
+#if !defined (__WXPALMOS5__)
+#define POSSEC_APPBASE
+#define POSSEC_ARCHIVE
+#define POSSEC_CLNTDATA
+#define POSSEC_CMDLINE
+#define POSSEC_CONFIG
+#define POSSEC_DATETIME
+#define POSSEC_DATETIME2
+#define POSSEC_DATSTRM
+#define POSSEC_DIRCMN
+#define POSSEC_DYNARRAY
+#define POSSEC_DYNLIB
+#define POSSEC_DYNLOAD
+#define POSSEC_ENCCONV
+#define POSSEC_EXTENDED
+#define POSSEC_FFILE
+#define POSSEC_FILE
+#define POSSEC_FILECONF
+#define POSSEC_FILEFN
+#endif // __WXPALMOS5__
+

 #endif /* _WX_PLATFORM_H_ */
 #endif /* _WX_PLATFORM_H_ */