don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow

[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 891e32b6eed657d226d636ff6dde84ba231e0c60..9863e0325de4e298d2265e73607dd0cebd1a03e0 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -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();
@@ -99,10 +101,13 @@ public:
     wxUint16 MacGetThemeFontID() const ;
 
     // Returns an ATSUStyle not ATSUStyle*
-    void* MacGetATSUStyle() const ; 
 #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: