#11259: Correction for bad help button on OSX

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index 28c34616c9a10decf308e2a1b7308b4f21416202..39ca0c4b02a5b7aa129a6ea2488c21c66538b575 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
 // 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/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif

 
 

-#include "wx/defs.h"

 #if wxUSE_HTML && wxUSE_STREAMS
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifndef WX_PRECOMP

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
-#include "wx/wx.h"
-#endif
-
-

 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 


@@ -36,17 +28,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;
 
 
 
     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();
             }
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             }


@@ -54,37 +48,30 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD")
 
             ParseInner(tag);
 
 
             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);
 
                 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);
             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)
     }
 
 TAG_HANDLER_END(DEFLIST)