From b0441359caecceb5ea0e98db59ef14f2d253ce2b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 31 Mar 2006 19:30:34 +0000 Subject: [PATCH] test predefined wxConvUTF[78] too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/strings/unicode.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/strings/unicode.cpp b/tests/strings/unicode.cpp index 3ccf6be1db..d6c5e5be23 100644 --- a/tests/strings/unicode.cpp +++ b/tests/strings/unicode.cpp @@ -70,7 +70,7 @@ private: // // if either of the first 2 arguments is NULL, the conversion is supposed // to fail - void DoTestConversion(const char *s, const wchar_t *w, wxCSConv& conv); + void DoTestConversion(const char *s, const wchar_t *w, wxMBConv& conv); #endif // wxUSE_WCHAR_T @@ -168,7 +168,7 @@ void UnicodeTestCase::Conversion() void UnicodeTestCase::DoTestConversion(const char *s, const wchar_t *ws, - wxCSConv& conv) + wxMBConv& conv) { #if wxUSE_UNICODE if ( ws ) @@ -217,6 +217,7 @@ void UnicodeTestCase::ConversionUTF7() { const StringConversionData& d = utf7data[n]; DoTestConversion(d.str, d.wcs, conv); + DoTestConversion(d.str, d.wcs, wxConvUTF7); } } @@ -236,6 +237,7 @@ void UnicodeTestCase::ConversionUTF8() { const StringConversionData& d = utf8data[n]; DoTestConversion(d.str, d.wcs, conv); + DoTestConversion(d.str, d.wcs, wxConvUTF8); } } -- 2.45.2