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 352a9a79f88012a62afb4e64afa28e71f7a8d526..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 ) ;
     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 ~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;


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

+#ifndef __LP64__    

     // '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*
     void* MacGetATSUStyle() 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();
 
     void Unshare();
 

-private:

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