X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/mac/carbon/font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index d18f99e5d4..9863e0325d 100644
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -6,16 +6,12 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "font.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -24,13 +20,7 @@ class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font)
-        : wxFontBase()
-    {
-        Init();
-        Ref(font);
-    }
+    wxFont() { }
 
     wxFont(int size,
            int family,
@@ -40,15 +30,11 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
     wxFont(const wxNativeFontInfo& info)
     {
-        Init();
-
         (void)Create(info);
     }
 
@@ -64,15 +50,18 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
-    bool MacCreateThemeFont( wxUint16 themeFontID ) ;
+    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
+#if wxMAC_USE_CORE_TEXT
+	bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
+    bool MacCreateFromCTFont( const void * ctFont );
+#endif
     
     virtual ~wxFont();
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
     // implement base class pure virtuals
     virtual int GetPointSize() const;
+    virtual wxSize GetPixelSize() const;
     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() const;
@@ -85,7 +74,7 @@ public:
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
-    virtual void SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
@@ -96,22 +85,34 @@ 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
+    
+#if wxMAC_USE_ATSU_TEXT
+    // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
+    
+    // 'new' ATSUI accessors
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     wxUint16 MacGetThemeFontID() const ;
-protected:
-    // common part of all ctors
-    void Init();
 
+    // Returns an ATSUStyle not ATSUStyle*
+#endif
+#if wxMAC_USE_CORE_TEXT
+    const void * MacGetCTFont() const;
+    const void * MacGetCTFontDescriptor() const;
+#endif
+#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+    void* MacGetATSUStyle() const ; 
+#endif
+    
+private:
     void Unshare();
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };