X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/259d1674f293dcb7bbc0fa1c38392d899ce71bc0..275abf24e140159f2ac19b64b76737a6903b1319:/src/html/search.cpp diff --git a/src/html/search.cpp b/src/html/search.cpp index 506f382db7..1c6e8c77fa 100644 --- a/src/html/search.cpp +++ b/src/html/search.cpp @@ -2,6 +2,7 @@ // Name: search.cpp // Purpose: search engine // Author: Vaclav Slavik +// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +26,7 @@ #include #endif -#include "search.h" +#include "wx/html/helpdata.h" @@ -35,8 +36,8 @@ void wxSearchEngine::LookFor(const wxString& keyword) { - if (m_Keyword) free(m_Keyword); - m_Keyword = (char*) malloc(keyword.Length() + 1); + 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')) @@ -53,7 +54,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream) int lng = stream ->GetSize(); int wrd = strlen(m_Keyword); bool found = FALSE; - char *buf = (char*) malloc(lng + 1); + char *buf = new char[lng + 1]; stream -> Read(buf, lng); buf[lng] = 0; @@ -66,7 +67,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream) if (j == wrd) {found = TRUE; break;} } - free(buf); + delete[] buf; return found; }