check that the version of __sync_sub_and_fetch that returns a value is supported...

[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 f513354e3545b43a03066b7efee561ed6674e4b6..9863e0325de4e298d2265e73607dd0cebd1a03e0 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -50,12 +50,18 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
 
     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();
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     
     virtual ~wxFont();
 
     // 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;
     virtual int GetFamily() const;
     virtual int GetStyle() const;
     virtual int GetWeight() const;


@@ -68,7 +74,7 @@ public:
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
     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);
 
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 


@@ -83,24 +89,30 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
     
 
     // Mac-specific, risks to change, don't use in portable code
     

+#if wxMAC_USE_ATSU_TEXT

     // 'old' Quickdraw accessors
     // 'old' Quickdraw accessors

-    

     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
     
     // 'new' ATSUI accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
     
     // 'new' ATSUI accessors

-    

     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     wxUint16 MacGetThemeFontID() const ;
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     wxUint16 MacGetThemeFontID() const ;

+

     // Returns an ATSUStyle not ATSUStyle*
     // 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 ; 
     void* MacGetATSUStyle() const ; 

+#endif

     
     

-protected:
+private:

     void Unshare();
 
     void Unshare();
 

-private:

     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };