Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00
Code Issues Releases Wiki Activity

wxLocale constructor we used has been deprecated

Browse Source 
And it doesn't do all of the same initialization as the new one, so we
get assertions on Windows (not sure why the other two didn't complain).

Warning in wx302 manual says:

   Deprecated:
       This form is deprecated, use the other one unless you know what you are doing.

So, best to use the new one.  This DOES mean that we WILL have to
testing locales again which is fine cause we had some work to do
there anyway.
This commit is contained in:
Leland Lucius
2015-07-19 17:38:31 -05:00
parent 54676a7228
commit 8bf6668ff3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/AudacityApp.cpp
View File

@@ -1021,11 +1021,12 @@ void AudacityApp::InitLang( const wxString & lang )
wxSetEnv(wxT("LANG"), wxT("en_US.UTF-8")); wxSetEnv(wxT("LANG"), wxT("en_US.UTF-8"));
#endif #endif
#if wxCHECK_VERSION(3,0,0) const wxLanguageInfo *info = wxLocale::FindLanguageInfo(lang);
mLocale = new wxLocale(wxT(""), lang, wxT(""), true); if (!lang)
#else {
mLocale = new wxLocale(wxT(""), lang, wxT(""), true, true); return;
#endif }
mLocale = new wxLocale(info->Language);
for(unsigned int i=0; i<audacityPathList.GetCount(); i++) for(unsigned int i=0; i<audacityPathList.GetCount(); i++)
mLocale->AddCatalogLookupPathPrefix(audacityPathList[i]); mLocale->AddCatalogLookupPathPrefix(audacityPathList[i]);