Close tree edit even if the change is vetoed to be consistent with MSW [patch 1110252]

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

diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index 6c767aed918e110d4893d328a0f83e732aa9220a..310bead6289ca2c539e937147cccfb04edad5ce1 100644 (file)
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


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


@@ -59,7 +61,7 @@ TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
             }
             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"))
         {
         }
         else if (tag.GetName() == wxT("DT"))
         {


@@ -67,14 +69,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;

         }
     }
 
         }
     }