From 29f55f4e291226845984269f68d223535aca55b3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 4 May 2023 18:46:42 +0200 Subject: [PATCH] Disable wxMenu unit test requiring Unicode in non-Unicode build Japanese translations can't be used without Unicode support, so skip this test. --- tests/menu/menu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index 8435422a1e..f6d2c60661 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -90,7 +90,7 @@ private: CPPUNIT_TEST( EnableTop ); CPPUNIT_TEST( Count ); CPPUNIT_TEST( Labels ); -#if wxUSE_INTL +#if wxUSE_INTL && wxUSE_UNICODE CPPUNIT_TEST( TranslatedMnemonics ); #endif // wxUSE_INTL CPPUNIT_TEST( RadioItems ); @@ -106,7 +106,7 @@ private: void EnableTop(); void Count(); void Labels(); -#if wxUSE_INTL +#if wxUSE_INTL && wxUSE_UNICODE void TranslatedMnemonics(); #endif // wxUSE_INTL void RadioItems(); @@ -376,7 +376,7 @@ void MenuTestCase::Labels() CPPUNIT_ASSERT_EQUAL( "Foo", wxMenuItem::GetLabelText("&Foo\tCtrl-F") ); } -#if wxUSE_INTL +#if wxUSE_INTL && wxUSE_UNICODE static wxString GetTranslatedString(const wxTranslations& trans, const wxString& s)