X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/314260fbd07ecebb43c60d147e1f4580a7159e42..f7035880664b0989ba37df99956b556c322d50a7:/src/html/search.cpp

diff --git a/src/html/search.cpp b/src/html/search.cpp
index 78df71a708..85a59a2b2e 100644
--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -23,13 +23,11 @@
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
 #endif
 
 #include "wx/html/helpdata.h"
 
 
-
 //--------------------------------------------------------------------------------
 // wxSearchEngine
 //--------------------------------------------------------------------------------
@@ -37,11 +35,11 @@
 void wxSearchEngine::LookFor(const wxString& keyword)
 {
     if (m_Keyword) delete[] m_Keyword;
-    m_Keyword = new char[keyword.Length() + 1];
-    strcpy(m_Keyword, keyword.c_str());
-    for (int i = strlen(m_Keyword) - 1; i >= 0; i--)
-        if ((m_Keyword[i] >= 'A') && (m_Keyword[i] <= 'Z'))
-            m_Keyword[i] += 'a' - 'A';
+    m_Keyword = new wxChar[keyword.Length() + 1];
+    wxStrcpy(m_Keyword, keyword.c_str());
+    for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)
+        if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
+            m_Keyword[i] += wxT('a') - wxT('A');
 }
 
 
@@ -52,7 +50,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
 
     int i, j;
     int lng = stream ->GetSize();
-    int wrd = strlen(m_Keyword);
+    int wrd = wxStrlen(m_Keyword);
     bool found = FALSE;
     char *buf = new char[lng + 1];
     stream -> Read(buf, lng);