From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 7 Sep 2008 20:10:32 +0000 (+0000)
Subject: 10.4 support for osx-cocoa
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/29e32b7f9e620bebbb8f22f49742da155ef931c7

10.4 support for osx-cocoa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index fcd8f90466..c5b0cd5da8 100644
--- 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>