/////////////////////////////////////////////////////////////////////////////
-// Name: common/fontmap.cpp
+// Name: src/common/fontmap.cpp
// Purpose: wxFontMapper class
// Author: Vadim Zeitlin
// Modified by:
#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
#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_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
bool m_flagOld;
bool& m_flag;
- DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
+ wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker);
};
// ============================================================================
{
}
-bool wxFontMapper::IsWxFontMapper()
-{ return true; }
-
/* static */
wxFontMapper *wxFontMapper::Get()
{
wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
- wxASSERT_MSG(fontmapper->IsWxFontMapper(), wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase."));
+ 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.
- return (wxFontMapper*)fontmapper;
+ // only want to call wxFontMapperBase functions and it's better than
+ // crashing by returning NULL
+ return (wxFontMapper *)fontmapper;
}
wxFontEncoding
// 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();
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
encName = GetEncodingName(encoding);
if ( !facename.empty() )
{
- configEntry = facename + _T("_");
+ configEntry = facename + wxT("_");
}
configEntry += encName;
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
{
wxString title(m_titleDialog);
if ( !title )
- title << wxTheApp->GetAppName() << _(": unknown encoding");
+ title << wxTheApp->GetAppDisplayName() << _(": unknown encoding");
// built the message
wxString encDesc = GetEncodingDescription(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
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
bool interactive)
{
wxCHECK_MSG( encodingAlt, false,
- _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
+ wxT("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
-#ifdef __WXGTK20__
- // in GTK+ 2 we can always use UTF-8 for everything so just do it,
- // especially as no other font encodings are currently supported
- *encodingAlt = wxFONTENCODING_UTF8;
- return true;
-#else // !wxGTK2
wxNativeEncodingInfo info;
if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
return false;
*encodingAlt = info.encoding;
return true;
-#endif // wxGTK2/!wxGTK2
}
bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
return wxTestFontEncoding(info);
}
+#if wxUSE_FONTDLG
+wxFontDialogBase::~wxFontDialogBase()
+{
+}
+#endif
+
#endif // wxUSE_FONTMAP
projects / wxWidgets.git / blobdiff