X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01f953efb211daf5275cbb10aa3dd000eeed6d48..95316a3f245a4baf3046e97222660bed986153ed:/src/common/translation.cpp

diff --git a/src/common/translation.cpp b/src/common/translation.cpp
index ce26443960..1996330eac 100644
--- a/src/common/translation.cpp
+++ b/src/common/translation.cpp
@@ -54,6 +54,7 @@
     #include "wx/dynlib.h"
     #include "wx/scopedarray.h"
     #include "wx/msw/wrapwin.h"
+    #include "wx/msw/missing.h"
 #endif
 #ifdef __WXOSX__
     #include "wx/osx/core/cfstring.h"
@@ -148,11 +149,11 @@ wxString GetPreferredUILanguage(const wxArrayString& available)
                 }
                 LogTraceArray(" - system preferred languages", preferred);
 
-                for ( wxArrayString::const_iterator i = preferred.begin();
-                      i != preferred.end();
-                      ++i )
+                for ( wxArrayString::const_iterator j = preferred.begin();
+                      j != preferred.end();
+                      ++j )
                 {
-                    wxString lang(*i);
+                    wxString lang(*j);
                     lang.Replace("-", "_");
                     if ( available.Index(lang) != wxNOT_FOUND )
                         return lang;
@@ -288,7 +289,7 @@ public:
         T_LEFT_BRACKET, T_RIGHT_BRACKET
     };
     Type type() const { return m_type; }
-    void setType(Type type) { m_type = type; }
+    void setType(Type t) { m_type = t; }
     // for T_NUMBER only
     typedef int Number;
     Number number() const { return m_number; }
@@ -465,7 +466,7 @@ private:
 class wxPluralFormsNode
 {
 public:
-    wxPluralFormsNode(const wxPluralFormsToken& token) : m_token(token) {}
+    wxPluralFormsNode(const wxPluralFormsToken& t) : m_token(t) {}
     const wxPluralFormsToken& token() const { return m_token; }
     const wxPluralFormsNode* node(unsigned i) const
         { return m_nodes[i].get(); }
@@ -1949,7 +1950,7 @@ wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain,
 
     if ( !wxLoadUserResource(&mo_data, &mo_size,
                              resname,
-                             GetResourceType(),
+                             GetResourceType().t_str(),
                              GetModule()) )
         return NULL;