added back 2 extra pixels for the best size under XP

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index e113412e7a5a5b6cbde292bd6a8c76b188ff3619..92ff94b1c167560f1509e60ceb7df5798974ed5a 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -1,26 +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
 // 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"
 

-
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HTML && wxUSE_STREAMS
+

 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP
 #endif
 


@@ -36,6 +30,8 @@ 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;


@@ -43,7 +39,7 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
 
         if (tag.GetName() == wxT("DL"))
         {
 
         if (tag.GetName() == wxT("DL"))
         {

-            if (m_WParser->GetContainer()->GetFirstCell() != NULL)
+            if (m_WParser->GetContainer()->GetFirstChild() != NULL)

             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();


@@ -52,14 +48,14 @@ 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"))
         {
         }
         else if (tag.GetName() == wxT("DT"))
         {


@@ -67,14 +63,14 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
             c = m_WParser->OpenContainer();
             c->SetAlignHor(wxHTML_ALIGN_LEFT);
             c->SetMinHeight(m_WParser->GetCharHeight());
             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);
         }
         else // "DD"
         {
             m_WParser->CloseContainer();
             c = m_WParser->OpenContainer();
             c->SetIndent(5 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);

-            return FALSE;
+            return false;

         }
     }
 
         }
     }