]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix VC6 compilation after r72430.
authorVáclav Slavík <vslavik@fastmail.fm>
Sat, 8 Sep 2012 10:53:40 +0000 (10:53 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sat, 8 Sep 2012 10:53:40 +0000 (10:53 +0000)
VC6 doesn't handle for loop scope correctly.

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

src/common/translation.cpp

index de975d5332fad4df79f4b461e6307de1c27ef75e..0aea6979b31ada43c992ba1aca4a10fb0c759c27 100644 (file)
@@ -149,11 +149,11 @@ wxString GetPreferredUILanguage(const wxArrayString& available)
                 }
                 LogTraceArray(" - system preferred languages", preferred);
 
                 }
                 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;
                     lang.Replace("-", "_");
                     if ( available.Index(lang) != wxNOT_FOUND )
                         return lang;