Use system default font for all platforms

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

diff --git a/src/mac/fontutil.cpp b/src/mac/fontutil.cpp
index 49d08234bcbe103056b28e3fd43152fe024a98ea..c5a0f583d673221edbb9fe943360501c6eb14444 100644 (file)
--- 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;