X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e34db1d94748cc22be9531173a3223faecc7099..659863d8a73d02626f4060bb1099fe7bfd80d22a:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 4d373edc8b..ffddf1c6a6 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -318,7 +318,12 @@ public:
         { return m_nativeFontInfo; }
 
     void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
-        { Free(); m_nativeFontInfo = nativeFontInfo; }
+    {
+        Free();
+
+        m_nativeFontInfo = nativeFontInfo;
+        m_nativeFontInfoOk = true;
+    }
 
 protected:
     // common part of all ctors
@@ -822,7 +827,7 @@ wxString wxNativeFontInfo::ToString() const
              lf.lfClipPrecision,
              lf.lfQuality,
              lf.lfPitchAndFamily,
-             lf.lfFaceName);
+             (const wxChar*)lf.lfFaceName);
 
     return s;
 }