diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 8527fb5f43..f7d751ede9 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -958,8 +958,10 @@ private: class wxMsgCatalog { public: +#if !wxUSE_UNICODE wxMsgCatalog() { m_conv = NULL; } ~wxMsgCatalog(); +#endif // load the catalog from disk (szDirPrefix corresponds to language) bool Load(const wxChar *szDirPrefix, const wxChar *szName, @@ -978,9 +980,11 @@ private: wxMessagesHash m_messages; // all messages in the catalog wxString m_name; // name of the domain +#if !wxUSE_UNICODE // the conversion corresponding to this catalog charset if we installed it // as the global one wxCSConv *m_conv; +#endif wxPluralFormsCalculatorPtr m_pluralFormsCalculator; }; @@ -1407,6 +1411,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, // wxMsgCatalog class // ---------------------------------------------------------------------------- +#if !wxUSE_UNICODE wxMsgCatalog::~wxMsgCatalog() { if ( m_conv ) @@ -1421,6 +1426,7 @@ wxMsgCatalog::~wxMsgCatalog() delete m_conv; } } +#endif // !wxUSE_UNICODE bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, const wxChar *msgIdCharset, bool bConvertEncoding) @@ -1434,7 +1440,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, file.FillHash(m_messages, msgIdCharset, bConvertEncoding); -#if wxUSE_WCHAR_T +#if !wxUSE_UNICODE && wxUSE_WCHAR_T // 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 @@ -1450,7 +1456,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, wxConvUI = m_conv = new wxCSConv(file.GetCharset()); } -#endif // wxUSE_WCHAR_T +#endif // !wxUSE_UNICODE && wxUSE_WCHAR_T return true; }