From 2ad2bccf33c1d05136ee41cda903335c1c3c92e2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 10 Dec 2017 03:28:18 +0100 Subject: [PATCH] Don't call static wxLocale::GetInfo() via an object This is just confusing and unnecessary. No real changes. --- tests/intl/intltest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp index 38a7df1a1c..4e39762a0f 100644 --- a/tests/intl/intltest.cpp +++ b/tests/intl/intltest.cpp @@ -191,11 +191,11 @@ void IntlTestCase::DateTimeFmtFrench() #endif 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, - 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__ // 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 " à " string appeared in @@ -207,7 +207,7 @@ void IntlTestCase::DateTimeFmtFrench() WX_ASSERT_EQUAL_FORMAT( "French date and time", FRENCH_DATE_TIME_FMT, fmtDT ); #endif WX_ASSERT_EQUAL_FORMAT( "French time", "%H:%M:%S", - m_locale->GetInfo(wxLOCALE_TIME_FMT) ); + wxLocale::GetInfo(wxLOCALE_TIME_FMT) ); } void IntlTestCase::IsAvailable()