X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/525d858363f08a3d774b494bd8df19e4ab7c9dc0..588c80dea16b3ab32c7f1f8f15b62eb4450a20a9:/src/common/wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 5af0fe3c94..9044dfb689 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "wxchar.h"
-#endif
-
 // ===========================================================================
 // headers, declarations, constants
 // ===========================================================================
@@ -65,7 +61,7 @@ using namespace std ;
 size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   // assume that we have mbsrtowcs() too if we have wcsrtombs()
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   mbstate_t mbstate;
   memset(&mbstate, 0, sizeof(mbstate_t));
 #endif
@@ -78,20 +74,20 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 #ifdef HAVE_WCSRTOMBS
     return mbsrtowcs(buf, &psz, n, &mbstate);
 #else
-    return mbstowcs(buf, psz, n);
+    return wxMbstowcs(buf, psz, n);
 #endif
   }
 
 #ifdef HAVE_WCSRTOMBS
   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
 #else
-  return mbstowcs((wchar_t *) NULL, psz, 0);
+  return wxMbstowcs((wchar_t *) NULL, psz, 0);
 #endif
 }
 
 size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 {
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   mbstate_t mbstate;
   memset(&mbstate, 0, sizeof(mbstate_t));
 #endif
@@ -102,17 +98,17 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
       if (n) *buf = '\0';
       return 0;
     }
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
     return wcsrtombs(buf, &pwz, n, &mbstate);
 #else
-    return wcstombs(buf, pwz, n);
+    return wxWcstombs(buf, pwz, n);
 #endif
   }
 
-#if HAVE_WCSRTOMBS
+#ifdef HAVE_WCSRTOMBS
   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
 #else
-  return wcstombs((char *) NULL, pwz, 0);
+  return wxWcstombs((char *) NULL, pwz, 0);
 #endif
 }
 #endif // wxUSE_WCHAR_T
@@ -1072,7 +1068,7 @@ WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 
 #if defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
 
-WXDLLEXPORT size_t wxInternalMbstowcs (wchar_t * out, const char * in, size_t outlen)
+WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
 {
     if (!out)
     {
@@ -1094,7 +1090,7 @@ WXDLLEXPORT size_t wxInternalMbstowcs (wchar_t * out, const char * in, size_t ou
     return in - origin;
 }
 
-WXDLLEXPORT size_t	wxInternalWcstombs (char * out, const wchar_t * in, size_t outlen)
+WXDLLEXPORT size_t	wxWcstombs (char * out, const wchar_t * in, size_t outlen)
 {
     if (!out)
     {
@@ -1199,9 +1195,9 @@ int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
 #ifndef wxSetlocale
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
 {
-    char *localeOld = setlocale(category, wxConvLocal.cWX2MB(locale));
+    char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale));
 
-    return wxWCharBuffer(wxConvLocal.cMB2WC(localeOld));
+    return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld));
 }
 #endif
 
@@ -1369,7 +1365,7 @@ WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
   }
 
   wxString data(nptr, nptr-start);
-  wxWX2MBbuf dat = data.mb_str(wxConvLocal);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);
   char *rdat = wxMBSTRINGCAST dat;
   double ret = strtod(dat, &rdat);
 
@@ -1397,7 +1393,7 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
          (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
 
   wxString data(start, nptr-start);
-  wxWX2MBbuf dat = data.mb_str(wxConvLocal);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);
   char *rdat = wxMBSTRINGCAST dat;
   long int ret = strtol(dat, &rdat, base);
 
@@ -1454,7 +1450,7 @@ double   WXDLLEXPORT wxAtof(const wxChar *psz)
     else
         return 0.0;
 #else
-    return atof(wxConvLocal.cWX2MB(psz));
+    return atof(wxConvLibc.cWX2MB(psz));
 #endif
 }
 #endif
@@ -1462,12 +1458,12 @@ double   WXDLLEXPORT wxAtof(const wxChar *psz)
 #ifdef wxNEED_WX_STDLIB_H
 int      WXDLLEXPORT wxAtoi(const wxChar *psz)
 {
-  return atoi(wxConvLocal.cWX2MB(psz));
+  return atoi(wxConvLibc.cWX2MB(psz));
 }
 
 long     WXDLLEXPORT wxAtol(const wxChar *psz)
 {
-  return atol(wxConvLocal.cWX2MB(psz));
+  return atol(wxConvLibc.cWX2MB(psz));
 }
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
@@ -1477,7 +1473,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
     //     time getenv() is called, so it is OK to use static string
     //     buffer to hold the data.
     static wxWCharBuffer value((wxChar*)NULL);
-    value = wxConvLocal.cMB2WX(getenv(wxConvLocal.cWX2MB(name)));
+    value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name)));
     return value.data();
 #else
     return getenv(name);
@@ -1486,7 +1482,7 @@ wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 
 int WXDLLEXPORT wxSystem(const wxChar *psz)
 {
-    return system(wxConvLocal.cWX2MB(psz));
+    return system(wxConvLibc.cWX2MB(psz));
 }
 
 #endif // wxNEED_WX_STDLIB_H
@@ -1500,7 +1496,7 @@ wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
 
     wxCharBuffer buf(maxsize);
 
-    wxCharBuffer bufFmt(wxConvLocal.cWX2MB(fmt));
+    wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt));
     if ( !bufFmt )
         return 0;
 
@@ -1508,7 +1504,7 @@ wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
     if  ( !ret )
         return 0;
 
-    wxWCharBuffer wbuf = wxConvLocal.cMB2WX(buf);
+    wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf);
     if ( !wbuf )
         return 0;
 
@@ -1520,10 +1516,14 @@ wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
 #ifndef wxCtime
 WXDLLEXPORT wxChar *wxCtime(const time_t *timep)
 {
-    static wxChar   buf[128];
+    // normally the string is 26 chars but give one more in case some broken
+    // DOS compiler decides to use "\r\n" instead of "\n" at the end
+    static wxChar buf[27];
 
-    wxStrncpy( buf, wxConvertMB2WX( ctime( timep ) ), sizeof( buf ) );
-    buf[ sizeof( buf ) - 1 ] = _T('\0');
+    // ctime() is guaranteed to return a string containing only ASCII
+    // characters, as its format is always the same for any locale
+    wxStrncpy(buf, wxString::FromAscii(ctime(timep)), WXSIZEOF(buf));
+    buf[WXSIZEOF(buf) - 1] = _T('\0');
 
     return buf;
 }
@@ -1574,7 +1574,7 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 
-#if wxNEED_STRDUP
+#ifdef wxNEED_STRDUP
 
 char *strdup(const char *s)
 {
@@ -1596,3 +1596,11 @@ void *calloc( size_t num, size_t size )
 
 #endif // __WXWINCE__ <= 211
 
+#ifdef __WXWINCE__
+
+int wxRemove(const wxChar *path)
+{
+    return ::DeleteFile(path) == 0;
+}
+
+#endif