extact common GAddress declarations to the common header instead of duplicating them...

[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 3962e4b287c905af4c9fc9292f1bc64ee8e3ec99..d2dcb558ae321f3794163cb3560570e894927f2b 100644 (file)
--- a/include/wx/osx/carbon/font.h
+++ b/include/wx/osx/carbon/font.h
@@ -50,8 +50,10 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
 
     bool Create(const wxNativeFontInfo& info);
 

+#if wxOSX_USE_CARBON

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

-#if wxMAC_USE_CORE_TEXT
+#endif
+#if wxOSX_USE_CORE_TEXT

     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );
     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );


@@ -89,7 +91,7 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
 
 
     // Mac-specific, risks to change, don't use in portable code
 

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;


@@ -102,11 +104,10 @@ public:
 
     // Returns an ATSUStyle not ATSUStyle*
 #endif
 
     // Returns an ATSUStyle not ATSUStyle*
 #endif

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     const void * MacGetCTFont() const;
     const void * MacGetCTFont() const;

-    const void * MacGetCTFontDescriptor() const;

 #endif
 #endif

-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT

     void* MacGetATSUStyle() const ;
 #endif
 
     void* MacGetATSUStyle() const ;
 #endif