10.4 support for osx-cocoa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-07 20:10:32 +00:00
parent 05cf95ed0d
commit 29e32b7f9e
1 changed files with 4 additions and 3 deletions
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -25,10 +25,11 @@
 #include "wx/graphics.h"
 #include "wx/settings.h"

-#if wxOSX_USE_CARBON
-#include "wx/osx/uma.h"
-#else
 #include "wx/osx/private.h"
+
+#if wxOSX_USE_ATSU_TEXT && !wxOSX_USE_CARBON
+// include themeing support
+#include <Carbon/Carbon.h>
 #endif

 #include <map>