Fixed non-precompiled headers compilation

[wxWidgets.git] / include / wx / osx / carbon / font.h

diff --git a/include/wx/osx/carbon/font.h b/include/wx/osx/carbon/font.h
index a9f62f22c9d8b3c9b413b6956f4871858891fd5d..d2dcb558ae321f3794163cb3560570e894927f2b 100644 (file)
--- a/include/wx/osx/carbon/font.h
+++ b/include/wx/osx/carbon/font.h
@@ -50,7 +50,9 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
 
     bool Create(const wxNativeFontInfo& info);
 

+#if wxOSX_USE_CARBON

     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;

+#endif

 #if wxOSX_USE_CORE_TEXT
     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
 #if wxOSX_USE_CORE_TEXT
     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );


@@ -104,7 +106,6 @@ public:
 #endif
 #if wxOSX_USE_CORE_TEXT
     const void * MacGetCTFont() const;
 #endif
 #if wxOSX_USE_CORE_TEXT
     const void * MacGetCTFont() const;

-    const void * MacGetCTFontDescriptor() const;

 #endif
 #if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
     void* MacGetATSUStyle() const ;
 #endif
 #if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
     void* MacGetATSUStyle() const ;