use wxArtProvider

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index a45ef71754f29b1420999f97c23e0a2af7b0330e..e8b3ea68180d183ca25c174f3defe85c8ad22e03 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -420,7 +420,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     if ( !!charset )
         csConv = new wxCSConv(charset);
 
     if ( !!charset )
         csConv = new wxCSConv(charset);
 

-    wxMBConv& inputConv = csConv ? *csConv : *wxConvCurrent;
+    wxMBConv& inputConv = csConv ? *((wxMBConv*)csConv) : *wxConvCurrent;

 
     for (size_t i = 0; i < m_numStrings; i++)
     {
 
     for (size_t i = 0; i < m_numStrings; i++)
     {


@@ -443,6 +443,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     #if wxUSE_FONTMAP
     if ( convertEncoding )
     {
     #if wxUSE_FONTMAP
     if ( convertEncoding )
     {

+        wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;

         wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
         if ( enc == wxFONTENCODING_SYSTEM )
         {
         wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charset, FALSE);
         if ( enc == wxFONTENCODING_SYSTEM )
         {


@@ -450,7 +451,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
         }
         else
         {
         }
         else
         {

-            wxFontEncoding targetEnc = wxLocale::GetSystemEncoding();
+            targetEnc = wxLocale::GetSystemEncoding();

             if (targetEnc == wxFONTENCODING_SYSTEM)
             {
                 wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
             if (targetEnc == wxFONTENCODING_SYSTEM)
             {
                 wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);


@@ -479,7 +480,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
     }
 
     if ( !convertEncoding )
     }
 
     if ( !convertEncoding )

-    #else // !wxUSE_FONTMAP
+    #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

     {
         for (size_t i = 0; i < m_numStrings; i++)
         {
     {
         for (size_t i = 0; i < m_numStrings; i++)
         {


@@ -487,7 +488,6 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons
             hash[key] = StringAtOfs(m_pTransTable, i);
         }
     }
             hash[key] = StringAtOfs(m_pTransTable, i);
         }
     }

-    #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP

 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 }
 
 #endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
 }
 


@@ -528,7 +528,7 @@ wxString wxMsgCatalogFile::GetCharset() const
 // ----------------------------------------------------------------------------
 
 bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, 
 // ----------------------------------------------------------------------------
 
 bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, 

-                        bool bConvertEncoding = FALSE)
+                        bool bConvertEncoding)

 {
     wxMsgCatalogFile file;
     
 {
     wxMsgCatalogFile file;
     


@@ -539,8 +539,8 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
         file.FillHash(m_messages, bConvertEncoding);
         return TRUE;
     }
         file.FillHash(m_messages, bConvertEncoding);
         return TRUE;
     }

-    else
-        return FALSE;
+
+    return FALSE;

 }
 
 const wxChar *wxMsgCatalog::GetString(const wxChar *sz) const
 }
 
 const wxChar *wxMsgCatalog::GetString(const wxChar *sz) const