wxRTC: fixed guidelines overwriting adjacent cell borders; corrected capitalisation...

[wxWidgets.git] / src / html / m_dflist.cpp

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index e113412e7a5a5b6cbde292bd6a8c76b188ff3619..964954d0cf3abb7c91e0cfcb9f398ac1912da3ed 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -1,27 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        m_dflist.cpp
+// Name:        src/html/m_dflist.cpp
 // Purpose:     wxHtml module for definition lists (DL,DT,DD)
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
-
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
 #endif
 
 #include "wx/html/forcelnk.h"
@@ -36,6 +29,8 @@ FORCE_LINK_ME(m_dflist)
 
 TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
 
+    TAG_HANDLER_CONSTR(DEFLIST) { }
+
     TAG_HANDLER_PROC(tag)
     {
         wxHtmlContainerCell *c;
@@ -43,7 +38,7 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
 
         if (tag.GetName() == wxT("DL"))
         {
-            if (m_WParser->GetContainer()->GetFirstCell() != NULL)
+            if (m_WParser->GetContainer()->GetFirstChild() != NULL)
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
@@ -52,14 +47,14 @@ 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"))
         {
@@ -67,14 +62,14 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
             c = m_WParser->OpenContainer();
             c->SetAlignHor(wxHTML_ALIGN_LEFT);
             c->SetMinHeight(m_WParser->GetCharHeight());
-            return FALSE;
+            return false;
         }
         else // "DD"
         {
             m_WParser->CloseContainer();
             c = m_WParser->OpenContainer();
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
-            return FALSE;
+            return false;
         }
     }