X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d699f48ba33c96c24f7ab3764ad98ded0633c1c5..e777924b358ae352f30881249f681ebb7a3ce089:/src/html/m_hline.cpp

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index ca4cdd48a3..b9df229000 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -41,17 +41,21 @@ FORCE_LINK_ME(m_hline)
 class wxHtmlLineCell : public wxHtmlCell
 {
     public:
-        wxHtmlLineCell(int size) : wxHtmlCell() {m_Height = size;}
+        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);
         void Layout(int w)
             { m_Width = w; wxHtmlCell::Layout(w); }
+
+    private:
+        // Should we draw 3-D shading or not
+      bool m_HasShading;
 };
 
 
 void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
 {
-    wxBrush mybrush("BLACK", wxSOLID);
-    wxPen mypen("BLACK", 1, wxSOLID);
+    wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxTRANSPARENT : wxSOLID);
+    wxPen mypen(wxT("GREY"), 1, wxSOLID);
     dc.SetBrush(mybrush);
     dc.SetPen(mypen);
     dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);
@@ -71,6 +75,7 @@ TAG_HANDLER_BEGIN(HR, "HR")
     {
         wxHtmlContainerCell *c;
         int sz;
+        bool HasShading;
 
         m_WParser->CloseContainer();
         c = m_WParser->OpenContainer();
@@ -81,7 +86,8 @@ TAG_HANDLER_BEGIN(HR, "HR")
         c->SetWidthFloat(tag);
         sz = 1;
         tag.GetParamAsInt(wxT("SIZE"), &sz);
-        c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale())));
+        HasShading = !(tag.HasParam(wxT("NOSHADE")));
+        c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale()), HasShading));
 
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();