wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode

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

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index fac6a43dc5c4721acefe7491ba2dfcc0278057c9..dc5a0ce72fd3c7eadd58f0b6e33581b680ec7e76 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/src/osx/carbon/font.cpp
@@ -378,7 +378,7 @@ wxFontRefData::wxFontRefData(wxOSXSystemFont font, int size)
             if ( style & underline )
                 underlined = true ;
                 
-            m_info.Init(size,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
+            m_info.Init(fontSize,wxFONTFAMILY_DEFAULT,fontstyle,fontweight,underlined,
                 wxMacMakeStringFromPascal( qdFontName ), wxFONTENCODING_DEFAULT);
          }
     }
@@ -576,6 +576,14 @@ wxFont::~wxFont()
 {
 }
 
+void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
+{
+    UnRef();
+    
+    m_refData = new wxFontRefData( info);
+}
+
+
 bool wxFont::RealizeResource()
 {
     M_FONTDATA->MacFindFont();
@@ -938,7 +946,7 @@ void wxNativeFontInfo::Init()
     m_weight = wxFONTWEIGHT_NORMAL;
     m_underlined = false;
     m_faceName.clear();
-    m_encoding = wxFONTENCODING_DEFAULT;
+    m_encoding = wxFont::GetDefaultEncoding();
     m_descriptorValid = false;
 }
 
@@ -1105,6 +1113,8 @@ void wxNativeFontInfo::Init(int size,
     m_weight = weight;
     m_underlined = underlined;
     m_faceName = faceName;
+    if ( encoding == wxFONTENCODING_DEFAULT )
+        encoding = wxFont::GetDefaultEncoding();
     m_encoding = encoding;
 
 }
@@ -1289,6 +1299,8 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family_)
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
 {
+    if ( encoding_ == wxFONTENCODING_DEFAULT )
+        encoding_ = wxFont::GetDefaultEncoding();
     m_encoding = encoding_;
     // not reflected in native descriptors
 }
\ No newline at end of file