wxWindow::Show() works again

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index d1a9ecb7604449e242d485ded46c3098addabfef..fba42b93527ae00051234295f354fa8cb9d9a095 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -113,10 +113,10 @@ bool WXDLLEXPORT wxOKlibc()
   return TRUE;
 }
 
-#ifdef wxNEED_WCSLEN
+#ifndef HAVE_WCSLEN
 size_t   WXDLLEXPORT wcslen(const wchar_t *s)
 {
-  size_t len;
+  size_t len = 0;
   while (s[len]) len++;
   return len;
 }
@@ -141,8 +141,8 @@ int WXDLLEXPORT wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; }
 int WXDLLEXPORT wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; }
 int WXDLLEXPORT wxIsupper(wxChar ch) { return IsCharUpper(ch); }
 int WXDLLEXPORT wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; }
-int WXDLLEXPORT wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch); }
-int WXDLLEXPORT wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch); }
+int WXDLLEXPORT wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); }
+int WXDLLEXPORT wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
 #endif
 
 #ifndef wxStrdup