wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation for <font face> support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fe7a2e2529
commit
921d0fb195
@ -261,9 +261,9 @@ class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
|
||||
class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
|
||||
{
|
||||
public:
|
||||
wxFont *m_Font;
|
||||
wxFont m_Font;
|
||||
|
||||
wxHtmlFontCell(wxFont *font) : wxHtmlCell() {m_Font = font;};
|
||||
wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); }
|
||||
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
|
||||
virtual void DrawInvisible(wxDC& dc, int x, int y);
|
||||
};
|
||||
|
@ -479,13 +479,13 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
|
||||
|
||||
void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
|
||||
{
|
||||
dc.SetFont(*m_Font);
|
||||
dc.SetFont(m_Font);
|
||||
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
|
||||
}
|
||||
|
||||
void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
|
||||
{
|
||||
dc.SetFont(*m_Font);
|
||||
dc.SetFont(m_Font);
|
||||
wxHtmlCell::DrawInvisible(dc, x, y);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user