X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..e269a9be19a8c454fee444500447db925992f86b:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index ba68587175..b9df229000 100644 --- 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" @@ -41,20 +41,24 @@ 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; if (m_Next) m_Next -> Layout(w);} + 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 view_y1, int view_y2) +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); - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } @@ -71,20 +75,22 @@ TAG_HANDLER_BEGIN(HR, "HR") { wxHtmlContainerCell *c; int sz; + bool HasShading; - 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; - 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); + HasShading = !(tag.HasParam(wxT("NOSHADE"))); + c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale()), HasShading)); - m_WParser -> CloseContainer(); - m_WParser -> OpenContainer(); + m_WParser->CloseContainer(); + m_WParser->OpenContainer(); return FALSE; }