docking crash fix patch applied

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index fd13d8040aa5dfbcf7d33cdcb678341beed1ce7b..92ff94b1c167560f1509e60ceb7df5798974ed5a 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -1,31 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop
 #endif
 
+#if wxUSE_HTML && wxUSE_STREAMS
+
 #ifndef WXPRECOMP
-#include "wx/wx.h"
 #endif
 
-
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
@@ -36,49 +28,50 @@ 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) {
-                m_WParser -> CloseContainer();
-                m_WParser -> OpenContainer();
+        if (tag.GetName() == wxT("DL"))
+        {
+            if (m_WParser->GetContainer()->GetFirstChild() != 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()->GetFirstChild() != 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;
+            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"
-            m_WParser -> CloseContainer();
-            c = m_WParser -> OpenContainer();
-            c -> SetIndent(5 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT);
-            return FALSE;
+        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)