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

removed a condition (l. 124) that always eval to true

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-14 21:40:56 +00:00
parent f3bcfd9bcd
commit 50494a55ae
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/html/helpdata.cpp
View File

@@ -121,18 +121,18 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
else if (tag.GetName() == wxT("OBJECT")) { else if (tag.GetName() == wxT("OBJECT")) {
m_Name = m_Page = wxEmptyString; m_Name = m_Page = wxEmptyString;
ParseInner(tag); ParseInner(tag);
if (m_Page != wxEmptyString) {
if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0) if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem)); m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
m_Items[m_ItemsCnt].m_Level = m_Level; m_Items[m_ItemsCnt].m_Level = m_Level;
m_Items[m_ItemsCnt].m_ID = m_ID; m_Items[m_ItemsCnt].m_ID = m_ID;
m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1]; m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];
wxStrcpy(m_Items[m_ItemsCnt].m_Page, m_Page.c_str()); wxStrcpy(m_Items[m_ItemsCnt].m_Page, m_Page.c_str());
m_Items[m_ItemsCnt].m_Name = new wxChar [m_Name.Length() + 1]; m_Items[m_ItemsCnt].m_Name = new wxChar [m_Name.Length() + 1];
wxStrcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str()); wxStrcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str());
m_Items[m_ItemsCnt].m_Book = m_Book; m_Items[m_ItemsCnt].m_Book = m_Book;
m_ItemsCnt++; m_ItemsCnt++;
}
return TRUE; return TRUE;
} }
else { // "PARAM" else { // "PARAM"
@@ -570,14 +570,14 @@ bool wxHtmlSearchStatus::Search()
int i = m_CurIndex; // shortcut int i = m_CurIndex; // shortcut
bool found = FALSE; bool found = FALSE;
if (! m_Active) { if (!m_Active) {
// sanity check. Illegal use, but we'll try to prevent a crash anyway // sanity check. Illegal use, but we'll try to prevent a crash anyway
#if !defined(__VISAGECPP__) #if !defined(__VISAGECPP__)
wxASSERT(0); wxASSERT(0);
#else #else
wxASSERT(m_Active); wxASSERT(m_Active);
#endif #endif
return FALSE; return FALSE;
} }
m_ContentsItem = NULL; m_ContentsItem = NULL;
@@ -625,7 +625,7 @@ void wxSearchEngine::LookFor(const wxString& keyword)
bool wxSearchEngine::Scan(wxInputStream *stream) bool wxSearchEngine::Scan(wxInputStream *stream)
{ {
wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!")); wxASSERT_MSG(m_Keyword != NULL, wxT("wxSearchEngine::LookFor must be called before scanning!"));
int i, j; int i, j;
int lng = stream ->GetSize(); int lng = stream ->GetSize();
@@ -641,7 +641,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
for (i = 0; i < lng - wrd; i++) { for (i = 0; i < lng - wrd; i++) {
j = 0; j = 0;
while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++; while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
if (j == wrd) {found = TRUE; break; } if (j == wrd) {found = TRUE; break; }
} }
delete[] buf; delete[] buf;