added wxWS_EX_VALIDATE_RECURSIVELY

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index c09896179c24660590c198041c1b383adcd5eaba..75e2858629cefe54bd5940acbab1ee4246bc9502 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -5,7 +5,7 @@
 // Modified by: Ron Lee
 // Created:     09/04/99
 // RCS-ID:      $Id$
 // Modified by: Ron Lee
 // Created:     09/04/99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows copyright
+// Copyright:   (c) wxWidgets copyright

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


@@ -53,6 +53,7 @@
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000
 #endif
 
 #if defined(__MWERKS__) && __MSL__ >= 0x6000

+namespace std {}

 using namespace std ;
 #endif
 
 using namespace std ;
 #endif
 


@@ -130,11 +131,11 @@ bool WXDLLEXPORT wxOKlibc()
             (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
             (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
       // nope, don't use libc conversion
             (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
             (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
       // nope, don't use libc conversion

-      return FALSE;
+      return false;

     }
   }
 #endif
     }
   }
 #endif

-  return TRUE;
+  return true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -180,10 +181,10 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         {
             static char s_szFlags[256] = "%";
             size_t flagofs = 1;
         {
             static char s_szFlags[256] = "%";
             size_t flagofs = 1;

-            bool adj_left = FALSE,
-                 in_prec = FALSE,
-                 prec_dot = FALSE,
-                 done = FALSE;
+            bool adj_left = false,
+                 in_prec = false,
+                 prec_dot = false,
+                 done = false;

             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;
             int ilen = 0;
             size_t min_width = 0,
                    max_width = wxSTRING_MAXLEN;


@@ -194,7 +195,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                 if (in_prec && !prec_dot) \
                 { \
                     s_szFlags[flagofs++] = '.'; \
                 if (in_prec && !prec_dot) \
                 { \
                     s_szFlags[flagofs++] = '.'; \

-                    prec_dot = TRUE; \
+                    prec_dot = true; \

                 }
 
 #define APPEND_CH(ch) \
                 }
 
 #define APPEND_CH(ch) \


@@ -220,12 +221,12 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 
                     case wxT('\0'):
                         APPEND_CH(_T('\0'));
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('%'):
                         APPEND_CH(_T('%'));
                         break;
 
                     case wxT('%'):
                         APPEND_CH(_T('%'));

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('#'):
                         break;
 
                     case wxT('#'):


@@ -239,14 +240,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
 
                     case wxT('-'):
                         CHECK_PREC
 
                     case wxT('-'):
                         CHECK_PREC

-                        adj_left = TRUE;
+                        adj_left = true;

                         s_szFlags[flagofs++] = ch;
                         break;
 
                     case wxT('.'):
                         CHECK_PREC
                         s_szFlags[flagofs++] = ch;
                         break;
 
                     case wxT('.'):
                         CHECK_PREC

-                        in_prec = TRUE;
-                        prec_dot = FALSE;
+                        in_prec = true;
+                        prec_dot = false;

                         max_width = 0;
                         // dot will be auto-added to s_szFlags if non-negative
                         // number follows
                         max_width = 0;
                         // dot will be auto-added to s_szFlags if non-negative
                         // number follows


@@ -372,7 +373,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('e'):
                         break;
 
                     case wxT('e'):


@@ -400,7 +401,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             APPEND_STR(tmp);
                         }
 
                             APPEND_STR(tmp);
                         }
 

-                        done = TRUE;
+                        done = true;

                         break;
 
                     case wxT('p'):
                         break;
 
                     case wxT('p'):


@@ -415,7 +416,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                                 wxConvLibc.cMB2WX(szScratch);
                             APPEND_STR(tmp);
 
                                 wxConvLibc.cMB2WX(szScratch);
                             APPEND_STR(tmp);
 

-                            done = TRUE;
+                            done = true;

                         }
                         break;
 
                         }
                         break;
 


@@ -447,7 +448,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                                 for (i = 1; i < min_width; i++)
                                     APPEND_CH(_T(' '));
 
                                 for (i = 1; i < min_width; i++)
                                     APPEND_CH(_T(' '));
 

-                            done = TRUE;
+                            done = true;

                         }
                         break;
 
                         }
                         break;
 


@@ -500,7 +501,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             }
                             else
                             {
                             }
                             else
                             {

-                                val = wxT("");
+                                val = wxEmptyString;

                                 len = 0;
                             }
 
                                 len = 0;
                             }
 


@@ -517,7 +518,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                                 for (i = len; i < min_width; i++)
                                     APPEND_CH(_T(' '));
 
                                 for (i = len; i < min_width; i++)
                                     APPEND_CH(_T(' '));
 

-                            done = TRUE;
+                            done = true;

                         }
                         break;
 
                         }
                         break;
 


@@ -537,14 +538,14 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }
                             long int *val = va_arg(argptr, long int *);
                             *val = lenCur;
                         }

-                        done = TRUE;
+                        done = true;

                         break;
 
                     default:
                         // bad format, leave unchanged
                         APPEND_CH(_T('%'));
                         APPEND_CH(ch);
                         break;
 
                     default:
                         // bad format, leave unchanged
                         APPEND_CH(_T('%'));
                         APPEND_CH(ch);

-                        done = TRUE;
+                        done = true;

                         break;
                 }
             }
                         break;
                 }
             }


@@ -604,23 +605,39 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
 // implement the standard IO functions for wide char if libc doesn't have them
 // ----------------------------------------------------------------------------
 
 // implement the standard IO functions for wide char if libc doesn't have them
 // ----------------------------------------------------------------------------
 

-#ifdef wxNEED_FPUTWC
-
+#ifdef wxNEED_FPUTS

 int wxFputs(const wchar_t *ws, FILE *stream)
 {
     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error
     return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
 }
 int wxFputs(const wchar_t *ws, FILE *stream)
 {
     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error
     return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
 }

+#endif // wxNEED_FPUTS
+
+#ifdef wxNEED_PUTS
+int wxPuts(const wxChar *ws)
+{
+    int rc = wxFputs(ws, stdout);
+    if ( rc != -1 )
+    {
+        if ( wxFputs(L"\n", stdout) == -1 )
+            return -1;
+
+        rc++;
+    }
+
+    return rc;
+}
+#endif // wxNEED_PUTS

 
 

+#ifdef wxNEED_PUTC

 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {
     wchar_t ws[2] = { wc, L'\0' };
 
     return wxFputs(ws, stream);
 }
 int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
 {
     wchar_t ws[2] = { wc, L'\0' };
 
     return wxFputs(ws, stream);
 }

-
-#endif // wxNEED_FPUTWC
+#endif // wxNEED_PUTC

 
 // NB: we only implement va_list functions here, the ones taking ... are
 //     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse
 
 // NB: we only implement va_list functions here, the ones taking ... are
 //     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse


@@ -637,9 +654,19 @@ int vwscanf(const wxChar *format, va_list argptr)
 
 int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)
 {
 
 int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)
 {

-    wxFAIL_MSG( _T("TODO") );
-
-    return -1;
+    // The best we can do without proper Unicode support in glibc is to
+    // convert the strings into MB representation and run ANSI version
+    // of the function. This doesn't work with %c and %s because of difference
+    // in size of char and wchar_t, though.
+
+    wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %s") );
+    wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %c") );
+
+    va_list argcopy;
+    wxVaCopy(argcopy, argptr);
+    return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy);

 }
 
 int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)
 }
 
 int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)


@@ -704,7 +731,7 @@ int vwprintf(const wxChar *format, va_list argptr)
    So to use native functions in order to get our semantics we must do the
    following translations in Unicode mode (nothing to do in ANSI mode):
 
    So to use native functions in order to get our semantics we must do the
    following translations in Unicode mode (nothing to do in ANSI mode):
 

-   wxWindows specifier      POSIX specifier
+   wxWidgets specifier      POSIX specifier

    ----------------------------------------
 
    %hc, %C, %hC             %c
    ----------------------------------------
 
    %hc, %C, %hC             %c


@@ -1043,6 +1070,85 @@ WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); }
 WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 
 WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 

+#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)
+{
+    if (!out)
+    {
+        size_t outsize = 0;
+        while(*in++)
+            outsize++;
+        return outsize;
+    }
+
+    const char* origin = in;
+
+    while (outlen-- && *in)
+    {
+        *out++ = (wchar_t) *in++;
+    }
+
+    *out = '\0';
+
+    return in - origin;
+}
+
+WXDLLEXPORT size_t     wxInternalWcstombs (char * out, const wchar_t * in, size_t outlen)
+{
+    if (!out)
+    {
+        size_t outsize = 0;
+        while(*in++)
+            outsize++;
+        return outsize;
+    }
+
+    const wchar_t* origin = in;
+
+    while (outlen-- && *in)
+    {
+        *out++ = (char) *in++;
+    }
+
+    *out = '\0';
+
+    return in - origin;
+}
+
+#if defined(wxNEED_WX_CTYPE_H)
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#define cfalnumset CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric)
+#define cfalphaset CFCharacterSetGetPredefined(kCFCharacterSetLetter)
+#define cfcntrlset CFCharacterSetGetPredefined(kCFCharacterSetControl)
+#define cfdigitset CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit)
+//CFCharacterSetRef cfgraphset = kCFCharacterSetControl && !' '
+#define cflowerset CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter)
+//CFCharacterSetRef cfprintset = !kCFCharacterSetControl
+#define cfpunctset CFCharacterSetGetPredefined(kCFCharacterSetPunctuation)
+#define cfspaceset CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline)
+#define cfupperset CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter)
+
+WXDLLEXPORT int wxIsalnum(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalnumset, ch); }
+WXDLLEXPORT int wxIsalpha(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalphaset, ch); }
+WXDLLEXPORT int wxIscntrl(wxChar ch) { return CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIsdigit(wxChar ch) { return CFCharacterSetIsCharacterMember(cfdigitset, ch); }
+WXDLLEXPORT int wxIsgraph(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch) && ch != ' '; }
+WXDLLEXPORT int wxIslower(wxChar ch) { return CFCharacterSetIsCharacterMember(cflowerset, ch); }
+WXDLLEXPORT int wxIsprint(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIspunct(wxChar ch) { return CFCharacterSetIsCharacterMember(cfpunctset, ch); }
+WXDLLEXPORT int wxIsspace(wxChar ch) { return CFCharacterSetIsCharacterMember(cfspaceset, ch); }
+WXDLLEXPORT int wxIsupper(wxChar ch) { return CFCharacterSetIsCharacterMember(cfupperset, ch); }
+WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxIsdigit(ch) || (ch>='a' && ch<='f') || (ch>='A' && ch<='F'); }
+WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)tolower((char)(ch)); }
+WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)toupper((char)(ch)); }
+
+#endif  // wxNEED_WX_CTYPE_H
+
+#endif  // defined(__DARWIN__) and OSX <= 10.2
+

 #ifndef wxStrdupA
 
 WXDLLEXPORT char *wxStrdupA(const char *s)
 #ifndef wxStrdupA
 
 WXDLLEXPORT char *wxStrdupA(const char *s)


@@ -1093,9 +1199,20 @@ int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
 #ifndef wxSetlocale
 WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
 {
 #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
+
+#if wxUSE_WCHAR_T && !defined(HAVE_WCSLEN)
+WXDLLEXPORT size_t wxWcslen(const wchar_t *s)
+{
+    size_t n = 0;
+    while ( *s++ )
+        n++;
+
+    return n;

 }
 #endif
 
 }
 #endif
 


@@ -1104,6 +1221,12 @@ WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
 // ----------------------------------------------------------------------------
 
 #ifdef wxNEED_WX_STRING_H
 // ----------------------------------------------------------------------------
 
 #ifdef wxNEED_WX_STRING_H

+
+// RN:  These need to be c externed for the regex lib
+#ifdef __cplusplus
+extern "C" {
+#endif
+

 WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
 {
   wxChar *ret = dest;
 WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
 {
   wxChar *ret = dest;


@@ -1139,6 +1262,16 @@ WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src)
   return ret;
 }
 
   return ret;
 }
 

+WXDLLEXPORT size_t wxStrlen_(const wxChar *s)
+{
+    size_t n = 0;
+    while ( *s++ )
+        n++;
+
+    return n;
+}
+
+

 WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n)
 {
   wxChar *ret = dest;
 WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n)
 {
   wxChar *ret = dest;


@@ -1196,7 +1329,7 @@ WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
 
 WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
 {
 
 WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
 {

-    wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") );
+    wxASSERT_MSG( needle != NULL, _T("NULL argument in wxStrstr") );

 
     // VZ: this is not exactly the most efficient string search algorithm...
 
 
     // VZ: this is not exactly the most efficient string search algorithm...
 


@@ -1213,6 +1346,10 @@ WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
     return NULL;
 }
 
     return NULL;
 }
 

+#ifdef __cplusplus
+}
+#endif
+

 WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
 {
   const wxChar *start = nptr;
 WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
 {
   const wxChar *start = nptr;


@@ -1232,7 +1369,7 @@ WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
   }
 
   wxString data(nptr, nptr-start);
   }
 
   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);
 
   char *rdat = wxMBSTRINGCAST dat;
   double ret = strtod(dat, &rdat);
 


@@ -1259,8 +1396,8 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
   while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) ||
          (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
 
   while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) ||
          (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
 

-  wxString data(nptr, nptr-start);
-  wxWX2MBbuf dat = data.mb_str(wxConvLocal);
+  wxString data(start, nptr-start);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);

   char *rdat = wxMBSTRINGCAST dat;
   long int ret = strtol(dat, &rdat, base);
 
   char *rdat = wxMBSTRINGCAST dat;
   long int ret = strtol(dat, &rdat, base);
 


@@ -1268,6 +1405,12 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
 
   return ret;
 }
 
   return ret;
 }

+
+WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base)
+{
+    return (unsigned long int) wxStrtol(nptr, endptr, base);
+}
+

 #endif // wxNEED_WX_STRING_H
 
 #ifdef wxNEED_WX_STDIO_H
 #endif // wxNEED_WX_STRING_H
 
 #ifdef wxNEED_WX_STDIO_H


@@ -1311,7 +1454,7 @@ double   WXDLLEXPORT wxAtof(const wxChar *psz)
     else
         return 0.0;
 #else
     else
         return 0.0;
 #else

-    return atof(wxConvLocal.cWX2MB(psz));
+    return atof(wxConvLibc.cWX2MB(psz));

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -1319,84 +1462,72 @@ double   WXDLLEXPORT wxAtof(const wxChar *psz)
 #ifdef wxNEED_WX_STDLIB_H
 int      WXDLLEXPORT wxAtoi(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)
 {
 }
 
 long     WXDLLEXPORT wxAtol(const wxChar *psz)
 {

-  return atol(wxConvLocal.cWX2MB(psz));
+  return atol(wxConvLibc.cWX2MB(psz));

 }
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 {
 }
 
 wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
 {

-  static wxHashTable env;
-
-  // check if we already have stored the converted env var
-  wxObject *data = env.Get(name);
-  if (!data)
-  {
-    // nope, retrieve it,

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxCharBuffer buffer = wxConvLocal.cWX2MB(name);
-    // printf( "buffer %s\n", (const char*) buffer );
-    const char *val = getenv( (const char *)buffer );
+    // NB: buffer returned by getenv() is allowed to be overwritten next
+    //     time getenv() is called, so it is OK to use static string
+    //     buffer to hold the data.
+    static wxWCharBuffer value((wxChar*)NULL);
+    value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name)));
+    return value.data();

 #else
 #else

-    const char *val = getenv( name );
+    return getenv(name);

 #endif
 #endif

-
-    if (!val) return (wxChar *)NULL;
-    // printf( "home %s\n", val );
-
-    // convert it,
-#if wxUSE_UNICODE
-    data = (wxObject *)new wxString(val, wxConvLocal);
-#else
-    data = (wxObject *)new wxString(val);
-#endif
-
-    // and store it
-    env.Put(name, data);
-  }
-  // return converted env var
-  return (wxChar *)((wxString *)data)->c_str();

 }
 
 int WXDLLEXPORT wxSystem(const wxChar *psz)
 {
 }
 
 int WXDLLEXPORT wxSystem(const wxChar *psz)
 {

-    return system(wxConvLocal.cWX2MB(psz));
+    return system(wxConvLibc.cWX2MB(psz));

 }
 
 #endif // wxNEED_WX_STDLIB_H
 
 #ifdef wxNEED_WX_TIME_H
 }
 
 #endif // wxNEED_WX_STDLIB_H
 
 #ifdef wxNEED_WX_TIME_H

-WXDLLEXPORT size_t   wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm)
+WXDLLEXPORT size_t
+wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)

 {
 {

-    if (!max) return 0;
+    if ( !maxsize )
+        return 0;

 
 

-    char *buf = (char *)malloc(max);
-    size_t ret = strftime(buf, max, wxConvLocal.cWX2MB(fmt), tm);
-    if (ret)
-    {
-        wxStrcpy(s, wxConvLocal.cMB2WX(buf));
-        free(buf);
-        return wxStrlen(s);
-    }
-    else
-    {
-        free(buf);
-        *s = 0;
+    wxCharBuffer buf(maxsize);
+
+    wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt));
+    if ( !bufFmt )

         return 0;
         return 0;

-  }
+
+    size_t ret = strftime(buf.data(), maxsize, bufFmt, tm);
+    if  ( !ret )
+        return 0;
+
+    wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf);
+    if ( !wbuf )
+        return 0;
+
+    wxStrncpy(s, wbuf, maxsize);
+    return wxStrlen(s);

 }
 #endif // wxNEED_WX_TIME_H
 
 #ifndef wxCtime
 WXDLLEXPORT wxChar *wxCtime(const time_t *timep)
 {
 }
 #endif // wxNEED_WX_TIME_H
 
 #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;
 }
 
     return buf;
 }


@@ -1447,8 +1578,8 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 
 // missing C RTL functions
 // ----------------------------------------------------------------------------
 

-#if (defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)) || \
-     defined(__WXWINCE__)
+#if wxNEED_STRDUP
+

 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;
 char *strdup(const char *s)
 {
     char *dest = (char*) malloc( strlen( s ) + 1 ) ;


@@ -1456,30 +1587,16 @@ char *strdup(const char *s)
         strcpy( dest , s ) ;
     return dest ;
 }
         strcpy( dest , s ) ;
     return dest ;
 }

-#endif
-
-#if (defined(__MWERKS__) && !defined(__MACH__)) || (defined(__WXWINCE__) && _WIN32_WCE <= 211)
-
-int isascii( int c )
-{
-    return ( c >= 0 && c < 128 );
-}
-#endif
+#endif // wxNEED_STRDUP

 
 #if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
 
 #if defined(__WXWINCE__) && (_WIN32_WCE <= 211)

-#if (_WIN32_WCE < 300)
+

 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }
 void *calloc( size_t num, size_t size )
 {
     void** ptr = (void **)malloc(num * size);
     memset( ptr, 0, num * size);
     return ptr;
 }

-#endif

 
 

-int isspace(int c)
-{
-    return (c == ' ');
-}
-
-#endif
+#endif // __WXWINCE__ <= 211