From: Julian Smart Date: Wed, 6 Oct 2010 21:27:07 +0000 (+0000) Subject: Don't use wxDC in header X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8995db52f311ef389652b0ac3aff39bde723c5ac Don't use wxDC in header git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index cd131df4e9..6f79ca90d3 100644 --- a/include/wx/richtext/richtextbuffer.h +++ b/include/wx/richtext/richtextbuffer.h @@ -372,11 +372,8 @@ public: class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensionConverter { public: - wxTextAttrDimensionConverter(wxDC& dc, double scale = 1.0, const wxSize& parentSize = wxDefaultSize) - { m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize; } - - wxTextAttrDimensionConverter(int ppi, double scale = 1.0, const wxSize& parentSize = wxDefaultSize) - { m_ppi = ppi; m_scale = scale; m_parentSize = parentSize; } + wxTextAttrDimensionConverter(wxDC& dc, double scale = 1.0, const wxSize& parentSize = wxDefaultSize); + wxTextAttrDimensionConverter(int ppi, double scale = 1.0, const wxSize& parentSize = wxDefaultSize); int GetPixels(const wxTextAttrDimension& dim, int direction = wxHORIZONTAL) const; int GetTenthsMM(const wxTextAttrDimension& dim) const; diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 86be3e8394..e7a1a328f5 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -8656,6 +8656,16 @@ void wxTextAttrDimension::CollectCommonAttributes(const wxTextAttrDimension& att absentAttr.SetPresent(true); } +wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(wxDC& dc, double scale, const wxSize& parentSize) +{ + m_ppi = dc.GetPPI().x; m_scale = scale; m_parentSize = parentSize; +} + +wxTextAttrDimensionConverter::wxTextAttrDimensionConverter(int ppi, double scale, const wxSize& parentSize) +{ + m_ppi = ppi; m_scale = scale; m_parentSize = parentSize; +} + int wxTextAttrDimensionConverter::ConvertTenthsMMToPixels(int units) const { return wxRichTextObject::ConvertTenthsMMToPixels(m_ppi, units, m_scale);