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 9679129adc9211a2e4321fd95b357e792201f3d9..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
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
 #endif
 
@@ -43,19 +43,21 @@ class wxHtmlLineCell : public wxHtmlCell
     public:
         wxHtmlLineCell(int size, bool shading) : wxHtmlCell() {m_Height = size; m_HasShading = shading;}
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
-                  wxHtmlRenderingState& state);
+                  wxHtmlRenderingInfo& info);
         void Layout(int w)
             { m_Width = w; wxHtmlCell::Layout(w); }
 
     private:
         // Should we draw 3-D shading or not
       bool m_HasShading;
+
+      DECLARE_NO_COPY_CLASS(wxHtmlLineCell)
 };
 
 
 void wxHtmlLineCell::Draw(wxDC& dc, int x, int y,
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                          wxHtmlRenderingState& WXUNUSED(state))
+                          wxHtmlRenderingInfo& WXUNUSED(info))
 {
     wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxTRANSPARENT : wxSOLID);
     wxPen mypen(wxT("GREY"), 1, wxSOLID);
@@ -73,6 +75,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y,
 
 
 TAG_HANDLER_BEGIN(HR, "HR")
+    TAG_HANDLER_CONSTR(HR) { }
 
     TAG_HANDLER_PROC(tag)
     {
@@ -95,7 +98,7 @@ TAG_HANDLER_BEGIN(HR, "HR")
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();
 
-        return FALSE;
+        return false;
     }
 
 TAG_HANDLER_END(HR)