wxHtmlFontCell now has member wxFont m_Font instead of wxFont* m_Font (preparation...

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 a0f585232e4dd1995ce0c1c0d8bfa8d19d6c2da0..272bba684bad977b18c28e77c8ac28719a23be2d 100644 (file)
--- 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 e8680be944ef868e670de1f7822dcca267d65e2f..a3d20ab2c0be9ac8535ea042393ea32462cba8ed 100644 (file)
--- 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);
 }