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

Don't call static wxLocale::GetInfo() via an object

Browse Source 
This is just confusing and unnecessary.

No real changes.
This commit is contained in:
Vadim Zeitlin
2017-12-10 03:28:18 +01:00
parent 9036b3dba8
commit 2ad2bccf33
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/intl/intltest.cpp
View File

@@ -191,11 +191,11 @@ void IntlTestCase::DateTimeFmtFrench()
#endif #endif
WX_ASSERT_EQUAL_FORMAT( "French short date", FRENCH_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "French short date", FRENCH_DATE_FMT,
m_locale->GetInfo(wxLOCALE_SHORT_DATE_FMT) ); wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT) );
WX_ASSERT_EQUAL_FORMAT( "French long date", FRENCH_LONG_DATE_FMT, WX_ASSERT_EQUAL_FORMAT( "French long date", FRENCH_LONG_DATE_FMT,
m_locale->GetInfo(wxLOCALE_LONG_DATE_FMT) ); wxLocale::GetInfo(wxLOCALE_LONG_DATE_FMT) );
const wxString fmtDT = m_locale->GetInfo(wxLOCALE_DATE_TIME_FMT); const wxString fmtDT = wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT);
#ifdef __WXOSX__ #ifdef __WXOSX__
// Things are difficult to test under macOS as the format keeps changing, // Things are difficult to test under macOS as the format keeps changing,
// e.g. at some time between 10.10 and 10.12 a new " <20> " string appeared in // e.g. at some time between 10.10 and 10.12 a new " <20> " string appeared in
@@ -207,7 +207,7 @@ void IntlTestCase::DateTimeFmtFrench()
WX_ASSERT_EQUAL_FORMAT( "French date and time", FRENCH_DATE_TIME_FMT, fmtDT ); WX_ASSERT_EQUAL_FORMAT( "French date and time", FRENCH_DATE_TIME_FMT, fmtDT );
#endif #endif
WX_ASSERT_EQUAL_FORMAT( "French time", "%H:%M:%S", WX_ASSERT_EQUAL_FORMAT( "French time", "%H:%M:%S",
m_locale->GetInfo(wxLOCALE_TIME_FMT) ); wxLocale::GetInfo(wxLOCALE_TIME_FMT) );
} }
void IntlTestCase::IsAvailable() void IntlTestCase::IsAvailable()