wxChar -> char

[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..9fc1171abbde4bbe91779e588d559912d6a3f9fa 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -51,11 +51,15 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;
+#ifdef __LP64__
+       bool MacCreateUIFont( wxUint32 coreTextFontType );
+#endif
     
     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;
@@ -68,7 +72,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);
 
@@ -83,24 +87,28 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
     
+#ifndef __LP64__    
     // '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 ; 
+#else
+    const void * MacGetCTFont() const;
+    // soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
+    void* MacGetATSUStyle() const ; 
+#endif
     
-protected:
+private:
     void Unshare();
 
-private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };