/////////////////////////////////////////////////////////////////////////////
-// Name: common/fontmap.cpp
+// Name: src/common/fontmap.cpp
// Purpose: wxFontMapper class
// Author: Vadim Zeitlin
// Modified by:
// 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"
#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"
{
}
+/* 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)
{
// 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();
// 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());
+ wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset);
}
}
#endif // wxUSE_CONFIG
wxString configEntry,
encName = GetEncodingName(encoding);
- if ( !facename.IsEmpty() )
+ if ( !facename.empty() )
{
configEntry = facename + _T("_");
}
}
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) )
{
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
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
(
configEntry,
- foundEquivEncoding ? info->ToString().c_str()
- : FONTMAPPER_FONT_DONT_ASK
+ foundEquivEncoding
+ ? (const wxChar*)info->ToString().c_str()
+ : FONTMAPPER_FONT_DONT_ASK
);
}
#endif // wxUSE_CONFIG
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;
projects / wxWidgets.git / blobdiff