projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear wxArtProvider cache when pushing new provider
[wxWidgets.git]
/
src
/
html
/
m_hline.cpp
diff --git
a/src/html/m_hline.cpp
b/src/html/m_hline.cpp
index 77f4abcb64de1a436a25d1ba66b98e5c1be99a3e..b9df229000f7798b7607e2f901bd9c69018b0075 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"
@@
-41,20
+41,24
@@
FORCE_LINK_ME(m_hline)
class wxHtmlLineCell : public wxHtmlCell
{
public:
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 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);
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,6
+75,7
@@
TAG_HANDLER_BEGIN(HR, "HR")
{
wxHtmlContainerCell *c;
int sz;
{
wxHtmlContainerCell *c;
int sz;
+ bool HasShading;
m_WParser->CloseContainer();
c = m_WParser->OpenContainer();
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->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();
m_WParser->CloseContainer();
m_WParser->OpenContainer();