Compile fix for gcc on MSW

[wxWidgets.git] / tests / strings / strings.cpp

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 7198b0cb7cd005384bcc4dcb877014a7ad958e9e..ca6a5cd709bfb518c8569b596947498f251e7a9c 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -678,22 +678,26 @@ void StringTestCase::DoCStrDataTernaryOperator(bool cond)
     // are not very important, we're testing if the code compiles at all):
 
     wxString s("foo");
-    const char *mbStr = "foo";
-    const wchar_t *wcStr = L"foo";
 
     // FIXME-UTF8: when wxCStrData can handle both conversions, this should
     //             be changed to always test all versions, both MB and WC
 #if wxUSE_UNICODE
+    const wchar_t *wcStr = L"foo";
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : wcStr)) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : L"bar")) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? wcStr : s.c_str())) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? L"bar" : s.c_str())) );
 #else
+    const char *mbStr = "foo";
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : mbStr)) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? s.c_str() : "foo")) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? mbStr : s.c_str())) );
     CPPUNIT_ASSERT( CheckStr(s, (cond ? "foo" : s.c_str())) );
 #endif
+
+    wxString empty("");
+    CPPUNIT_ASSERT( CheckStr(empty, (cond ? empty.c_str() : wxEmptyString)) );
+    CPPUNIT_ASSERT( CheckStr(empty, (cond ? wxEmptyString : empty.c_str())) );
 }
 
 bool CheckStrChar(const wxString& expected, char *s)