From: Václav Slavík Date: Thu, 23 Dec 1999 18:14:17 +0000 (+0000) Subject: wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/921d0fb1953c384c3f5066dabc19f0f7e4fb1da7 wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation for support) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index a0f585232e..272bba684b 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -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); }; diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index e8680be944..a3d20ab2c0 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -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); }