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 ba6858717516fb6c50e3b7666498150f5a243da8..7ff5b19a4d5e48dc5a13b6f8d0d0f9db9a55ece2 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -21,11 +21,11 @@
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/brush.h"
+    #include "wx/pen.h"
+    #include "wx/dc.h"

 #endif
 
 #endif
 

-
-

 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #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);
     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);
     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);

 }
 
 
 }
 
 


@@ -72,19 +72,19 @@ TAG_HANDLER_BEGIN(HR, "HR")
         wxHtmlContainerCell *c;
         int sz;
 
         wxHtmlContainerCell *c;
         int sz;
 

-        m_WParser -> CloseContainer();
-        c = m_WParser -> OpenContainer();
+        m_WParser->CloseContainer();
+        c = m_WParser->OpenContainer();

 
 

-        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL);
-        c -> SetAlignHor(wxHTML_ALIGN_CENTER);
-        c -> SetAlign(tag);
-        c -> SetWidthFloat(tag);
+        c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_VERTICAL);
+        c->SetAlignHor(wxHTML_ALIGN_CENTER);
+        c->SetAlign(tag);
+        c->SetWidthFloat(tag);

         sz = 1;
         sz = 1;

-        if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}
-        c -> InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser -> GetPixelScale())));
+        tag.GetParamAsInt(wxT("SIZE"), &sz);
+        c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale())));

 
 

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

 
         return FALSE;
     }
 
         return FALSE;
     }