From 49c8c6915a789604507c5731a0c81ca294bad229 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 15 May 2007 20:47:56 +0000
Subject: [PATCH] LP64 additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/mac/carbon/font.h | 3 +++
 src/mac/carbon/font.cpp      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index c252e01ee9..7762be7a90 100644
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -51,6 +51,9 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;
+#ifdef __LP64__
+	bool MacCreateUIFont( wxUint32 coreTextFontType );
+#endif
 
     virtual ~wxFont();
 
diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 2d32cc3a06..5f177df82d 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -303,7 +303,8 @@ void wxFontRefData::MacFindFont()
     Boolean kTrue = true ;
     Boolean kFalse = false ;
 
-    Fixed atsuSize = IntToFixed( m_macFontSize );
+    Fixed atsuSize = IntToFixed( m_pointSize );
+	short m_macATSUAdditionalQDStyles = 0;
     ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
     ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
     {
@@ -323,7 +324,6 @@ void wxFontRefData::MacFindFont()
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
-#endif
 #else
     if ( m_macThemeFontID != kThemeCurrentPortFont )
     {