the wxConvUI hack in wxMsgCatalog should only be done in ANSI build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c74b6fbb2141863c04636241176d2705cfb42c86..8b94852d843ea908844c33becb52acdc8b9f4517 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -970,8 +970,10 @@ private:
 class wxMsgCatalog
 {
 public:
 class wxMsgCatalog
 {
 public:

+#if !wxUSE_UNICODE

     wxMsgCatalog() { m_conv = NULL; }
     ~wxMsgCatalog();
     wxMsgCatalog() { m_conv = NULL; }
     ~wxMsgCatalog();

+#endif

 
     // load the catalog from disk (szDirPrefix corresponds to language)
     bool Load(const wxString& dirPrefix, const wxString& name,
 
     // load the catalog from disk (szDirPrefix corresponds to language)
     bool Load(const wxString& dirPrefix, const wxString& name,


@@ -990,9 +992,11 @@ private:
     wxMessagesHash  m_messages; // all messages in the catalog
     wxString        m_name;     // name of the domain
 
     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;
     // the conversion corresponding to this catalog charset if we installed it
     // as the global one
     wxCSConv *m_conv;

+#endif

 
     wxPluralFormsCalculatorPtr  m_pluralFormsCalculator;
 };
 
     wxPluralFormsCalculatorPtr  m_pluralFormsCalculator;
 };


@@ -1434,6 +1438,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
 // wxMsgCatalog class
 // ----------------------------------------------------------------------------
 
 // wxMsgCatalog class
 // ----------------------------------------------------------------------------
 

+#if !wxUSE_UNICODE

 wxMsgCatalog::~wxMsgCatalog()
 {
     if ( m_conv )
 wxMsgCatalog::~wxMsgCatalog()
 {
     if ( m_conv )


@@ -1448,6 +1453,7 @@ wxMsgCatalog::~wxMsgCatalog()
         delete m_conv;
     }
 }
         delete m_conv;
     }
 }

+#endif // !wxUSE_UNICODE

 
 bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
                         const wxString& msgIdCharset, bool bConvertEncoding)
 
 bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
                         const wxString& msgIdCharset, bool bConvertEncoding)


@@ -1461,6 +1467,7 @@ bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
 
 
     file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
 

+#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
     // 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


@@ -1476,6 +1483,7 @@ bool wxMsgCatalog::Load(const wxString& dirPrefix, const wxString& name,
         wxConvUI =
         m_conv = new wxCSConv(file.GetCharset());
     }
         wxConvUI =
         m_conv = new wxCSConv(file.GetCharset());
     }

+#endif // !wxUSE_UNICODE

 
     return true;
 }
 
     return true;
 }