added an explicit accessor to query the default key value

[wxWidgets.git] / src / mac / font.cpp

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 2335e5d2621fe523a461eaa363135fd426edebfa..ab906cad670ebc795f1f203b7454e501793c052f 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -23,7 +23,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/mac/private.h"

-
+#include "ATSUnicode.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)


@@ -116,6 +116,12 @@ void wxFontRefData::MacFindFont()
        if (m_underlined) 
                m_macFontStyle |= underline;
        m_macFontSize = m_pointSize ;
        if (m_underlined) 
                m_macFontStyle |= underline;
        m_macFontSize = m_pointSize ;

+       
+       //TODO:if we supply the style as an additional parameter we must make a testing
+       //sequence in order to degrade gracefully while trying to maintain most of the style
+       //information, meanwhile we just take the normal font and apply the features after
+       OSStatus status = ::ATSUFONDtoFontID(m_macFontNum, normal /*qdStyle*/, (UInt32*)&m_macATSUFontID); 
+       wxASSERT_MSG( status == noErr , "couldn't retrieve font identifier" ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------