added common regex

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

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 3eee42e318f5c2cc79125d9146034bbb92938407..7ff5b19a4d5e48dc5a13b6f8d0d0f9db9a55ece2 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -21,11 +21,11 @@
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/brush.h"
+    #include "wx/pen.h"
+    #include "wx/dc.h"
 #endif
 
-
-
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
@@ -43,7 +43,8 @@ class wxHtmlLineCell : public wxHtmlCell
     public:
         wxHtmlLineCell(int size) : wxHtmlCell() {m_Height = size;}
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
-        void Layout(int w) {m_Width = w; if (m_Next) m_Next->Layout(w);}
+        void Layout(int w) 
+            { m_Width = w; wxHtmlCell::Layout(w); }
 };
 
 
@@ -54,7 +55,6 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
     dc.SetBrush(mybrush);
     dc.SetPen(mypen);
     dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 
@@ -80,7 +80,7 @@ TAG_HANDLER_BEGIN(HR, "HR")
         c->SetAlign(tag);
         c->SetWidthFloat(tag);
         sz = 1;
-        if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}
+        tag.GetParamAsInt(wxT("SIZE"), &sz);
         c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale())));
 
         m_WParser->CloseContainer();