Added missing #import <Foundation/NSArray.h>

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

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 9c913cc0dc245a028fe02c0b93a523e9e9edae39..6cbeba609f0c4a089ac5d71eab19ca0f04679138 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -633,7 +633,7 @@ void StringTestCase::ToDouble()
 
     // we need to use decimal point, not comma or whatever is its value for the
     // current locale
-    wxSetlocale(LC_ALL, _T("C"));
+    wxSetlocale(LC_ALL, "C");
 
     size_t n;
     for ( n = 0; n < WXSIZEOF(doubleData); n++ )
@@ -736,10 +736,13 @@ void StringTestCase::CStrDataImplicitConversion()
     wxString s("foo");
 
     CPPUNIT_ASSERT( CheckStrConstWChar(s, s.c_str()) );
-    CPPUNIT_ASSERT( CheckStrConstWChar(s, s) );
-
     CPPUNIT_ASSERT( CheckStrConstChar(s, s.c_str()) );
+
+    // implicit conversion of wxString is not available in STL build
+#if !wxUSE_STL
+    CPPUNIT_ASSERT( CheckStrConstWChar(s, s) );
     CPPUNIT_ASSERT( CheckStrConstChar(s, s) );
+#endif
 }
 
 void StringTestCase::ExplicitConversion()