From 3e945a0a5d7bf121cec721d4671eb6a573826bd1 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Thu, 22 Jun 2017 01:53:34 +0400 Subject: [PATCH] Fix wxMSW test build in UTF-8 and ANSI build Use wxString::t_str() with a function taking LPCTSTR (which is either LPCWSTR or LPCSTR). And wxStrg::wc_str() for LPCOLESTR which, ordinarily, is a wide string. --- tests/filename/filenametest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 3f8d2eba8a..739194323a 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -1020,10 +1020,10 @@ void CreateShortcut(const wxString& pathFile, const wxString& pathLink) hr = sl->QueryInterface(IID_IPersistFile, (void **)&pf); CPPUNIT_ASSERT( SUCCEEDED(hr) ); - hr = sl->SetPath(pathFile.wx_str()); + hr = sl->SetPath(pathFile.t_str()); CPPUNIT_ASSERT( SUCCEEDED(hr) ); - hr = pf->Save(pathLink.wx_str(), TRUE); + hr = pf->Save(pathLink.wc_str(), TRUE); CPPUNIT_ASSERT( SUCCEEDED(hr) ); }