X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..2b199a38dccae76ad59f747dd7ef6fcfc680c089:/src/html/m_dflist.cpp diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp index 28c34616c9..310bead628 100644 --- a/src/html/m_dflist.cpp +++ b/src/html/m_dflist.cpp @@ -4,10 +4,10 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -17,15 +17,13 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif - #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -36,17 +34,19 @@ FORCE_LINK_ME(m_dflist) -TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD") +TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" ) + + TAG_HANDLER_CONSTR(DEFLIST) { } TAG_HANDLER_PROC(tag) { wxHtmlContainerCell *c; - if (tag.GetName() == wxT("DL")) - { - if (m_WParser->GetContainer()->GetFirstCell() != NULL) - { + if (tag.GetName() == wxT("DL")) + { + if (m_WParser->GetContainer()->GetFirstChild() != NULL) + { m_WParser->CloseContainer(); m_WParser->OpenContainer(); } @@ -54,37 +54,30 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD") ParseInner(tag); - if (m_WParser->GetContainer()->GetFirstCell() != NULL) - { + if (m_WParser->GetContainer()->GetFirstChild() != NULL) + { m_WParser->CloseContainer(); m_WParser->OpenContainer(); } m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); - return TRUE; + 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()); - } - return FALSE; + 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" - { + else // "DD" + { m_WParser->CloseContainer(); c = m_WParser->OpenContainer(); c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT); - return FALSE; + return false; } - - else return FALSE; } TAG_HANDLER_END(DEFLIST)