X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/fontmap.cpp diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 171639e6e3..449fe5cd26 100644 --- a/src/common/fontmap.cpp +++ b/src/common/fontmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/fontmap.cpp +// Name: src/common/fontmap.cpp // Purpose: wxFontMapper class // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontmap.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,10 +26,14 @@ #if wxUSE_FONTMAP +#include "wx/fontmap.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/msgdlg.h" + #include "wx/choicdlg.h" #endif // PCH #if wxUSE_CONFIG @@ -45,15 +45,69 @@ #include "wx/msw/winundef.h" #endif -#include "wx/fontmap.h" #include "wx/fmappriv.h" #include "wx/fontutil.h" -#include "wx/msgdlg.h" #include "wx/fontdlg.h" -#include "wx/choicdlg.h" +#include "wx/encinfo.h" #include "wx/encconv.h" +#if wxUSE_EXTENDED_RTTI + +wxBEGIN_ENUM( wxFontEncoding ) + wxENUM_MEMBER( wxFONTENCODING_SYSTEM ) + wxENUM_MEMBER( wxFONTENCODING_DEFAULT ) + + wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 ) + wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX ) + wxENUM_MEMBER( wxFONTENCODING_KOI8 ) + wxENUM_MEMBER( wxFONTENCODING_KOI8_U ) + wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE ) + wxENUM_MEMBER( wxFONTENCODING_BULGARIAN ) + wxENUM_MEMBER( wxFONTENCODING_CP437 ) + wxENUM_MEMBER( wxFONTENCODING_CP850 ) + wxENUM_MEMBER( wxFONTENCODING_CP852 ) + wxENUM_MEMBER( wxFONTENCODING_CP855 ) + wxENUM_MEMBER( wxFONTENCODING_CP866 ) + + wxENUM_MEMBER( wxFONTENCODING_CP874 ) + wxENUM_MEMBER( wxFONTENCODING_CP932 ) + wxENUM_MEMBER( wxFONTENCODING_CP936 ) + wxENUM_MEMBER( wxFONTENCODING_CP949 ) + wxENUM_MEMBER( wxFONTENCODING_CP950 ) + wxENUM_MEMBER( wxFONTENCODING_CP1250 ) + wxENUM_MEMBER( wxFONTENCODING_CP1251 ) + wxENUM_MEMBER( wxFONTENCODING_CP1252 ) + wxENUM_MEMBER( wxFONTENCODING_CP1253 ) + wxENUM_MEMBER( wxFONTENCODING_CP1254 ) + wxENUM_MEMBER( wxFONTENCODING_CP1255 ) + wxENUM_MEMBER( wxFONTENCODING_CP1256 ) + wxENUM_MEMBER( wxFONTENCODING_CP1257 ) + wxENUM_MEMBER( wxFONTENCODING_CP12_MAX ) + wxENUM_MEMBER( wxFONTENCODING_UTF7 ) + wxENUM_MEMBER( wxFONTENCODING_UTF8 ) + wxENUM_MEMBER( wxFONTENCODING_GB2312 ) + wxENUM_MEMBER( wxFONTENCODING_BIG5 ) + wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS ) + wxENUM_MEMBER( wxFONTENCODING_EUC_JP ) + wxENUM_MEMBER( wxFONTENCODING_UNICODE ) +wxEND_ENUM( wxFontEncoding ) +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -85,6 +139,8 @@ public: private: bool m_flagOld; bool& m_flag; + + DECLARE_NO_COPY_CLASS(ReentrancyBlocker) }; // ============================================================================ @@ -104,15 +160,34 @@ wxFontMapper::~wxFontMapper() { } +/* static */ +wxFontMapper *wxFontMapper::Get() +{ + wxFontMapperBase *fontmapper = wxFontMapperBase::Get(); + wxASSERT_MSG( !fontmapper->IsDummy(), + wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase.") ); + + // Now return it anyway because there's a chance the GUI code might just + // only want to call wxFontMapperBase functions and it's better than + // crashing by returning NULL + return (wxFontMapper *)fontmapper; +} + wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) { // try the ways not needing the users intervention first - wxFontEncoding - encoding = wxFontMapperBase::CharsetToEncoding(charset, interactive); + int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset); // if we failed to find the encoding, ask the user -- unless disabled - if ( (encoding == wxFONTENCODING_SYSTEM) && interactive ) + if ( encoding == wxFONTENCODING_UNKNOWN ) + { + // this is the special value which disables asking the user (he had + // chosen to suppress this the last time) + encoding = wxFONTENCODING_SYSTEM; + } +#if wxUSE_CHOICEDLG + else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive ) { // prepare the dialog data @@ -153,7 +228,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) encoding = GetEncoding(n); } -#if wxUSE_CONFIG +#if wxUSE_CONFIG && wxUSE_FILECONFIG // save the result in the config now wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH); if ( path.IsOk() ) @@ -162,7 +237,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) // remember the alt encoding for this charset -- or remember that // we don't know it - long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding; + long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding; if ( !config->Write(charset, value) ) { wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str()); @@ -170,8 +245,11 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) } #endif // wxUSE_CONFIG } +#else + wxUnusedVar(interactive); +#endif // wxUSE_CHOICEDLG - return encoding; + return (wxFontEncoding)encoding; } // ---------------------------------------------------------------------------- @@ -187,7 +265,7 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry, if ( wxGetNativeFontEncoding(encReplacement, info) && wxTestFontEncoding(*info) ) { -#if wxUSE_CONFIG +#if wxUSE_CONFIG && wxUSE_FILECONFIG // remember the mapping in the config wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH); @@ -195,6 +273,8 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry, { GetConfig()->Write(configEntry, info->ToString()); } +#else + wxUnusedVar(configEntry); #endif // wxUSE_CONFIG return true; } @@ -247,13 +327,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, wxString configEntry, encName = GetEncodingName(encoding); - if ( !!facename ) + if ( !facename.empty() ) { configEntry = facename + _T("_"); } configEntry += encName; -#if wxUSE_CONFIG +#if wxUSE_CONFIG && wxUSE_FILECONFIG // do we have a font spec for this encoding? wxString fontinfo; wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH); @@ -271,13 +351,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, } else // use the info entered the last time { - if ( !!fontinfo && !!facename ) + if ( !fontinfo.empty() && !facename.empty() ) { // we tried to find a match with facename -- now try without it fontinfo = GetConfig()->Read(encName); } - if ( !!fontinfo ) + if ( !fontinfo.empty() ) { if ( info->FromString(fontinfo) ) { @@ -360,16 +440,15 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, if ( dialog.ShowModal() == wxID_OK ) { wxFontData retData = dialog.GetFontData(); - wxFont font = retData.GetChosenFont(); *info = retData.EncodingInfo(); info->encoding = retData.GetEncoding(); -#if wxUSE_CONFIG +#if wxUSE_CONFIG && wxUSE_FILECONFIG // remember this in the config - wxFontMapperPathChanger path(this, - FONTMAPPER_FONT_FROM_ENCODING_PATH); - if ( path.IsOk() ) + wxFontMapperPathChanger path2(this, + FONTMAPPER_FONT_FROM_ENCODING_PATH); + if ( path2.IsOk() ) { GetConfig()->Write(configEntry, info->ToString()); } @@ -385,10 +464,10 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, // or selected to use equivalent encoding // // remember it to avoid asking the same question again later -#if wxUSE_CONFIG - wxFontMapperPathChanger path(this, - FONTMAPPER_FONT_FROM_ENCODING_PATH); - if ( path.IsOk() ) +#if wxUSE_CONFIG && wxUSE_FILECONFIG + wxFontMapperPathChanger path2(this, + FONTMAPPER_FONT_FROM_ENCODING_PATH); + if ( path2.IsOk() ) { GetConfig()->Write ( @@ -401,6 +480,8 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, } } //else: we're in non-interactive mode +#else + wxUnusedVar(equivEncoding); #endif // wxUSE_FONTDLG return foundEquivEncoding; @@ -411,13 +492,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, const wxString& facename, bool interactive) { + wxCHECK_MSG( encodingAlt, false, + _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") ); + wxNativeEncodingInfo info; if ( !GetAltForEncoding(encoding, &info, facename, interactive) ) return false; - wxCHECK_MSG( encodingAlt, false, - _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") ); - *encodingAlt = info.encoding; return true;