// 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"
#include "wx/msgdlg.h"
#include "wx/fontdlg.h"
#include "wx/choicdlg.h"
+#include "wx/encinfo.h"
#include "wx/encconv.h"
{
}
+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."));
+ // Now return it anyway because there's a chance the GUI code might just
+ // only want to call wxFontMapperBase functions.
+ return (wxFontMapper*)fontmapper;
+}
+
wxFontEncoding
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());
wxString configEntry,
encName = GetEncodingName(encoding);
- if ( !!facename )
+ if ( !facename.empty() )
{
configEntry = facename + _T("_");
}
}
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) )
{
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());
}
//
// 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
(