Slider Updates

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

diff --git a/src/mac/fontutil.cpp b/src/mac/fontutil.cpp
index c5a0f583d673221edbb9fe943360501c6eb14444..4f61d13ff40a7a10b9f71a77498c6c8b71e5b6d7 100644 (file)
--- a/src/mac/fontutil.cpp
+++ b/src/mac/fontutil.cpp
@@ -48,18 +48,12 @@
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is
 // ----------------------------------------------------------------------------
 
 // convert to/from the string representation: format is

-//      encodingid;facename[;charset]
+//      facename[;charset]

 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
     wxStringTokenizer tokenizer(s, _T(";"));
 
 
 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;
     facename = tokenizer.GetNextToken();
     if ( !facename )
         return FALSE;


@@ -85,10 +79,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
 
 wxString wxNativeEncodingInfo::ToString() const
 {
 
 wxString wxNativeEncodingInfo::ToString() const
 {

-    wxString s;
-    
-    s << (long)encoding << _T(';') << facename;
-
+    wxString s(facename);

     if ( charset != 0 )
     {
         s << _T(';') << charset;
     if ( charset != 0 )
     {
         s << _T(';') << charset;


@@ -159,8 +150,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
             return FALSE;
     }
 

-    info->encoding = encoding;
-

     return TRUE;
 }
 
     return TRUE;
 }