Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation for <font face> support)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-23 18:14:17 +00:00
parent fe7a2e2529
commit 921d0fb195
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/html/htmlcell.h
View File

@@ -261,9 +261,9 @@ class WXDLLEXPORT wxHtmlColourCell : public wxHtmlCell
class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell class WXDLLEXPORT wxHtmlFontCell : public wxHtmlCell
{ {
public: 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 Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
virtual void DrawInvisible(wxDC& dc, int x, int y); virtual void DrawInvisible(wxDC& dc, int x, int y);
}; };

4
src/html/htmlcell.cpp
View File

@@ -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) 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); wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
} }
void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y) void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
{ {
dc.SetFont(*m_Font); dc.SetFont(m_Font);
wxHtmlCell::DrawInvisible(dc, x, y); wxHtmlCell::DrawInvisible(dc, x, y);
} }