ATSU Rendering Support added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 115742d7966534ebeac7a09ec38cf431d4ede458..cfc9958cf8726f65ddd2caf1a0c1c5a6e13d4467 100644 (file)
--- 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 220900327af64810b51b27b000d42a007d21c6d3..d9edd98f8e565013e90d0b8c961a5c185841cc1b 100644 (file)
--- 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() ;
 };