X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6603907dea3324a55ea99608ee69e3b65634fe73..9cf99fc093f9c45b6b5d8d8b357699d826c9916a:/src/common/fontmap.cpp diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index c63b9af1c4..1b981f40e0 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_FONTMAP + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/log.h" @@ -55,6 +57,7 @@ // ---------------------------------------------------------------------------- // the config paths we use +#if wxUSE_CONFIG static const wxChar* FONTMAPPER_ROOT_PATH = wxT("/wxWindows/FontMapper"); static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets"); static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases"); @@ -64,6 +67,7 @@ static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases"); static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings"); static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none"); #endif // wxUSE_GUI +#endif // wxUSE_CONFIG // encodings supported by GetEncodingDescription static wxFontEncoding gs_encodings[] = @@ -132,21 +136,21 @@ static const wxChar* gs_encodingDescs[] = // and the internal names static const wxChar* gs_encodingNames[] = { - wxT( "iso8859-1" ), - wxT( "iso8859-2" ), - wxT( "iso8859-3" ), - wxT( "iso8859-4" ), - wxT( "iso8859-5" ), - wxT( "iso8859-6" ), - wxT( "iso8859-7" ), - wxT( "iso8859-8" ), - wxT( "iso8859-9" ), - wxT( "iso8859-10" ), - wxT( "iso8859-11" ), - wxT( "iso8859-12" ), - wxT( "iso8859-13" ), - wxT( "iso8859-14" ), - wxT( "iso8859-15" ), + wxT( "iso-8859-1" ), + wxT( "iso-8859-2" ), + wxT( "iso-8859-3" ), + wxT( "iso-8859-4" ), + wxT( "iso-8859-5" ), + wxT( "iso-8859-6" ), + wxT( "iso-8859-7" ), + wxT( "iso-8859-8" ), + wxT( "iso-8859-9" ), + wxT( "iso-8859-10" ), + wxT( "iso-8859-11" ), + wxT( "iso-8859-12" ), + wxT( "iso-8859-13" ), + wxT( "iso-8859-14" ), + wxT( "iso-8859-15" ), wxT( "koi8-r" ), wxT( "windows-1250" ), wxT( "windows-1251" ), @@ -211,6 +215,7 @@ wxFontMapper::wxFontMapper() { #if wxUSE_CONFIG m_config = NULL; + m_configIsDummy = FALSE; #endif // wxUSE_CONFIG #if wxUSE_GUI @@ -260,10 +265,27 @@ wxConfigBase *wxFontMapper::GetConfig() // but will allow us to remember the results of the questions at // least during this run m_config = new wxMemoryConfig; - wxConfig::Set(m_config); + m_configIsDummy = TRUE; + // VS: we can't call wxConfig::Set(m_config) here because that would + // disable automatic wxConfig instance creation if this code was + // called before wxApp::OnInit (this happens in wxGTK -- it sets + // default wxFont encoding in wxApp::Initialize()) } } + if ( m_configIsDummy && wxConfig::Get(FALSE) != NULL ) + { + // VS: in case we created dummy m_config (see above), we want to switch back + // to the real one as soon as one becomes available. + m_config = wxConfig::Get(FALSE); + m_configIsDummy = FALSE; + // FIXME: ideally, we should add keys from dummy config to the real one now, + // but it is a low-priority task because typical wxWin application + // either doesn't use wxConfig at all or creates wxConfig object in + // wxApp::OnInit(), before any real interaction with the user takes + // place... + } + return m_config; } @@ -376,6 +398,12 @@ wxString wxFontMapper::GetEncodingName(wxFontEncoding encoding) wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) { + // a special pseudo encoding which means "don't ask me about this charset + // any more" - we need it to avoid driving the user crazy with asking him + // time after time about the same charset which he [presumably] doesn't + // have the fonts fot + static const int wxFONTENCODING_UNKNOWN = -2; + wxFontEncoding encoding = wxFONTENCODING_SYSTEM; // we're going to modify it, make a copy @@ -392,6 +420,12 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, long value = config->Read(charset, -1l); if ( value != -1 ) { + if ( value == wxFONTENCODING_UNKNOWN ) + { + // don't try to find it, in particular don't ask the user + return wxFONTENCODING_SYSTEM; + } + if ( value >= 0 && value <= wxFONTENCODING_MAX ) { encoding = (wxFontEncoding)value; @@ -418,7 +452,7 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, RestorePath(pathOld); } -#endif +#endif // wxUSE_CONFIG // if didn't find it there, try to recognize it ourselves if ( encoding == wxFONTENCODING_SYSTEM ) @@ -568,24 +602,25 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, if ( n != -1 ) { encoding = gs_encodings[n]; + } #if wxUSE_CONFIG // save the result in the config now - if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) ) - { - wxConfigBase *config = GetConfig(); - - // remember the alt encoding for this charset - if ( !config->Write(charset, (long)encoding) ) - { - wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str()); - } + if ( ChangePath(FONTMAPPER_CHARSET_PATH, &pathOld) ) + { + wxConfigBase *config = GetConfig(); - RestorePath(pathOld); + // remember the alt encoding for this charset - or remember that + // we don't know it + long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding; + if ( !config->Write(charset, value) ) + { + wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str()); } -#endif // wxUSE_CONFIG + + RestorePath(pathOld); } - //else: cancelled +#endif // wxUSE_CONFIG } #endif // wxUSE_GUI @@ -734,6 +769,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, #endif // wxUSE_CONFIG // ask the user +#if wxUSE_FONTDLG if ( interactive ) { wxString title(m_titleDialog); @@ -793,6 +829,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, } } //else: we're in non-interactive mode +#endif // wxUSE_FONTDLG // now try the default mappings: wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding); @@ -835,3 +872,5 @@ bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding, } #endif // wxUSE_GUI + +#endif // wxUSE_FONTMAP