indentation instead of being its double. Its default value was changed
accordingly, to 2.
+- wxLOCALE_CONV_ENCODING flag has no effect now, catalogs are converted
+ regardless of whether the flag was specified or not. This only affects
+ legacy ANSI builds.
+
Changes in behaviour which may result in compilation errors
-----------------------------------------------------------
How is this done? When you tell the wxLocale class to load a message catalog
that contains a correct header, it checks the charset. The catalog is then
converted to the charset used (see wxLocale::GetSystemEncoding and
-wxLocale::GetSystemEncodingName) by the user's operating system. This is the
-default behaviour of the wxLocale class; you can disable it by @b not passing
-@c wxLOCALE_CONV_ENCODING to wxLocale::Init.
+wxLocale::GetSystemEncodingName) by the user's operating system.
@section overview_nonenglish_strings Non-English Strings or 8-bit Characters in Source
enum wxLocaleInitFlags
{
wxLOCALE_DONT_LOAD_DEFAULT = 0x0000, // don't load wxwin.mo
- wxLOCALE_LOAD_DEFAULT = 0x0001, // load wxwin.mo?
- wxLOCALE_CONV_ENCODING = 0x0002 // convert encoding on the fly?
+ wxLOCALE_LOAD_DEFAULT = 0x0001 // load wxwin.mo?
+#if WXWIN_COMPATIBILITY_2_8
+ ,wxLOCALE_CONV_ENCODING = 0x0002 // no longer used, simply remove
+ // it from the existing code
+#endif
};
class WXDLLIMPEXP_BASE wxLocale
wxLocale(const wxString& name, // name (for messages)
const wxString& shortName = wxEmptyString, // dir prefix (for msg files)
const wxString& locale = wxEmptyString, // locale (for setlocale)
- bool bLoadDefault = true, // preload wxstd.mo?
- bool bConvertEncoding = false) // convert Win<->Unix if necessary?
+ bool bLoadDefault = true // preload wxstd.mo?
+#if WXWIN_COMPATIBILITY_2_8
+ ,bool bConvertEncoding = true // convert Win<->Unix if necessary?
+#endif
+ )
{
DoCommonInit();
}
wxLocale(int language, // wxLanguage id or custom language
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
+ int flags = wxLOCALE_LOAD_DEFAULT)
{
DoCommonInit();
bool Init(const wxString& name,
const wxString& shortName = wxEmptyString,
const wxString& locale = wxEmptyString,
- bool bLoadDefault = true,
- bool bConvertEncoding = false);
+ bool bLoadDefault = true
+#if WXWIN_COMPATIBILITY_2_8
+ ,bool bConvertEncoding = true
+#endif
+ );
// same as second ctor (returns true on success)
bool Init(int language = wxLANGUAGE_DEFAULT,
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ int flags = wxLOCALE_LOAD_DEFAULT);
// restores old locale
virtual ~wxLocale();
wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
- bool m_bConvertEncoding;
-
bool m_initialized;
static wxLanguageInfoArray *ms_languagesDB;
/**
See Init() for parameters description.
*/
- wxLocale(int language,
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ wxLocale(int language, int flags = wxLOCALE_LOAD_DEFAULT);
/**
See Init() for parameters description.
wxLocale(const wxString& name,
const wxString& short = wxEmptyString,
const wxString& locale = wxEmptyString,
- bool bLoadDefault = true,
- bool bConvertEncoding = false);
+ bool bLoadDefault = true);
/**
The destructor, like the constructor, also has global side effects: the
containing the translations of standard wxWidgets messages
automatically.
- wxLOCALE_DONT_LOAD_DEFAULT: Negation of wxLOCALE_LOAD_DEFAULT.
- - wxLOCALE_CONV_ENCODING: Automatically convert message catalogs to
- platform's default encoding. Note that it will do only basic
- conversion between well-known pair like iso8859-1 and windows-1252 or
- iso8859-2 and windows-1250. See @ref overview_nonenglish for
- detailed description of this behaviour.
- Note that this flag is meaningless in Unicode build.
@return @true on success or @false if the given locale couldn't be set.
*/
bool Init(int language = wxLANGUAGE_DEFAULT,
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ int flags = wxLOCALE_LOAD_DEFAULT);
/**
@deprecated
May be set to @false to prevent loading of the message catalog for the
given locale containing the translations of standard wxWidgets messages.
This parameter would be rarely used in normal circumstances.
- @param bConvertEncoding
- May be set to @true to do automatic conversion of message catalogs to
- platform's native encoding. Note that it will do only basic conversion
- between well-known pair like iso8859-1 and windows-1252 or iso8859-2
- and windows-1250.
- See @ref overview_nonenglish for detailed description of this behaviour.
*/
bool Init(const wxString& name, const wxString& short = wxEmptyString,
- const wxString& locale = wxEmptyString, bool bLoadDefault = true,
- bool bConvertEncoding = false);
+ const wxString& locale = wxEmptyString, bool bLoadDefault = true);
/**
Check whether the operating system and/or C run time environment supports
// don't use wxLOCALE_LOAD_DEFAULT flag so that Init() doesn't return
// false just because it failed to load wxstd catalog
- if ( !m_locale.Init(m_lang, wxLOCALE_DONT_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) )
+ if ( !m_locale.Init(m_lang, wxLOCALE_DONT_LOAD_DEFAULT) )
{
wxLogWarning(_("This language is not supported by the system."));
wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
// fills the hash with string-translation pairs
- bool FillHash(wxMessagesHash& hash,
- const wxString& msgIdCharset,
- bool convertEncoding) const;
+ bool FillHash(wxMessagesHash& hash, const wxString& msgIdCharset) const;
// return the charset of the strings in this catalog or empty string if
// none/unknown
// load the catalog from disk (szDirPrefix corresponds to language)
bool Load(const wxString& dirPrefix, const wxString& name,
- const wxString& msgIdCharset, bool bConvertEncoding = false);
+ const wxString& msgIdCharset);
// get name of the catalog
wxString GetName() const { return m_name; }
}
bool wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
- const wxString& msgIdCharset,
- bool convertEncoding) const
+ const wxString& msgIdCharset) const
{
-#if wxUSE_UNICODE
- // this parameter doesn't make sense, we always must convert encoding in
- // Unicode build
- convertEncoding = true;
-#elif wxUSE_FONTMAP
- if ( convertEncoding )
+ // conversion to use to convert catalog strings to the GUI encoding
+ wxMBConv *inputConv,
+ *inputConvPtr = NULL; // same as inputConv but safely deleteable
+
+ if ( !m_charset.empty() )
{
+#if !wxUSE_UNICODE && wxUSE_FONTMAP
// determine if we need any conversion at all
wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
- if ( encCat == wxLocale::GetSystemEncoding() )
+ if ( encCat != wxLocale::GetSystemEncoding() )
+#endif
{
- // no need to convert
- convertEncoding = false;
+ inputConvPtr =
+ inputConv = new wxCSConv(m_charset);
}
}
-#endif // wxUSE_UNICODE/wxUSE_FONTMAP
-
- // conversion to use to convert catalog strings to the GUI encoding
- wxMBConv *inputConv,
- *inputConvPtr = NULL; // same as inputConv but safely deleteable
- if ( convertEncoding && !m_charset.empty() )
- {
- inputConvPtr =
- inputConv = new wxCSConv(m_charset);
- }
else // no need or not possible to convert the encoding
{
#if wxUSE_UNICODE
// we must somehow convert the narrow strings in the message catalog to
// wide strings, so use the default conversion if we have no charset
inputConv = wxConvCurrent;
-#else // !wxUSE_UNICODE
- inputConv = NULL;
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+#endif
}
// conversion to apply to msgid strings before looking them up: we only
#endif // !wxUSE_UNICODE
bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
- const wxString& msgIdCharset, bool bConvertEncoding)
+ const wxString& msgIdCharset)
{
wxMsgCatalogFile file;
if ( !file.Load(dirPrefix, name, m_pluralFormsCalculator) )
return false;
- if ( !file.FillHash(m_messages, msgIdCharset, bConvertEncoding) )
+ if ( !file.FillHash(m_messages, msgIdCharset) )
return false;
-#if !wxUSE_UNICODE
- // we should use a conversion compatible with the message catalog encoding
- // in the GUI if we don't convert the strings to the current conversion but
- // as the encoding is global, only change it once, otherwise we could get
- // into trouble if we use several message catalogs with different encodings
- //
- // this is, of course, a hack but it at least allows the program to use
- // message catalogs in any encodings without asking the user to change his
- // locale
- if ( !bConvertEncoding &&
- !file.GetCharset().empty() &&
- wxConvUI == &wxConvLocal )
- {
- wxConvUI =
- m_conv = new wxCSConv(file.GetCharset());
- }
-#endif // !wxUSE_UNICODE
-
return true;
}
bool wxLocale::Init(const wxString& name,
const wxString& shortName,
const wxString& locale,
- bool bLoadDefault,
- bool bConvertEncoding)
+ bool bLoadDefault
+#if WXWIN_COMPATIBILITY_2_8
+ ,bool bConvertEncoding
+#endif
+ )
{
wxASSERT_MSG( !m_initialized,
wxS("you can't call wxLocale::Init more than once") );
+#if WXWIN_COMPATIBILITY_2_8
+ wxASSERT_MSG( bConvertEncoding,
+ wxS("wxLocale::Init with bConvertEncoding=false is no longer supported, add charset to your catalogs") );
+#endif
+
m_initialized = true;
m_strLocale = name;
m_strShort = shortName;
- m_bConvertEncoding = bConvertEncoding;
m_language = wxLANGUAGE_UNKNOWN;
// change current locale (default: same as long name)
bool wxLocale::Init(int language, int flags)
{
+#if WXWIN_COMPATIBILITY_2_8
+ wxASSERT_MSG( !(flags & wxLOCALE_CONV_ENCODING),
+ wxS("wxLOCALE_CONV_ENCODING is no longer supported, add charset to your catalogs") );
+#endif
+
bool ret = true;
int lang = language;
}
if ( !Init(name, canonical, retloc,
- (flags & wxLOCALE_LOAD_DEFAULT) != 0,
- (flags & wxLOCALE_CONV_ENCODING) != 0) )
+ (flags & wxLOCALE_LOAD_DEFAULT) != 0) )
{
ret = false;
}
wxMsgCatalog *pMsgCat = new wxMsgCatalog;
- if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) )
+ if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset) )
{
// add it to the head of the list so that in GetString it will
// be searched before the catalogs added earlier
CPPUNIT_ASSERT( m_locale );
// don't load default catalog, it may be unavailable:
- bool loaded = m_locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ bool loaded = m_locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT);
CPPUNIT_ASSERT( loaded );
m_locale->AddCatalog("internat");
wxLocale *locale = new wxLocale;
// don't load default catalog, it may be unavailable:
- CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) );
+ CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) );
static const struct ToDoubleData doubleData2[] =
{
projects / wxWidgets.git / commitdiff
