linking fixes

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index cad23ca412e05bc5d82f60706f4ec59b3e11f68e..f9e73aed8a35434b91f3e26ed5327a9179a97027 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -52,7 +52,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {
     if (!n || !*psz) {
 {
   if (buf) {
     if (!n || !*psz) {

-      if (n) *buf = T('\0');
+      if (n) *buf = wxT('\0');

       return 0;
     }
     return mbstowcs(buf, psz, n);
       return 0;
     }
     return mbstowcs(buf, psz, n);


@@ -63,7 +63,7 @@ size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick

-  mbstate_t mbstate;  
+  mbstate_t mbstate;

   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
 #else  // !GNU libc
   return mbstowcs((wchar_t *) NULL, psz, 0);
   return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
 #else  // !GNU libc
   return mbstowcs((wchar_t *) NULL, psz, 0);


@@ -86,7 +86,7 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick
 #if wxUSE_WCSRTOMBS
   // don't know if it's really needed (or if we can pass NULL), but better safe
   // than quick

-  mbstate_t mbstate;  
+  mbstate_t mbstate;

   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
 #else  // !GNU libc
   return wcstombs((char *) NULL, pwz, 0);
   return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
 #else  // !GNU libc
   return wcstombs((char *) NULL, pwz, 0);


@@ -97,13 +97,13 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
 bool WXDLLEXPORT wxOKlibc()
 {
 #if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)
 bool WXDLLEXPORT wxOKlibc()
 {
 #if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__)

-  // GNU libc uses UTF-8 even when it shouldn't
-  wchar_t res;
+  // glibc 2.0 uses UTF-8 even when it shouldn't
+  wchar_t res = 0;

   if ((MB_CUR_MAX == 2) &&
   if ((MB_CUR_MAX == 2) &&

-      (wxMB2WC(&res, "\xdd\xa5", 1)>0) &&
+      (wxMB2WC(&res, "\xdd\xa5", 1) == 1) &&

       (res==0x765)) {
     // this is UTF-8 allright, check whether that's what we want
       (res==0x765)) {
     // this is UTF-8 allright, check whether that's what we want

-    char *cur_locale = setlocale(LC_ALL, NULL);
+    char *cur_locale = setlocale(LC_CTYPE, NULL);

     if ((strlen(cur_locale) < 4) ||
        (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
       // nope, don't use libc conversion
     if ((strlen(cur_locale) < 4) ||
        (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8"))) {
       // nope, don't use libc conversion


@@ -181,7 +181,7 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
   psz = wxStrpbrk(psz, delim);
   if (!psz) *save_ptr = (wxChar*)NULL;
   else {
   psz = wxStrpbrk(psz, delim);
   if (!psz) *save_ptr = (wxChar*)NULL;
   else {

-    *psz = T('\0');
+    *psz = wxT('\0');

     *save_ptr = psz + 1;
   }
   return ret;
     *save_ptr = psz + 1;
   }
   return ret;


@@ -189,11 +189,11 @@ WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_pt
 #endif
 
 #ifndef wxSetlocale
 #endif
 
 #ifndef wxSetlocale

-WXDLLEXPORT wxChar * wxSetlocale(int category, const wxChar *locale)
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)

 {
 {

-  setlocale(category, wxConvLibc.cWX2MB(locale));
-  // FIXME
-  return (wxChar *)NULL;
+    char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale));
+
+    return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld));

 }
 #endif
 
 }
 #endif
 


@@ -292,15 +292,15 @@ WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
 
   // FIXME: only correct for C locale
   while (wxIsspace(*nptr)) nptr++;
 
   // FIXME: only correct for C locale
   while (wxIsspace(*nptr)) nptr++;

-  if (*nptr == T('+') || *nptr == T('-')) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;

   while (wxIsdigit(*nptr)) nptr++;
   while (wxIsdigit(*nptr)) nptr++;

-  if (*nptr == T('.')) {
+  if (*nptr == wxT('.')) {

     nptr++;
     while (wxIsdigit(*nptr)) nptr++;
   }
     nptr++;
     while (wxIsdigit(*nptr)) nptr++;
   }

-  if (*nptr == T('E') || *nptr == T('e')) {
+  if (*nptr == wxT('E') || *nptr == wxT('e')) {

     nptr++;
     nptr++;

-    if (*nptr == T('+') || *nptr == T('-')) nptr++;
+    if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;

     while (wxIsdigit(*nptr)) nptr++;
   }
 
     while (wxIsdigit(*nptr)) nptr++;
   }
 


@@ -320,17 +320,17 @@ WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
 
   // FIXME: only correct for C locale
   while (wxIsspace(*nptr)) nptr++;
 
   // FIXME: only correct for C locale
   while (wxIsspace(*nptr)) nptr++;

-  if (*nptr == T('+') || *nptr == T('-')) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;

   if (((base == 0) || (base == 16)) &&
   if (((base == 0) || (base == 16)) &&

-      (nptr[0] == T('0') && nptr[1] == T('x'))) {
+      (nptr[0] == wxT('0') && nptr[1] == wxT('x'))) {

     nptr += 2;
     base = 16;
   }
     nptr += 2;
     base = 16;
   }

-  else if ((base == 0) && (nptr[0] == T('0'))) base = 8;
+  else if ((base == 0) && (nptr[0] == wxT('0'))) base = 8;

   else if (base == 0) base = 10;
 
   else if (base == 0) base = 10;
 

-  while ((wxIsdigit(*nptr) && (*nptr - T('0') < base)) ||
-         (wxIsalpha(*nptr) && (wxToupper(*nptr) - T('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(wxConvLibc);
 
   wxString data(nptr, nptr-start);
   wxWX2MBbuf dat = data.mb_str(wxConvLibc);


@@ -354,6 +354,16 @@ WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *strea
   return freopen(wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode), stream);
 }
 
   return freopen(wxConvFile.cWX2MB(path), wxConvLibc.cWX2MB(mode), stream);
 }
 

+WXDLLEXPORT int wxRemove(const wxChar *path)
+{
+  return remove(wxConvFile.cWX2MB(path));
+}
+
+WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath)
+{
+  return rename(wxConvFile.cWX2MB(oldpath), wxConvFile.cWX2MB(newpath));
+}
+

 int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...)
 {
   va_list argptr;
 int WXDLLEXPORT wxPrintf(const wxChar *fmt, ...)
 {
   va_list argptr;