Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Unicode breakage I caused

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-05-01 08:57:51 +00:00
parent 52315bc3bb
commit 1a1dac18e3
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/html/helpdata.cpp
View File

@@ -48,17 +48,17 @@ WX_DEFINE_OBJARRAY(wxHtmlBookRecArray)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Reads one line, stores it into buf and returns pointer to new line or NULL. // Reads one line, stores it into buf and returns pointer to new line or NULL.
static const char* ReadLine(const char *line, char *buf, size_t bufsize) static const wxChar* ReadLine(const wxChar *line, wxChar *buf, size_t bufsize)
{ {
char *writeptr = buf; wxChar *writeptr = buf;
char *endptr = buf + bufsize - 1; wxChar *endptr = buf + bufsize - 1;
const char *readptr = line; const wxChar *readptr = line;
while (*readptr != 0 && *readptr != '\r' && *readptr != '\n' && while (*readptr != 0 && *readptr != _T('\r') && *readptr != _T('\n') &&
writeptr != endptr) writeptr != endptr)
*(writeptr++) = *(readptr++); *(writeptr++) = *(readptr++);
*writeptr = 0; *writeptr = 0;
while (*readptr == '\r' || *readptr == '\n') while (*readptr == _T('\r') || *readptr == _T('\n'))
readptr++; readptr++;
if (*readptr == 0) if (*readptr == 0)
return NULL; return NULL;
@@ -582,8 +582,8 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
fsys.ChangePathTo(bookFull); fsys.ChangePathTo(bookFull);
s = fi->GetStream(); s = fi->GetStream();
const char *lineptr; const wxChar *lineptr;
char linebuf[300]; wxChar linebuf[300];
wxString tmp; wxString tmp;
wxPrivate_ReadString(tmp, s); wxPrivate_ReadString(tmp, s);
@@ -593,19 +593,19 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
{ {
lineptr = ReadLine(lineptr, linebuf, 300); lineptr = ReadLine(lineptr, linebuf, 300);
for (char *ch = linebuf; *ch != '\0' && *ch != '='; ch++) for (wxChar *ch = linebuf; *ch != '\0' && *ch != '='; ch++)
*ch = tolower(*ch); *ch = tolower(*ch);
if (strstr(linebuf, "title=") == linebuf) if (wxStrstr(linebuf, _T("title=")) == linebuf)
title = linebuf + strlen("title="); title = linebuf + wxStrlen(_T("title="));
if (strstr(linebuf, "default topic=") == linebuf) if (wxStrstr(linebuf, _T("default topic=")) == linebuf)
start = linebuf + strlen("default topic="); start = linebuf + wxStrlen(_T("default topic="));
if (strstr(linebuf, "index file=") == linebuf) if (wxStrstr(linebuf, _T("index file=")) == linebuf)
index = linebuf + strlen("index file="); index = linebuf + wxStrlen(_T("index file="));
if (strstr(linebuf, "contents file=") == linebuf) if (wxStrstr(linebuf, _T("contents file=")) == linebuf)
contents = linebuf + strlen("contents file="); contents = linebuf + wxStrlen(_T("contents file="));
if (strstr(linebuf, "charset=") == linebuf) if (wxStrstr(linebuf, _T("charset=")) == linebuf)
charset = linebuf + strlen("charset="); charset = linebuf + wxStrlen(_T("charset="));
} while (lineptr != NULL); } while (lineptr != NULL);
wxFontEncoding enc; wxFontEncoding enc;
@@ -812,8 +812,10 @@ void wxSearchEngine::LookFor(const wxString& keyword, bool case_sensitive, bool
} }
static inline bool WHITESPACE(wxChar c)
#define WHITESPACE(c) (c == ' ' || c == '\n' || c == '\r' || c == '\t') {
return c == _T(' ') || c == _T('\n') || c == _T('\r') || c == _T('\t');
}
bool wxSearchEngine::Scan(wxInputStream *stream) bool wxSearchEngine::Scan(wxInputStream *stream)
{ {
@@ -825,11 +827,11 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
wxString tmp; wxString tmp;
wxPrivate_ReadString(tmp, stream); wxPrivate_ReadString(tmp, stream);
int lng = tmp.length(); int lng = tmp.length();
const char *buf = tmp.c_str(); const wxChar *buf = tmp.c_str();
if (!m_CaseSensitive) if (!m_CaseSensitive)
for (i = 0; i < lng; i++) for (i = 0; i < lng; i++)
tmp[(size_t)i] = (char)tolower(tmp[(size_t)i]); tmp[(size_t)i] = (wxChar)wxTolower(tmp[(size_t)i]);
if (m_WholeWords) if (m_WholeWords)
{ {