Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't assert at startup because of the static initialization of a wxLocale object requires a valid wxAppTraits object; init the locale later, in TestDefaultLang()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-12 15:58:03 +00:00
parent fa7e10a43f
commit 3e23102435
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/console/console.cpp
View File

@@ -987,7 +987,10 @@ static void TestFileSetTimes()
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/utils.h" // for wxSetEnv #include "wx/utils.h" // for wxSetEnv
static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH); static wxLocale gs_localeDefault;
// NOTE: don't init it here as it needs a wxAppTraits object
// and thus must be init-ed after creation of the wxInitializer
// class in the main()
// find the name of the language from its value // find the name of the language from its value
static const wxChar *GetLangName(int lang) static const wxChar *GetLangName(int lang)
@@ -1236,6 +1239,8 @@ static void TestDefaultLang()
{ {
wxPuts(_T("*** Testing wxLocale::GetSystemLanguage ***")); wxPuts(_T("*** Testing wxLocale::GetSystemLanguage ***"));
gs_localeDefault.Init(wxLANGUAGE_ENGLISH);
static const wxChar *langStrings[] = static const wxChar *langStrings[] =
{ {
NULL, // system default NULL, // system default
@@ -2768,8 +2773,8 @@ protected:
wxString type, val; wxString type, val;
for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ ) for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
{ {
printf("\t%s %s = %s\n", (const char*)type.mb_str(), printf("\t%s %s = %s\n", (const char*)type.mb_str(),
(const char*)name.mb_str(), (const char*)name.mb_str(),
(const char*)val.mb_str()); (const char*)val.mb_str());
} }
} }
@@ -3436,7 +3441,7 @@ static void TestZipStreamRead()
static const wxString filename = _T("foo"); static const wxString filename = _T("foo");
wxFFileInputStream in(TESTFILE_ZIP); wxFFileInputStream in(TESTFILE_ZIP);
wxZipInputStream istr(in); wxZipInputStream istr(in);
wxZipEntry entry(filename); wxZipEntry entry(filename);
istr.OpenEntry(entry); istr.OpenEntry(entry);