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

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

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index b81880687e8c4fbe80d9ca26f6d49eaa9e24499f..d629fda7bc613b961d78dd3bd1f438546647e7b7 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.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
 


@@ -50,6 +50,8 @@ class wxHtmlLineCell : public wxHtmlCell
     private:
         // Should we draw 3-D shading or not
       bool m_HasShading;
     private:
         // Should we draw 3-D shading or not
       bool m_HasShading;

+
+      DECLARE_NO_COPY_CLASS(wxHtmlLineCell)

 };
 
 
 };
 
 


@@ -73,6 +75,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y,
 
 
 TAG_HANDLER_BEGIN(HR, "HR")
 
 
 TAG_HANDLER_BEGIN(HR, "HR")

+    TAG_HANDLER_CONSTR(HR) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -95,7 +98,7 @@ TAG_HANDLER_BEGIN(HR, "HR")
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();
 
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();
 

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(HR)
     }
 
 TAG_HANDLER_END(HR)