X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e1d0be19102670c4ea8c08ec5b9fd9467dcf02c..622be94c78deeae8490d9783c11a24c599ae1464:/src/mac/fontutil.cpp?ds=inline diff --git a/src/mac/fontutil.cpp b/src/mac/fontutil.cpp index c5a0f583d6..4f61d13ff4 100644 --- a/src/mac/fontutil.cpp +++ b/src/mac/fontutil.cpp @@ -48,18 +48,12 @@ // ---------------------------------------------------------------------------- // convert to/from the string representation: format is -// encodingid;facename[;charset] +// 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; @@ -85,10 +79,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s) wxString wxNativeEncodingInfo::ToString() const { - wxString s; - - s << (long)encoding << _T(';') << facename; - + wxString s(facename); if ( charset != 0 ) { s << _T(';') << charset; @@ -159,8 +150,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, return FALSE; } - info->encoding = encoding; - return TRUE; }