centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/html/search.cpp b/src/html/search.cpp
index 1c6e8c77fa03e4dad42038f453c3fd4900c1dc63..85a59a2b2efefb5740c948d0bc17e6dfe04b9399 100644 (file)
--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -13,9 +13,9 @@
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 

-#include <wx/defs.h>
+#include "wx/defs.h"

 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__
 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__


@@ -23,13 +23,11 @@
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP

-#include <wx/wx.h>

 #endif
 
 #include "wx/html/helpdata.h"
 
 
 #endif
 
 #include "wx/html/helpdata.h"
 
 

-

 //--------------------------------------------------------------------------------
 // wxSearchEngine
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 // wxSearchEngine
 //--------------------------------------------------------------------------------


@@ -37,11 +35,11 @@
 void wxSearchEngine::LookFor(const wxString& keyword)
 {
     if (m_Keyword) delete[] m_Keyword;
 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 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);
     bool found = FALSE;
     char *buf = new char[lng + 1];
     stream -> Read(buf, lng);