removed a condition (l. 124) that always eval to true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -121,7 +121,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
|
||||
else if (tag.GetName() == wxT("OBJECT")) {
|
||||
m_Name = m_Page = wxEmptyString;
|
||||
ParseInner(tag);
|
||||
if (m_Page != wxEmptyString) {
|
||||
|
||||
if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
|
||||
m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
|
||||
m_Items[m_ItemsCnt].m_Level = m_Level;
|
||||
@@ -132,7 +132,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
|
||||
wxStrcpy(m_Items[m_ItemsCnt].m_Name, m_Name.c_str());
|
||||
m_Items[m_ItemsCnt].m_Book = m_Book;
|
||||
m_ItemsCnt++;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
else { // "PARAM"
|
||||
@@ -570,12 +570,12 @@ bool wxHtmlSearchStatus::Search()
|
||||
int i = m_CurIndex; // shortcut
|
||||
bool found = FALSE;
|
||||
|
||||
if (! m_Active) {
|
||||
if (!m_Active) {
|
||||
// sanity check. Illegal use, but we'll try to prevent a crash anyway
|
||||
#if !defined(__VISAGECPP__)
|
||||
wxASSERT(0);
|
||||
wxASSERT(0);
|
||||
#else
|
||||
wxASSERT(m_Active);
|
||||
wxASSERT(m_Active);
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
@@ -625,7 +625,7 @@ void wxSearchEngine::LookFor(const wxString& keyword)
|
||||
|
||||
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 lng = stream ->GetSize();
|
||||
|
Reference in New Issue
Block a user