X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0413cec5271566470f4c852608a35800b49056cd..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/html/m_dflist.cpp diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp index fd13d8040a..634a31786b 100644 --- a/src/html/m_dflist.cpp +++ b/src/html/m_dflist.cpp @@ -15,17 +15,15 @@ #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -43,42 +41,41 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD") wxHtmlContainerCell *c; - if (tag.GetName() == wxT("DL")) { - if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) { - m_WParser -> CloseContainer(); - m_WParser -> OpenContainer(); + if (tag.GetName() == wxT("DL")) + { + if (m_WParser->GetContainer()->GetFirstCell() != NULL) + { + m_WParser->CloseContainer(); + m_WParser->OpenContainer(); } - m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP); + m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); ParseInner(tag); - if (m_WParser -> GetContainer() -> GetFirstCell() != NULL) { - m_WParser -> CloseContainer(); - m_WParser -> OpenContainer(); + if (m_WParser->GetContainer()->GetFirstCell() != NULL) + { + m_WParser->CloseContainer(); + m_WParser->OpenContainer(); } - m_WParser -> GetContainer() -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_TOP); + m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); return TRUE; } - - else if (tag.GetName() == wxT("DT")) { - if (!tag.IsEnding()) { - m_WParser -> CloseContainer(); - c = m_WParser -> OpenContainer(); - c -> SetAlignHor(wxHTML_ALIGN_LEFT); - c -> SetMinHeight(m_WParser -> GetCharHeight()); - } + else if (tag.GetName() == wxT("DT")) + { + m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); + c->SetAlignHor(wxHTML_ALIGN_LEFT); + c->SetMinHeight(m_WParser->GetCharHeight()); return FALSE; } - - else if (!tag.IsEnding()) { // "DD" - m_WParser -> CloseContainer(); - c = m_WParser -> OpenContainer(); - c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT); + else // "DD" + { + m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); + c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT); return FALSE; } - - else return FALSE; } TAG_HANDLER_END(DEFLIST)