adding 10.4 build compatibility for osx cocoa, see #10361

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 20:14:39 +00:00
parent a2580e1c49
commit 7ac5e1c908
10 changed files with 64 additions and 42 deletions
--- a/include/wx/osx/carbon/font.h
+++ b/include/wx/osx/carbon/font.h
@@ -63,7 +63,7 @@ public:

    bool Create(const wxNativeFontInfo& info);

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_ATSU_TEXT
    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
 #endif
 #if wxOSX_USE_CORE_TEXT
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -20,6 +20,11 @@

 #include <ApplicationServices/ApplicationServices.h>

+#if wxOSX_USE_ATSU_TEXT
+    // we need theming and atsu
+    #include <Carbon/Carbon.h>
+#endif
+
 #ifdef __OBJC__

    #import <Cocoa/Cocoa.h>