minor fixes; replace references to Windows95 with references to wxMSW where possible

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index b6ec3860432dee629affe14c69c11a7f90c946df..39ca0c4b02a5b7aa129a6ea2488c21c66538b575 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -1,27 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
-#include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
 #endif
 
 #include "wx/html/forcelnk.h"
@@ -34,7 +28,9 @@ 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)
     {
@@ -43,7 +39,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,35 +48,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;
+            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)