As members have gone private, use Accessors

[wxWidgets.git] / include / wx / mac / carbon / font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 78aa2f4d5f2f44eac7f0f700f60afa261a1da758..10c07dbb2d0e3c441bc4105e2f2a955e3bfa222b 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -64,6 +64,8 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
+    bool MacCreateThemeFont( wxUint16 themeFontID ) ;
+    
     virtual ~wxFont();
 
     // assignment
@@ -94,14 +96,24 @@ public:
 
     // Unofficial API, don't use
     virtual void SetNoAntiAliasing( bool noAA = TRUE ) ;
-    virtual bool GetNoAntiAliasing() ;
+    virtual bool GetNoAntiAliasing() const  ;
 
     // Mac-specific, risks to change, don't use in portable code
-    short GetMacFontNum() const;
-    short GetMacFontSize() const;
-    wxByte  GetMacFontStyle() const;
-    wxUint32 GetMacATSUFontID() const;
-
+    
+    // 'old' Quickdraw accessors
+    
+    short MacGetFontNum() const;
+    short MacGetFontSize() const;
+    wxByte  MacGetFontStyle() const;
+    
+    // 'new' ATSUI accessors
+    
+    wxUint32 MacGetATSUFontID() const;
+    wxUint32 MacGetATSUAdditionalQDStyles() const;
+    wxUint16 MacGetThemeFontID() const ;
+    // Returns an ATSUStyle not ATSUStyle*
+    void* MacGetATSUStyle() const ; 
+    
 protected:
     // common part of all ctors
     void Init();