X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72e7876ba5ad16a1b03bb2449ea7886ec648854a..335258dcdd1a1ad091cf08321d898f5ace350fa9:/src/mac/fontutil.cpp?ds=sidebyside

diff --git a/src/mac/fontutil.cpp b/src/mac/fontutil.cpp
index 4f61d13ff4..c5a0f583d6 100644
--- a/src/mac/fontutil.cpp
+++ b/src/mac/fontutil.cpp
@@ -48,12 +48,18 @@
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
-//      facename[;charset]
+//      encodingid;facename[;charset]
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
     wxStringTokenizer tokenizer(s, _T(";"));
 
+    wxString encid = tokenizer.GetNextToken();
+    long enc;
+    if ( !encid.ToLong(&enc) )
+        return FALSE;
+    encoding = (wxFontEncoding)enc;
+
     facename = tokenizer.GetNextToken();
     if ( !facename )
         return FALSE;
@@ -79,7 +85,10 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 
 wxString wxNativeEncodingInfo::ToString() const
 {
-    wxString s(facename);
+    wxString s;
+    
+    s << (long)encoding << _T(';') << facename;
+
     if ( charset != 0 )
     {
         s << _T(';') << charset;
@@ -150,6 +159,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+
     return TRUE;
 }