X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f1698c34c3d4241bb96a6a40d02bd25df6db594..757cc9def70e4685054f4a24238e2df111f6c9fd:/src/common/strconv.cpp diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 1a5dbe119a..bdb210d538 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -791,7 +791,7 @@ public: enc(wxFONTENCODING_SYSTEM) { if (name) - enc = wxTheFontMapper->CharsetToEncoding(name, FALSE); + enc = wxFontMapper::Get()->CharsetToEncoding(name, FALSE); m_ok = m2w.Init(enc, wxFONTENCODING_UNICODE) && w2m.Init(wxFONTENCODING_UNICODE, enc); @@ -840,7 +840,7 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name) { // check for the special case of ASCII charset #if wxUSE_FONTMAP - if ( wxTheFontMapper->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT ) + if ( wxFontMapper::Get()->CharsetToEncoding(name) == wxFONTENCODING_DEFAULT ) #else // wxUSE_FONTMAP if ( !name ) #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP @@ -920,6 +920,20 @@ wxCSConv::~wxCSConv() Clear(); } +wxCSConv::wxCSConv(const wxCSConv& conv) + : wxMBConv() +{ + Clear(); + SetName(conv.m_name); +} + +wxCSConv& wxCSConv::operator=(const wxCSConv& conv) +{ + Clear(); + SetName(conv.m_name); + return *this; +} + void wxCSConv::Clear() { if (m_name)