/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation
+#pragma implementation "helpdata.h"
#endif
// For compilers that support precompilation, includes "wx.h".
//-----------------------------------------------------------------------------
// Reads one line, stores it into buf and returns pointer to new line or NULL.
-static char* ReadLine(char *line, char *buf, size_t bufsize)
+static const wxChar* ReadLine(const wxChar *line, wxChar *buf, size_t bufsize)
{
- char *writeptr = buf;
- char *endptr = buf + bufsize - 1;
- char *readptr = line;
+ wxChar *writeptr = buf;
+ wxChar *endptr = buf + bufsize - 1;
+ const wxChar *readptr = line;
- while (*readptr != 0 && *readptr != '\r' && *readptr != '\n' &&
+ while (*readptr != 0 && *readptr != _T('\r') && *readptr != _T('\n') &&
writeptr != endptr)
*(writeptr++) = *(readptr++);
*writeptr = 0;
- while (*readptr == '\r' || *readptr == '\n')
+ while (*readptr == _T('\r') || *readptr == _T('\n'))
readptr++;
if (*readptr == 0)
return NULL;
}
}
+// defined in htmlfilt.cpp
+void wxPrivate_ReadString(wxString& str, wxInputStream* s);
+
bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, const wxString& indexfile, const wxString& contentsfile)
{
wxFSFile *f;
- char *buf;
- int sz;
+ wxString buf;
wxString string;
HP_Parser parser;
f = ( contentsfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
if (f)
{
- sz = f->GetStream()->GetSize();
- buf = new char[sz + 1];
- buf[sz] = 0;
- f->GetStream()->Read(buf, sz);
+ buf.clear();
+ wxPrivate_ReadString(buf, f->GetStream());
delete f;
handler->ReadIn(m_Contents, m_ContentsCnt);
parser.Parse(buf);
handler->WriteOut(m_Contents, m_ContentsCnt);
- delete[] buf;
}
else
wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
f = ( indexfile.IsEmpty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
if (f)
{
- sz = f->GetStream()->GetSize();
- buf = new char[sz + 1];
- buf[sz] = 0;
- f->GetStream()->Read(buf, sz);
+ buf.clear();
+ wxPrivate_ReadString(buf, f->GetStream());
delete f;
handler->ReadIn(m_Index, m_IndexCnt);
parser.Parse(buf);
handler->WriteOut(m_Index, m_IndexCnt);
- delete[] buf;
}
else if (!indexfile.IsEmpty())
wxLogError(_("Cannot open index file: %s"), indexfile.c_str());
return res;
}
-bool wxHtmlHelpData::AlreadyHasBook(wxHtmlBookRecord * bookr)
-{
- size_t bookCount = m_BookRecords.GetCount();
- if (bookCount == 0) return FALSE ;
-
- wxHtmlBookRecord currentBook(wxEmptyString,wxEmptyString,wxEmptyString);
- size_t i;
- for (i=0; i<bookCount; i++)
- {
- currentBook = m_BookRecords.Item(i) ;
- if (currentBook.GetBasePath().IsSameAs(bookr->GetBasePath()) &&
- currentBook.GetTitle().IsSameAs(bookr->GetTitle()) &&
- currentBook.GetStart().IsSameAs(bookr->GetStart()) )
- return TRUE ;
-
- }
- return FALSE ;
-}
-
bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
wxFontEncoding encoding,
const wxString& title, const wxString& contfile,
int IndexOld = m_IndexCnt,
ContentsOld = m_ContentsCnt;
- if (! path.IsEmpty())
+ if (!path.IsEmpty())
fsys.ChangePathTo(path, TRUE);
- bookr = new wxHtmlBookRecord(fsys.GetPath(), title, deftopic);
- // return TRUE to indicate book is loaded
- if (AlreadyHasBook(bookr)) return TRUE ;
+ size_t booksCnt = m_BookRecords.GetCount();
+ for (size_t i = 0; i < booksCnt; i++)
+ {
+ if ( m_BookRecords[i].GetBookFile() == bookfile.GetLocation() )
+ return TRUE; // book is (was) loaded
+ }
+
+ bookr = new wxHtmlBookRecord(bookfile.GetLocation(), fsys.GetPath(), title, deftopic);
if (m_ContentsCnt % wxHTML_REALLOC_STEP == 0)
m_Contents = (wxHtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
fsys.ChangePathTo(bookFull);
s = fi->GetStream();
- int sz;
- char *buff, *lineptr;
- char linebuf[300];
+ const wxChar *lineptr;
+ wxChar linebuf[300];
+ wxString tmp;
- sz = s->GetSize();
- buff = new char[sz + 1];
- buff[sz] = 0;
- s->Read(buff, sz);
- lineptr = buff;
+ wxPrivate_ReadString(tmp, s);
+ lineptr = tmp.c_str();
do
{
lineptr = ReadLine(lineptr, linebuf, 300);
- for (char *ch = linebuf; *ch != '\0' && *ch != '='; ch++)
+ for (wxChar *ch = linebuf; *ch != '\0' && *ch != '='; ch++)
*ch = tolower(*ch);
- if (strstr(linebuf, "title=") == linebuf)
- title = linebuf + strlen("title=");
- if (strstr(linebuf, "default topic=") == linebuf)
- start = linebuf + strlen("default topic=");
- if (strstr(linebuf, "index file=") == linebuf)
- index = linebuf + strlen("index file=");
- if (strstr(linebuf, "contents file=") == linebuf)
- contents = linebuf + strlen("contents file=");
- if (strstr(linebuf, "charset=") == linebuf)
- charset = linebuf + strlen("charset=");
+ if (wxStrstr(linebuf, _T("title=")) == linebuf)
+ title = linebuf + wxStrlen(_T("title="));
+ if (wxStrstr(linebuf, _T("default topic=")) == linebuf)
+ start = linebuf + wxStrlen(_T("default topic="));
+ if (wxStrstr(linebuf, _T("index file=")) == linebuf)
+ index = linebuf + wxStrlen(_T("index file="));
+ if (wxStrstr(linebuf, _T("contents file=")) == linebuf)
+ contents = linebuf + wxStrlen(_T("contents file="));
+ if (wxStrstr(linebuf, _T("charset=")) == linebuf)
+ charset = linebuf + wxStrlen(_T("charset="));
} while (lineptr != NULL);
- delete[] buff;
wxFontEncoding enc;
if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
- else enc = wxTheFontMapper->CharsetToEncoding(charset);
+ else enc = wxFontMapper::Get()->CharsetToEncoding(charset);
bool rtval = AddBookParam(*fi, enc,
title, contents, index, start, fsys.GetPath());
delete fi;
}
-
-#define WHITESPACE(c) (c == ' ' || c == '\n' || c == '\r' || c == '\t')
+static inline bool WHITESPACE(wxChar c)
+{
+ return c == _T(' ') || c == _T('\n') || c == _T('\r') || c == _T('\t');
+}
bool wxSearchEngine::Scan(wxInputStream *stream)
{
wxASSERT_MSG(m_Keyword != NULL, wxT("wxSearchEngine::LookFor must be called before scanning!"));
int i, j;
- int lng = stream ->GetSize();
int wrd = wxStrlen(m_Keyword);
bool found = FALSE;
- char *buf = new char[lng + 1];
- stream->Read(buf, lng);
- buf[lng] = 0;
+ wxString tmp;
+ wxPrivate_ReadString(tmp, stream);
+ int lng = tmp.length();
+ const wxChar *buf = tmp.c_str();
if (!m_CaseSensitive)
for (i = 0; i < lng; i++)
- if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A';
+ tmp[(size_t)i] = (wxChar)wxTolower(tmp[(size_t)i]);
if (m_WholeWords)
{
}
}
- delete[] buf;
return found;
}
projects / wxWidgets.git / blobdiff