remove streams tests: they're very basic and already-existing CppUnit stream tests...

[wxWidgets.git] / src / html / search.cpp

diff --git a/src/html/search.cpp b/src/html/search.cpp
index 78df71a708f21b3ccc2cdf7a8922d513d2a75840..5d30b4822719bf4c9849b08ae8ddb8cec3ff7efe 100644 (file)
--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -15,21 +15,19 @@
 
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/defs.h"
 #if wxUSE_HTML
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#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);