fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...

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

diff --git a/src/html/search.cpp b/src/html/search.cpp
index 506f382db7917a813ed38cd075352664c48cdfef..85a59a2b2efefb5740c948d0bc17e6dfe04b9399 100644 (file)
--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -2,6 +2,7 @@
 // Name:        search.cpp
 // Purpose:     search engine
 // Author:      Vaclav Slavik
 // Name:        search.cpp
 // Purpose:     search engine
 // Author:      Vaclav Slavik

+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,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__


@@ -22,11 +23,9 @@
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP

-#include <wx/wx.h>

 #endif
 
 #endif
 

-#include "search.h"
-
+#include "wx/html/helpdata.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -35,12 +34,12 @@
 
 void wxSearchEngine::LookFor(const wxString& keyword)
 {
 
 void wxSearchEngine::LookFor(const wxString& keyword)
 {

-    if (m_Keyword) free(m_Keyword);
-    m_Keyword = (char*) malloc(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';
+    if (m_Keyword) delete[] m_Keyword;
+    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');

 }
 
 
 }
 
 


@@ -51,9 +50,9 @@ 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;
     bool found = FALSE;

-    char *buf = (char*) malloc(lng + 1);
+    char *buf = new char[lng + 1];

     stream -> Read(buf, lng);
     buf[lng] = 0;
 
     stream -> Read(buf, lng);
     buf[lng] = 0;
 


@@ -66,7 +65,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
         if (j == wrd) {found = TRUE; break;}
     }
 
         if (j == wrd) {found = TRUE; break;}
     }
 

-    free(buf);
+    delete[] buf;

     return found;
 }
 
     return found;
 }