More Unicode compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 7cf2962bf7060e95e5397cf0ae2d503d77d96110..50b3fad41379d411a18e3337344976b312a2e777 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1057,7 +1057,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 bool wxRemoveFile(const wxString& file)
 {
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
-  int flag = wxRemove(wxFNSTRINGCAST file.fn_str());
+  int flag = wxRemove(file);
 #elif defined( __WXMAC__ )
   int flag = unlink(wxUnix2MacFilename( file ));
 #else

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index caadd90e805cb5c9d1f03f569101068d741af5b4..ac9989bb615dfb8f15c07dc50ff1b4054e93fc74 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -266,7 +266,7 @@ bool wxGenericValidator::TransferToWindow(void)
         else if (m_pInt)
         {
             wxString str;
-            str.Printf("%d", *m_pInt);
+            str.Printf(wxT("%d"), *m_pInt);
             pControl->SetValue(str);
             return TRUE;
         }
@@ -483,7 +483,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     }
     else if (m_pInt)
     {
-        *m_pInt = atoi(pControl->GetValue());
+        *m_pInt = wxAtoi(pControl->GetValue());
         return TRUE;
     }
   } else

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index ea538f5fc0b16a4f6071dab745cb7322db7a037f..f9e73aed8a35434b91f3e26ed5327a9179a97027 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -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__)
-  // 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) &&
-      (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
-    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