X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad9835c97c10c0d7de345e3a7a7c0fc2776eb2cb..2d672c46c0c68ae560a537eacd3614b4114d73d4:/src/common/intl.cpp diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 7556b41fb2..c51372ac9e 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -44,8 +44,9 @@ #include "wx/string.h" #include "wx/intl.h" #include "wx/log.h" - #include "wx/debug.h" #include "wx/utils.h" + #include "wx/app.h" + #include "wx/hashmap.h" #endif // WX_PRECOMP #ifndef __WXWINCE__ @@ -56,7 +57,7 @@ #include #include #ifdef HAVE_LANGINFO_H - #include + #include #endif #ifdef __WIN32__ @@ -71,14 +72,12 @@ #include "wx/module.h" #include "wx/fontmap.h" #include "wx/encconv.h" -#include "wx/hashmap.h" #include "wx/ptr_scpd.h" -#include "wx/app.h" #include "wx/apptrait.h" #include "wx/stdpaths.h" #if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers + #include "wx/mac/private.h" // includes mac headers #endif // ---------------------------------------------------------------------------- @@ -1940,9 +1939,9 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix) // check for this // do we have just the language (or sublang too)? - bool justLang = langFull.Len() == LEN_LANG; + bool justLang = langFull.length() == LEN_LANG; if ( justLang || - (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) ) + (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) ) { // 0. Make sure the lang is according to latest ISO 639 // (this is necessary because glibc uses iw and in instead