Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use iconv() for wxCSConv constructed from a wxFontEncoding; don't use wxFontMapper unless really needed; when it is used, don't use it interactively

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-24 21:50:00 +00:00
parent 878d055d0b
commit c547282d5e
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/strconv.cpp
View File

@@ -1317,28 +1317,12 @@ void wxCSConv::SetName(const wxChar *charset)
} }
} }
static inline bool DoesntNeedConv(wxFontEncoding enc)
{
return enc == wxFONTENCODING_DEFAULT ||
enc == wxFONTENCODING_SYSTEM ||
enc == wxFONTENCODING_ISO8859_1;
}
wxMBConv *wxCSConv::DoCreate() const wxMBConv *wxCSConv::DoCreate() const
{ {
#if wxUSE_FONTMAP // check for the special case of ASCII or ISO8859-1 charset: as we have
wxFontMapper * const fontMapper = wxFontMapper::Get(); // special knowledge of it anyhow, we don't need to create a special
// conversion object
wxFontEncoding encFromName = m_name ? fontMapper->CharsetToEncoding(m_name) if ( m_encoding == wxFONTENCODING_ISO8859_1 )
: wxFONTENCODING_SYSTEM;
#endif // wxUSE_FONTMAP
// check for the special case of ASCII charset
if ( (!m_name && DoesntNeedConv(m_encoding))
#if wxUSE_FONTMAP
|| (m_name && DoesntNeedConv(encFromName))
#endif // wxUSE_FONTMAP
)
{ {
// don't convert at all // don't convert at all
return NULL; return NULL;
@@ -1354,9 +1338,18 @@ wxMBConv *wxCSConv::DoCreate() const
// step (1) // step (1)
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
#if !wxUSE_FONTMAP
if ( m_name ) if ( m_name )
#endif // !wxUSE_FONTMAP
{ {
wxMBConv_iconv *conv = new wxMBConv_iconv(m_name); wxString name(m_name);
#if wxUSE_FONTMAP
if ( name.empty() )
name = wxFontMapper::Get()->GetEncodingName(m_encoding);
#endif // wxUSE_FONTMAP
wxMBConv_iconv *conv = new wxMBConv_iconv(name);
if ( conv->IsOk() ) if ( conv->IsOk() )
return conv; return conv;
@@ -1378,8 +1371,13 @@ wxMBConv *wxCSConv::DoCreate() const
// step (2) // step (2)
wxFontEncoding enc = m_encoding; wxFontEncoding enc = m_encoding;
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
if ( enc == wxFONTENCODING_SYSTEM ) if ( enc == wxFONTENCODING_SYSTEM && m_name )
enc = encFromName; {
// use "false" to suppress interactive dialogs -- we can be called from
// anywhere and popping up a dialog from here is the last thing we want to
// do
enc = wxFontMapper::Get()->CharsetToEncoding(m_name, false);
}
#endif // wxUSE_FONTMAP #endif // wxUSE_FONTMAP
switch ( enc ) switch ( enc )