capitalize the application name in GetAppDisplayName() by default; this results in...

[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..a9f62f22c9d8b3c9b413b6956f4871858891fd5d 100644 (file)
--- a/include/wx/osx/carbon/font.h
+++ b/include/wx/osx/carbon/font.h
@@ -51,7 +51,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT
     bool MacCreateFromUIFont( wxUint32 coreTextFontType );
     bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
     bool MacCreateFromCTFont( const void * ctFont );
@@ -89,7 +89,7 @@ public:
 
     // 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;
@@ -102,11 +102,11 @@ public:
 
     // Returns an ATSUStyle not ATSUStyle*
 #endif
-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT
     const void * MacGetCTFont() const;
     const void * MacGetCTFontDescriptor() const;
 #endif
-#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
     void* MacGetATSUStyle() const ;
 #endif