Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 82abd84a45801bc3081ac4c2b9114d8b0258467d..59d7a5e55b0d945c1b9c6e7d2033d330d8e06e50 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -20,6 +20,10 @@
 
 #include "wx/defs.h"        /* for wxUSE_UNICODE */
 
 
 #include "wx/defs.h"        /* for wxUSE_UNICODE */
 

+#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    char       *strtok_r(char *, const char *, char **);
+#endif
+

 /* check whether we have wchar_t and which size it is if we do */
 #if !defined(wxUSE_WCHAR_T)
     #if defined(__UNIX__)
 /* check whether we have wchar_t and which size it is if we do */
 #if !defined(wxUSE_WCHAR_T)
     #if defined(__UNIX__)


@@ -87,12 +91,17 @@
         /* Cygwin versions, wchar.h requires sys/types.h */
         #ifdef __CYGWIN__
             #include <sys/types.h>
         /* Cygwin versions, wchar.h requires sys/types.h */
         #ifdef __CYGWIN__
             #include <sys/types.h>

-            extern "C" {
+            #ifdef __cplusplus
+                extern "C" {
+            #endif

         #endif /* Cygwin */
         #endif /* Cygwin */

-                #include <wchar.h>
-        #ifdef __CYGWIN__
+
+        #include <wchar.h>
+
+        #if defined(__CYGWIN__) && defined(__cplusplus)

             }
             }

-        #endif /* Cygwin */
+        #endif /* Cygwin and C++ */
+

     #elif defined(HAVE_WCSTR_H)
         /* old compilers have relevant declarations here */
         #include <wcstr.h>
     #elif defined(HAVE_WCSTR_H)
         /* old compilers have relevant declarations here */
         #include <wcstr.h>


@@ -118,7 +127,7 @@
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__DMC__)
     #define wxHAVE_TCHAR_SUPPORT
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__DMC__)
     #define wxHAVE_TCHAR_SUPPORT

-#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__PALMOS__)
+#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__WXPALMOS__)

     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
     #include <string.h>
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
     #include <string.h>


@@ -247,7 +256,7 @@
     #else
       #define WXWCHAR_T_CAST(c) c
     #endif
     #else
       #define WXWCHAR_T_CAST(c) c
     #endif

-    
+

     /* ctype.h functions */
     #define  wxIsalnum(c)   _istalnum(WXWCHAR_T_CAST(c))
     #define  wxIsalpha(c)   _istalpha(WXWCHAR_T_CAST(c))
     /* ctype.h functions */
     #define  wxIsalnum(c)   _istalnum(WXWCHAR_T_CAST(c))
     #define  wxIsalpha(c)   _istalpha(WXWCHAR_T_CAST(c))


@@ -299,7 +308,11 @@
     #define  wxFgetc     _fgettc
     #define  wxFgetchar  _fgettchar
     #define  wxFgets     _fgetts
     #define  wxFgetc     _fgettc
     #define  wxFgetchar  _fgettchar
     #define  wxFgets     _fgetts

-    #define  wxFopen     _tfopen
+    #if wxUSE_UNICODE_MSLU
+        #define  wxFopen    wxMSLU__tfopen
+    #else
+        #define  wxFopen     _tfopen
+    #endif

     #define  wxFputc     _fputtc
     #define  wxFputchar  _fputtchar
     #define  wxFprintf   _ftprintf
     #define  wxFputc     _fputtc
     #define  wxFputchar  _fputtchar
     #define  wxFprintf   _ftprintf


@@ -360,7 +373,13 @@
     #define  wxAtoi      _ttoi
     #define  wxAtol      _ttol
     /* #define  wxAtof   _tttof -- notice that there is no such thing (why?) */
     #define  wxAtoi      _ttoi
     #define  wxAtol      _ttol
     /* #define  wxAtof   _tttof -- notice that there is no such thing (why?) */

-    #define  wxGetenv    _tgetenv
+    /* there are no env vars at all under CE, so no _tgetenv neither */
+    #ifdef __WXWINCE__
+        /* can't define as inline function as this is a C file... */
+        #define wxGetenv(name)  ((wxChar *)NULL)
+    #else
+        #define  wxGetenv    _tgetenv
+    #endif

     #define  wxSystem    _tsystem
 
     /* time.h functions */
     #define  wxSystem    _tsystem
 
     /* time.h functions */


@@ -369,22 +388,22 @@
 #else /* !TCHAR-aware compilers */
 
     #if !defined(__MWERKS__) && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
 #else /* !TCHAR-aware compilers */
 
     #if !defined(__MWERKS__) && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )

-        /* even though they are defined and "implemented", they are bad and just 
+        /* even though they are defined and "implemented", they are bad and just

            stubs so we need our own - we need these even in ANSI builds!! */
         #define mbstowcs wxInternalMbstowcs
         #define wcstombs wxInternalWcstombs
            stubs so we need our own - we need these even in ANSI builds!! */
         #define mbstowcs wxInternalMbstowcs
         #define wcstombs wxInternalWcstombs

-        
+

         WXDLLIMPEXP_BASE size_t wxInternalMbstowcs (wchar_t *, const char *, size_t);
         WXDLLIMPEXP_BASE size_t wxInternalMbstowcs (wchar_t *, const char *, size_t);

-        WXDLLIMPEXP_BASE size_t        wxInternalWcstombs (char *, const wchar_t *, size_t);
+        WXDLLIMPEXP_BASE size_t wxInternalWcstombs (char *, const wchar_t *, size_t);

     #endif
     #endif

-    
+

     /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */
     #if !defined(__MWERKS__) && wxUSE_UNICODE && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
     /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */
     #if !defined(__MWERKS__) && wxUSE_UNICODE && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )

-        
+

         /* we need everything! */
         #define wxNEED_WX_STRING_H
         #define wxNEED_WX_CTYPE_H
         /* we need everything! */
         #define wxNEED_WX_STRING_H
         #define wxNEED_WX_CTYPE_H

-        
+

         #define  wxFgetchar(c)  wxFgetc(c, stdin)
         #define  wxFputc     wxPutc
         #define  wxFputchar(c)  wxPutc(c, stdout)
         #define  wxFgetchar(c)  wxFgetc(c, stdin)
         #define  wxFputc     wxPutc
         #define  wxFputchar(c)  wxPutc(c, stdout)


@@ -401,11 +420,11 @@
         #define wxNEED_FPUTS
         #define wxNEED_PUTS
         #define wxNEED_PUTC
         #define wxNEED_FPUTS
         #define wxNEED_PUTS
         #define wxNEED_PUTC

- 
+

         int wxFputs(const wxChar *ch, FILE *stream);
         int wxPuts(const wxChar *ws);
         int wxPutc(wxChar ch, FILE *stream);
         int wxFputs(const wxChar *ch, FILE *stream);
         int wxPuts(const wxChar *ws);
         int wxPutc(wxChar ch, FILE *stream);

-        
+

         #ifdef __cplusplus
         extern "C" {
         #endif
         #ifdef __cplusplus
         extern "C" {
         #endif


@@ -415,12 +434,12 @@
         #endif
 
         #define wxPutchar(wch) wxPutc(wch, stdout)
         #endif
 
         #define wxPutchar(wch) wxPutc(wch, stdout)

-            
+

         #define wxNEED_PRINTF_CONVERSION
         #define wxNEED_WX_STDIO_H
         #define wxNEED_WX_STDLIB_H
         #define wxNEED_WX_TIME_H
         #define wxNEED_PRINTF_CONVERSION
         #define wxNEED_WX_STDIO_H
         #define wxNEED_WX_STDLIB_H
         #define wxNEED_WX_TIME_H

-                
+

     #elif wxUSE_UNICODE
         #include <wctype.h>
 
     #elif wxUSE_UNICODE
         #include <wctype.h>
 


@@ -699,12 +718,12 @@
             defined(__EMX__) || defined(__DJGPP__)
         #define wxStricmp stricmp
         #define wxStrnicmp strnicmp
             defined(__EMX__) || defined(__DJGPP__)
         #define wxStricmp stricmp
         #define wxStrnicmp strnicmp

-    #elif defined(__PALMOS__)
-        /* FIXME: There is no equivalent to strnicmp in the Palm OS API.  This 
-         * quick hack should do until one can be written. 
+    #elif defined(__WXPALMOS__)
+        /* FIXME: There is no equivalent to strnicmp in the Palm OS API.  This
+         * quick hack should do until one can be written.

          */
         #define wxStricmp StrCaselessCompare
          */
         #define wxStricmp StrCaselessCompare

-        #define wxStrnicmp strnicmp       
+        #define wxStrnicmp strnicmp

     #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
             (defined(__MWERKS__) && defined(__INTEL__))
         #define wxStricmp _stricmp
     #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
             (defined(__MWERKS__) && defined(__INTEL__))
         #define wxStricmp _stricmp


@@ -759,7 +778,11 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
    headers, so we need to declare it ourselves to be able to use it.
  */
 #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
    headers, so we need to declare it ourselves to be able to use it.
  */
 #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)

+#ifdef __cplusplus

     extern "C"
     extern "C"

+#else
+    extern
+#endif

     int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif /* !HAVE_VSNPRINTF_DECL */
 
     int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif /* !HAVE_VSNPRINTF_DECL */
 


@@ -944,14 +967,14 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
     WXDLLIMPEXP_BASE char *strdup(const char* s);
 #endif
 
     WXDLLIMPEXP_BASE char *strdup(const char* s);
 #endif
 

-/* RN: Used only under OSX <= 10.2 currently 
+/* RN: Used only under OSX <= 10.2 currently

    The __cplusplus ifdefs are messy, but they are required to build
    the regex library, since c does not support function overloading
 */
 #ifdef wxNEED_WX_STRING_H
    The __cplusplus ifdefs are messy, but they are required to build
    the regex library, since c does not support function overloading
 */
 #ifdef wxNEED_WX_STRING_H

-#      ifdef __cplusplus
+# ifdef __cplusplus

     extern "C" {
     extern "C" {

-#      endif
+# endif

         WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
         WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
         WXDLLIMPEXP_BASE int      wxStrcmp(const wxChar *s1, const wxChar *s2);
         WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
         WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
         WXDLLIMPEXP_BASE int      wxStrcmp(const wxChar *s1, const wxChar *s2);


@@ -965,9 +988,9 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
         WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
         WXDLLIMPEXP_BASE size_t   wxStrspn(const wxChar *s, const wxChar *accept);
         WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
         WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
         WXDLLIMPEXP_BASE size_t   wxStrspn(const wxChar *s, const wxChar *accept);
         WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);

-#      ifdef __cplusplus       
+# ifdef __cplusplus

     }
     }

-#      endif
+# endif

 
     /* These functions use C++, so we can't c extern them */
     WXDLLIMPEXP_BASE double   wxStrtod(const wxChar *nptr, wxChar **endptr);
 
     /* These functions use C++, so we can't c extern them */
     WXDLLIMPEXP_BASE double   wxStrtod(const wxChar *nptr, wxChar **endptr);


@@ -1095,25 +1118,25 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
     #define wxWX2WC wxMB2WC
 #endif
 
     #define wxWX2WC wxMB2WC
 #endif
 

-//
-// RN:  The following are not normal versions of memcpy et al., rather
-// these are either char or widechar versions depending on 
-// if unicode is used or not.
-//
+/*
+    RN:  The following are not normal versions of memcpy et al., rather
+    these are either char or widechar versions depending on
+    if unicode is used or not.
+*/

 
 #ifdef __cplusplus
 
     //
 
 #ifdef __cplusplus
 
     //

-    // RN: We could do the usual tricky compiler detection here,
+    //  RN: We could do the usual tricky compiler detection here,

     //  and use their variant (such as wmemchr, etc.).  The problem
     //  and use their variant (such as wmemchr, etc.).  The problem

-    //  is that these functions are quite rare, even though they are 
+    //  is that these functions are quite rare, even though they are

     //  part of the current POSIX standard.  In addition, most compilers
     //  (including even MSC) inline them just like we do right in their
     //  headers.
     //
     #if wxUSE_UNICODE
         #include <string.h> //for mem funcs
     //  part of the current POSIX standard.  In addition, most compilers
     //  (including even MSC) inline them just like we do right in their
     //  headers.
     //
     #if wxUSE_UNICODE
         #include <string.h> //for mem funcs

-        
+

         //implement our own wmem variants
         inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
         {
         //implement our own wmem variants
         inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
         {