From 477594f73777791a3341416d995b5d6341010bb3 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 11 Jan 2002 13:27:19 +0000 Subject: [PATCH] ATSU Rendering Support added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/dc.h | 12 ++++++++++-- include/wx/mac/font.h | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h index 115742d796..cfc9958cf8 100644 --- a/include/wx/mac/dc.h +++ b/include/wx/mac/dc.h @@ -274,10 +274,18 @@ protected: mutable bool m_macPenInstalled ; mutable bool m_macBrushInstalled ; - WXHRGN m_macBoundaryClipRgn ; - WXHRGN m_macCurrentClipRgn ; + WXHRGN m_macBoundaryClipRgn ; + WXHRGN m_macCurrentClipRgn ; wxPoint m_macLocalOrigin ; void MacSetupPort( wxMacPortStateHelper* ph ) const ; + void MacCleanupPort( wxMacPortStateHelper* ph ) const ; + mutable void* m_macATSUIStyle ; + mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ; + mutable bool m_macFormerAliasState ; + mutable short m_macFormerAliasSize ; + mutable bool m_macAliasWasEnabled ; + mutable void* m_macForegroundPixMap ; + mutable void* m_macBackgroundPixMap ; }; #endif diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h index 220900327a..d9edd98f8e 100644 --- a/include/wx/mac/font.h +++ b/include/wx/mac/font.h @@ -68,11 +68,12 @@ protected: bool m_underlined; wxString m_faceName; wxFontEncoding m_encoding; - + public : short m_macFontNum ; short m_macFontSize ; unsigned char m_macFontStyle ; + wxUint32 m_macATSUFontID ; public : void MacFindFont() ; }; -- 2.45.2