]> git.saurik.com Git - wxWidgets.git/commitdiff
fixing 10.5 only compiles
authorStefan Csomor <csomor@advancedconcepts.ch>
Fri, 30 Nov 2007 15:31:52 +0000 (15:31 +0000)
committerStefan Csomor <csomor@advancedconcepts.ch>
Fri, 30 Nov 2007 15:31:52 +0000 (15:31 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/carbon/font.h

index 891e32b6eed657d226d636ff6dde84ba231e0c60..b9e87b571ea69aa3097e502c9fbfafa14979ed51 100644 (file)
@@ -50,9 +50,11 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
-    bool MacCreateThemeFont( wxUint16 themeFontID ) ;
+    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
 #if wxMAC_USE_CORE_TEXT
-       bool MacCreateUIFont( wxUint32 coreTextFontType );
+       bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
+    bool MacCreateFromCTFont( const void * ctFont );
 #endif
     
     virtual ~wxFont();
@@ -103,6 +105,7 @@ public:
 #endif
 #if wxMAC_USE_CORE_TEXT
     const void * MacGetCTFont() const;
+    const void * MacGetCTFontDescriptor() const;
 #endif
     
 private: