X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f98e742929e4ec49802f61bdb2d60b94cae0c321..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 98e3936404..604bc2879c 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -21,7 +21,7 @@
 #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 **);
+    char *strtok_r(char *, const char *, char **);
 #endif
 
 /* check whether we have wchar_t and which size it is if we do */
@@ -127,7 +127,9 @@
     #define wxHAVE_TCHAR_SUPPORT
 #elif defined(__DMC__)
     #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 ) && !defined(__WXPALMOS__)
+#elif defined(__WXPALMOS__)
+    #include <stddef.h>
+#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
     #define wxHAVE_TCHAR_SUPPORT
     #include <stddef.h>
     #include <string.h>
@@ -362,7 +364,9 @@
         #define  wxRename    wxMSLU__trename
     #else
         #ifdef __WXWINCE__
-            #define  wxRemove    DeleteFile
+            /* carefully: wxRemove() must return 0 on success while DeleteFile()
+               returns 0 on error, so don't just define one as the other */
+            int wxRemove(const wxChar *path);
         #else
             #define  wxRemove    _tremove
             #define  wxRename    _trename
@@ -385,7 +389,7 @@
     /* time.h functions */
     #define  wxAsctime   _tasctime
     #define  wxCtime     _tctime
-    
+
     #define wxMbstowcs mbstowcs
     #define wxWcstombs wcstombs
 #else /* !TCHAR-aware compilers */
@@ -473,24 +477,24 @@
             #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  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