Fix wxListCtrl background colour bug Part I

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 2d3e5f903323941659823fdcf20d417a6eeff51d..ab906cad670ebc795f1f203b7454e501793c052f 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -22,6 +22,9 @@
 
 #include "wx/fontutil.h"
 
 
 #include "wx/fontutil.h"
 

+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+

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


@@ -113,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" ) ;

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