X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e74d06a33b48f4335bf628da028c2a02676a92a6..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/common/fontmap.cpp diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp index 87b28c7bd2..ee567ab31d 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 // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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,71 +45,71 @@ #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 +// ---------------------------------------------------------------------------- +// XTI +// ---------------------------------------------------------------------------- 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 ) +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_CP1258 ) +wxENUM_MEMBER( wxFONTENCODING_CP1361 ) +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 @@ -143,7 +143,7 @@ private: bool m_flagOld; bool& m_flag; - DECLARE_NO_COPY_CLASS(ReentrancyBlocker) + wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker); }; // ============================================================================ @@ -164,13 +164,16 @@ wxFontMapper::~wxFontMapper() } /* static */ -// Declared as returning wxFontMapper when wxUSE_GUI=1. Unfortunately, it's -// only implemented in wxBase library. Note that if the last resort -// is taken and GUI code tries to treat it as a real wxFontMapper -// then you'd be in trouble. wxFontMapper *wxFontMapper::Get() { - return (wxFontMapper*)wxFontMapperBase::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 @@ -194,11 +197,11 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) // the dialog title wxString title(m_titleDialog); if ( !title ) - title << wxTheApp->GetAppName() << _(": unknown charset"); + title << wxTheApp->GetAppDisplayName() << _(": unknown charset"); // the message wxString msg; - msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset.c_str()); + msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset); // the list of choices const size_t count = GetSupportedEncodingsCount(); @@ -240,7 +243,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive) 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()); + wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset); } } #endif // wxUSE_CONFIG @@ -327,9 +330,9 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, wxString configEntry, encName = GetEncodingName(encoding); - if ( !facename.IsEmpty() ) + if ( !facename.empty() ) { - configEntry = facename + _T("_"); + configEntry = facename + wxT("_"); } configEntry += encName; @@ -351,13 +354,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, } else // use the info entered the last time { - if ( !fontinfo.IsEmpty() && !facename.IsEmpty() ) + if ( !fontinfo.empty() && !facename.empty() ) { // we tried to find a match with facename -- now try without it fontinfo = GetConfig()->Read(encName); } - if ( !fontinfo.IsEmpty() ) + if ( !fontinfo.empty() ) { if ( info->FromString(fontinfo) ) { @@ -372,7 +375,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, else { wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"), - fontinfo.c_str()); + fontinfo); } } //else: there is no information in config about this encoding @@ -408,7 +411,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, { wxString title(m_titleDialog); if ( !title ) - title << wxTheApp->GetAppName() << _(": unknown encoding"); + title << wxTheApp->GetAppDisplayName() << _(": unknown encoding"); // built the message wxString encDesc = GetEncodingDescription(encoding), @@ -417,12 +420,12 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, { // ask the user if he wants to override found alternative encoding msg.Printf(_("No font for displaying text in encoding '%s' found,\nbut an alternative encoding '%s' is available.\nDo you want to use this encoding (otherwise you will have to choose another one)?"), - encDesc.c_str(), GetEncodingDescription(equivEncoding).c_str()); + encDesc, GetEncodingDescription(equivEncoding)); } else { msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"), - encDesc.c_str()); + encDesc); } // the question is different in 2 cases so the answer has to be @@ -440,16 +443,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 && 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()); } @@ -466,15 +468,16 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, // // remember it to avoid asking the same question again later #if wxUSE_CONFIG && wxUSE_FILECONFIG - 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, - foundEquivEncoding ? info->ToString().c_str() - : FONTMAPPER_FONT_DONT_ASK + foundEquivEncoding + ? (const wxChar*)info->ToString().c_str() + : FONTMAPPER_FONT_DONT_ASK ); } #endif // wxUSE_CONFIG @@ -493,13 +496,13 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding, const wxString& facename, bool interactive) { + wxCHECK_MSG( encodingAlt, false, + wxT("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;