new rendering customization api fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 9679129adc9211a2e4321fd95b357e792201f3d9..b81880687e8c4fbe80d9ca26f6d49eaa9e24499f 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -43,7 +43,7 @@ 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); }
 
@@ -55,7 +55,7 @@ class wxHtmlLineCell : public wxHtmlCell
 
 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);

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index c9660bd477558bc05b38445bd9f3ce0cbc7382c7..bc85ae290b3f8a5a83ce0ada993b7d43e96b6a33 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -70,7 +70,7 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
         void Draw(wxDC& WXUNUSED(dc),
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                  wxHtmlRenderingState& WXUNUSED(state)) {}
+                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
 };
 
 
@@ -246,7 +246,7 @@ class wxHtmlImageMapCell : public wxHtmlCell
         void Draw(wxDC& WXUNUSED(dc),
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                  wxHtmlRenderingState& WXUNUSED(state)) {}
+                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
 };
 
 
@@ -291,7 +291,7 @@ public:
                     const wxString& mapname = wxEmptyString);
     ~wxHtmlImageCell();
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
-              wxHtmlRenderingState& state);
+              wxHtmlRenderingInfo& info);
     virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
 
     void SetImage(const wxImage& img);
@@ -530,7 +530,7 @@ wxHtmlImageCell::~wxHtmlImageCell()
 
 void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
                            int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                           wxHtmlRenderingState& WXUNUSED(state))
+                           wxHtmlRenderingInfo& WXUNUSED(info))
 {
     if ( m_showFrame )
     {

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 935f1c0299ec2aaa44e88a887751c2f4a27ebd81..bb6b0299a46e5b729e1485761f2c9610c8b95361 100644 (file)
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -44,7 +44,7 @@ class wxHtmlListmarkCell : public wxHtmlCell
     public:
         wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
-                  wxHtmlRenderingState& state);
+                  wxHtmlRenderingInfo& info);
 };
 
 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
@@ -58,7 +58,7 @@ wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCe
 
 void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y,
                               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                              wxHtmlRenderingState& WXUNUSED(state))
+                              wxHtmlRenderingInfo& WXUNUSED(info))
 {
     dc.SetBrush(m_Brush);
     dc.DrawEllipse(x + m_PosX + m_Width / 3, y + m_PosY + m_Height / 3,