// ----------------------------------------------------------------------------
// the config paths we use
-static const char* FONTMAPPER_ROOT_PATH = _T("FontMapper");
-static const char* FONTMAPPER_CHARSET_PATH = _T("Charsets");
-static const char* FONTMAPPER_CHARSET_ALIAS_PATH = _T("Aliases");
-static const char* FONTMAPPER_FONT_FROM_ENCODING_PATH = _T("Encodings");
+static const wxChar* FONTMAPPER_ROOT_PATH = wxT("FontMapper");
+static const wxChar* FONTMAPPER_CHARSET_PATH = wxT("Charsets");
+static const wxChar* FONTMAPPER_CHARSET_ALIAS_PATH = wxT("Aliases");
+static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
// encodings supported by GetEncodingDescription
static wxFontEncoding gs_encodings[] =
// and the internal names
static const wxChar* gs_encodingNames[] =
{
- "iso8859-1",
- "iso8859-2",
- "iso8859-3",
- "iso8859-4",
- "iso8859-5",
- "iso8859-6",
- "iso8859-7",
- "iso8859-8",
- "iso8859-9",
- "iso8859-10",
- "iso8859-11",
- "iso8859-12",
- "iso8859-13",
- "iso8859-14",
- "iso8859-15",
- "koi8-r",
- "windows1250",
- "windows1251",
- "windows1252",
- "windows1253",
- "windows1254",
- "windows1255",
- "windows1256",
- "windows1257",
+ wxT( "iso8859-1" ),
+ wxT( "iso8859-2" ),
+ wxT( "iso8859-3" ),
+ wxT( "iso8859-4" ),
+ wxT( "iso8859-5" ),
+ wxT( "iso8859-6" ),
+ wxT( "iso8859-7" ),
+ wxT( "iso8859-8" ),
+ wxT( "iso8859-9" ),
+ wxT( "iso8859-10" ),
+ wxT( "iso8859-11" ),
+ wxT( "iso8859-12" ),
+ wxT( "iso8859-13" ),
+ wxT( "iso8859-14" ),
+ wxT( "iso8859-15" ),
+ wxT( "koi8-r" ),
+ wxT( "windows1250" ),
+ wxT( "windows1251" ),
+ wxT( "windows1252" ),
+ wxT( "windows1253" ),
+ wxT( "windows1254" ),
+ wxT( "windows1255" ),
+ wxT( "windows1256" ),
+ wxT( "windows1257" ),
};
// ----------------------------------------------------------------------------
void wxFontMapper::SetConfigPath(const wxString& prefix)
{
wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
- _T("an absolute path should be given to "
+ wxT("an absolute path should be given to "
"wxFontMapper::SetConfigPath()") );
m_configRootPath = prefix;
}
wxASSERT_MSG( !pathNew || (pathNew[0] != wxCONFIG_PATH_SEPARATOR),
- _T("should be a relative path") );
+ wxT("should be a relative path") );
path += pathNew;
size_t count = WXSIZEOF(gs_encodingDescs);
wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
- _T("inconsitency detected - forgot to update one of "
+ wxT("inconsitency detected - forgot to update one of "
"the arrays?") );
for ( size_t i = 0; i < count; i++ )
size_t count = WXSIZEOF(gs_encodingNames);
wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
- _T("inconsitency detected - forgot to update one of "
+ wxT("inconsitency detected - forgot to update one of "
"the arrays?") );
for ( size_t i = 0; i < count; i++ )
}
else
{
- wxLogDebug(_T("corrupted config data - invalid encoding %ld "
+ wxLogDebug(wxT("corrupted config data - invalid encoding %ld "
"for charset '%s'"), value, charset.c_str());
}
}
{
cs.MakeUpper();
- if ( !cs || cs == _T("US-ASCII") )
+ if ( !cs || cs == wxT("US-ASCII") )
encoding = wxFONTENCODING_DEFAULT;
- else if ( cs == _T("KOI8-R") || cs == _T("KOI8-U") )
+ else if ( cs == wxT("KOI8-R") || cs == wxT("KOI8-U") )
encoding = wxFONTENCODING_KOI8;
- else if ( cs.Left(3) == _T("ISO") )
+ else if ( cs.Left(3) == wxT("ISO") )
{
// the dash is optional (or, to be exact, it is not, but
// several brokenmails "forget" it)
const wxChar *p = cs.c_str() + 3;
- if ( *p == _T('-') )
+ if ( *p == wxT('-') )
p++;
unsigned int value;
- if ( wxSscanf(p, _T("8859-%u"), &value) == 1 )
+ if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
{
if ( value < wxFONTENCODING_ISO8859_MAX -
wxFONTENCODING_ISO8859_1 )
}
}
}
- else if ( cs.Left(8) == _T("WINDOWS-") )
+ else if ( cs.Left(8) == wxT("WINDOWS-") )
{
int value;
- if ( wxSscanf(cs.c_str() + 8, "%u", &value) == 1 )
+ if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
{
if ( value >= 1250 )
{
size_t count = WXSIZEOF(gs_encodingDescs);
wxASSERT_MSG( count == WXSIZEOF(gs_encodings),
- _T("inconsitency detected - forgot to update one of "
+ wxT("inconsitency detected - forgot to update one of "
"the arrays?") );
wxString *encodingNamesTranslated = new wxString[count];
- for ( size_t n = 0; n < count; n++ )
+ for ( size_t i = 0; i < count; i++ )
{
- encodingNamesTranslated[n] = wxGetTranslation(gs_encodingDescs[n]);
+ encodingNamesTranslated[i] = wxGetTranslation(gs_encodingDescs[i]);
}
// the parent window
wxNativeEncodingInfo *info,
bool interactive)
{
- wxCHECK_MSG( info, FALSE, _T("bad pointer in GetAltForEncoding") );
+ wxCHECK_MSG( info, FALSE, wxT("bad pointer in GetAltForEncoding") );
+
+ if ( encoding == wxFONTENCODING_DEFAULT )
+ {
+ encoding = wxFont::GetDefaultEncoding();
+ }
+
+ // if we failed to load the system default encoding, something is really
+ // wrong and we'd better stop now - otherwise we will go into endless
+ // recursion trying to create the font in the msg box with the error
+ // message
+ if ( encoding == wxFONTENCODING_SYSTEM )
+ {
+ wxFatalError(_("can't load any font, aborting"));
+
+ // wxFatalError doesn't return
+ }
wxString configEntry = GetEncodingName(encoding);
}
else
{
- wxLogDebug(_T("corrupted config data: string '%s' is not "
+ wxLogDebug(wxT("corrupted config data: string '%s' is not "
"a valid font encoding info"), fontinfo.c_str());
}
}
wxFontData retData = dialog.GetFontData();
wxFont font = retData.GetChosenFont();
- info->xregistry = retData.EncodingInfo().xregistry;
- info->xencoding = retData.EncodingInfo().xencoding;
+ *info = retData.EncodingInfo();
// remember this in the config
if ( ChangePath(FONTMAPPER_FONT_FROM_ENCODING_PATH, &pathOld) )
projects / wxWidgets.git / blobdiff