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

add possibility to choose the locale (useful for Windows which doesn't honour LC_ALL &c)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-04-03 15:31:57 +00:00
parent fac0939500
commit ad16130f66
1 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/test.cpp
View File

@@ -222,6 +222,7 @@ private:
bool m_detail; bool m_detail;
bool m_timing; bool m_timing;
wxArrayString m_registries; wxArrayString m_registries;
wxLocale *m_locale;
// event handling hooks // event handling hooks
FilterEventFunc m_filterEventFunc; FilterEventFunc m_filterEventFunc;
@@ -287,6 +288,8 @@ TestApp::TestApp()
{ {
m_filterEventFunc = NULL; m_filterEventFunc = NULL;
m_processEventFunc = NULL; m_processEventFunc = NULL;
m_locale = NULL;
} }
// Init // Init
@@ -326,6 +329,9 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
{ wxCMD_LINE_SWITCH, "t", "timing", { wxCMD_LINE_SWITCH, "t", "timing",
"print names and mesure running time of individual test, run them", "print names and mesure running time of individual test, run them",
wxCMD_LINE_VAL_NONE, 0 }, wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_OPTION, "", "locale",
"locale to use when running the program",
wxCMD_LINE_VAL_STRING, 0 },
{ wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING, { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
wxCMD_LINE_DESC_END wxCMD_LINE_DESC_END
@@ -339,15 +345,38 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser) bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
{ {
if (parser.GetParamCount()) if (parser.GetParamCount())
{
for (size_t i = 0; i < parser.GetParamCount(); i++) for (size_t i = 0; i < parser.GetParamCount(); i++)
m_registries.push_back(parser.GetParam(i)); m_registries.push_back(parser.GetParam(i));
}
else else
{
// FIXME: this is an ugly and unnecessary hack
m_registries.push_back(""); m_registries.push_back("");
}
m_longlist = parser.Found(_T("longlist")); m_longlist = parser.Found("longlist");
m_list = m_longlist || parser.Found(_T("list")); m_list = m_longlist || parser.Found("list");
m_timing = parser.Found(_T("timing")); m_timing = parser.Found("timing");
m_detail = !m_timing && parser.Found(_T("detail")); m_detail = !m_timing && parser.Found("detail");
wxString loc;
if ( parser.Found("locale", &loc) )
{
const wxLanguageInfo * const info = wxLocale::FindLanguageInfo(loc);
if ( !info )
{
cerr << "Locale \"" << string(loc.mb_str()) << "\" is unknown.\n";
return false;
}
m_locale = new wxLocale(info->Language);
if ( !m_locale->IsOk() )
{
cerr << "Using locale \"" << string(loc.mb_str()) << "\" failed.\n";
return false;
}
}
return TestAppBase::OnCmdLineParsed(parser); return TestAppBase::OnCmdLineParsed(parser);
} }
@@ -472,6 +501,8 @@ int TestApp::OnRun()
int TestApp::OnExit() int TestApp::OnExit()
{ {
delete m_locale;
#if wxUSE_GUI #if wxUSE_GUI
delete GetTopWindow(); delete GetTopWindow();
#endif // wxUSE_GUI #endif // wxUSE_GUI