Replaced wcslen with wxWcslen

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 78f6ea18ef1eafd77d21e567566098c5d57f0627..d115d7234934d7fe2057ebd91a7a72dc1fc381c5 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1368,7 +1368,7 @@ static wxWindow* wxFindSuitableParent()
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
-#if defined(__WXMSW__) || defined(__WXGTK__)
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
                                                 int noTemplates,
 #else
                                                 int WXUNUSED(noTemplates),
@@ -1378,7 +1378,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
                                                 bool WXUNUSED(save))
 {
     // We can only have multiple filters in Windows and GTK
-#if defined(__WXMSW__) || defined(__WXGTK__)
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
     wxString descrBuf;
 
     int i;

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 25620c07c58b180801d5d777172e04623b4eaa6a..964689df5e0c311291846f9ec543903461135ec8 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -846,7 +846,8 @@ public:
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
         size_t inbuf = std::wcslen(psz);
 #else
-        size_t inbuf = ::wcslen(psz);
+       //        size_t inbuf = ::wcslen(psz);
+       size_t inbuf = wxWcslen(psz);
 #endif
         if (buf)
             w2m.Convert(psz,buf);
@@ -1038,7 +1039,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
     size_t len=std::wcslen(psz);
 #else
-    size_t len=::wcslen(psz);
+    //    size_t len=::wcslen(psz);
+    size_t len = wxWcslen(psz);
 #endif
     if (buf)
     {