From 31d1644daaac3aeceeb2c112c06663f81d8f4e89 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Apr 2015 16:15:56 +0200 Subject: [PATCH] Finally do fix use of wxTranslateFromUnicodeFormat() in the unit test. Don't reference the never defined function in the test any more. (This does) close #16118. --- tests/datetime/datetimetest.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index 9917d15c99..5ef360ff84 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -1449,15 +1449,15 @@ void DateTimeTestCase::TestDateOnly() CPPUNIT_ASSERT_EQUAL( wxDateTime::Today(), wxDateTime::Now().GetDateOnly() ); } -#if defined(__WINDOWS__) || defined(__WXOSX__) - -// This function is defined in src/common/intl.cpp and as it is not public we -// need to declare it here explicitly. -WXDLLIMPEXP_BASE -wxString wxTranslateFromUnicodeFormat(const wxString& fmt); - void DateTimeTestCase::TestTranslateFromUnicodeFormat() { +#if defined(__WINDOWS__) || defined(__WXOSX__) + // This function is defined in src/common/intl.cpp and as it is not public we + // need to declare it here explicitly. + WXDLLIMPEXP_BASE + wxString wxTranslateFromUnicodeFormat(const wxString& fmt); + + // Test single quote handling... CPPUNIT_ASSERT_EQUAL("", wxTranslateFromUnicodeFormat("'")); @@ -1484,8 +1484,7 @@ void DateTimeTestCase::TestTranslateFromUnicodeFormat() CPPUNIT_ASSERT_EQUAL("'%H o'clock: It's about time'", wxTranslateFromUnicodeFormat("''H 'o''clock: It''s about time'''")); +#endif // ports having wxTranslateFromUnicodeFormat() } -#endif // ports having wxTranslateFromUnicodeFormat() - #endif // wxUSE_DATETIME