Correct compile errors in non-unicode build

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 5e14e76ff9e449d872f53fa9e650bd991b01960c..7532732646f332774b5bedf1a23e28346709832c 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -475,9 +475,9 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
   wxASSERT( nStart <= length() );
 
   //anchor
   wxASSERT( nStart <= length() );
 
   //anchor

-  const wxChar* p = wxMemchr(c_str() + nStart, 
-                    str.c_str()[0], 
-                    length() - nStart);
+  const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart, 
+                                            str.c_str()[0], 
+                                            length() - nStart);

  
   if(!p)
       return npos;
  
   if(!p)
       return npos;


@@ -486,9 +486,9 @@ size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
         wxMemcmp(p, str.c_str(), str.length()) )
   {
       //anchor again
         wxMemcmp(p, str.c_str(), str.length()) )
   {
       //anchor again

-      p = wxMemchr(++p, 
-                    str.c_str()[0], 
-                    length() - (p - c_str()));
+      p = (const wxChar*)wxMemchr(++p, 
+                                  str.c_str()[0], 
+                                  length() - (p - c_str()));

 
       if(!p)
           return npos;
 
       if(!p)
           return npos;


@@ -506,7 +506,7 @@ size_t wxStringBase::find(wxChar ch, size_t nStart) const
 {
   wxASSERT( nStart <= length() );
 
 {
   wxASSERT( nStart <= length() );
 

-  const wxChar *p = wxMemchr(c_str() + nStart, ch, length() - nStart);
+  const wxChar *p = (const wxChar*)wxMemchr(c_str() + nStart, ch, length() - nStart);

 
   return p == NULL ? npos : p - c_str();
 }
 
   return p == NULL ? npos : p - c_str();
 }