fix assert when leaving control with wxDP_ALLOWNONE style (patch 1190145)

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

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index a2d04920815668fd1ebdaa9edaf4feb8940694ab..98e39364049d9ce118187ae6ed17749cce260d4e 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -5,7 +5,7 @@
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$

- * Copyright:   (c) 1998-2002 wxWidgets dev team
+ * Copyright:   (c) 1998-2002 Joel Farley, Ove Kåven, Robert Roebling, Ron Lee

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


@@ -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__)


@@ -372,7 +376,7 @@
     /* 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... */
     /* 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)  NULL
+        #define wxGetenv(name)  ((wxChar *)NULL)

     #else
         #define  wxGetenv    _tgetenv
     #endif
     #else
         #define  wxGetenv    _tgetenv
     #endif


@@ -381,16 +385,19 @@
     /* time.h functions */
     #define  wxAsctime   _tasctime
     #define  wxCtime     _tctime
     /* time.h functions */
     #define  wxAsctime   _tasctime
     #define  wxCtime     _tctime

+    
+    #define wxMbstowcs mbstowcs
+    #define wxWcstombs wcstombs

 #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
            stubs so we need our own - we need these even in ANSI builds!! */
 #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
            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 wxInternalWcstombs (char *, const wchar_t *, size_t);
+        WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t *, const char *, size_t);
+        WXDLLIMPEXP_BASE size_t wxWcstombs (char *, const wchar_t *, size_t);
+    #else
+        #define wxMbstowcs mbstowcs
+        #define wxWcstombs wcstombs

     #endif
 
     /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */
     #endif
 
     /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */


@@ -466,24 +473,24 @@
             #endif /* gcc/!gcc */
 
             /* string.h functions (wchar.h) */
             #endif /* gcc/!gcc */
 
             /* string.h functions (wchar.h) */

-            #define  wxStrcat    wcscat
-            #define  wxStrchr    wcschr
-            #define  wxStrcmp    wcscmp
-            #define  wxStrcoll   wcscoll
-            #define  wxStrcpy    wcscpy
-            #define  wxStrcspn   wcscspn
+            #define  wxStrcat    ::wcscat
+            #define  wxStrchr    ::wcschr
+            #define  wxStrcmp    ::wcscmp
+            #define  wxStrcoll   ::wcscoll
+            #define  wxStrcpy    ::wcscpy
+            #define  wxStrcspn   ::wcscspn

             #define  wxStrlen_   wxWcslen /* wxStrlen_() is used in wxStrlen() */
             #define  wxStrlen_   wxWcslen /* wxStrlen_() is used in wxStrlen() */

-            #define  wxStrncat   wcsncat
-            #define  wxStrncmp   wcsncmp
-            #define  wxStrncpy   wcsncpy
-            #define  wxStrpbrk   wcspbrk
-            #define  wxStrrchr   wcsrchr
-            #define  wxStrspn    wcsspn
-            #define  wxStrstr    wcsstr
-            #define  wxStrtod    wcstod
-            #define  wxStrtol    wcstol
-            #define  wxStrtoul   wcstoul
-            #define  wxStrxfrm   wcsxfrm
+            #define  wxStrncat   ::wcsncat
+            #define  wxStrncmp   ::wcsncmp
+            #define  wxStrncpy   ::wcsncpy
+            #define  wxStrpbrk   ::wcspbrk
+            #define  wxStrrchr   ::wcsrchr
+            #define  wxStrspn    ::wcsspn
+            #define  wxStrstr    ::wcsstr
+            #define  wxStrtod    ::wcstod
+            #define  wxStrtol    ::wcstol
+            #define  wxStrtoul   ::wcstoul
+            #define  wxStrxfrm   ::wcsxfrm

 
             #define  wxFgetc     fgetwc
             #define  wxFgetchar  fgetwchar
 
             #define  wxFgetc     fgetwc
             #define  wxFgetchar  fgetwchar