Remove USE_GDIPLUS setting from bakefiles.

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

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index 1cc62ba3f0dec6459d9d72544e838b1f09699d49..f1a3e54ff63667c4f96e34cda4c0bbddfd234e9c 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -68,33 +68,33 @@ void VarArgTestCase::StringPrintf()
     // test passing literals:
     s.Printf("%s %i", "foo", 42);
     CPPUNIT_ASSERT( s == "foo 42" );
     // test passing literals:
     s.Printf("%s %i", "foo", 42);
     CPPUNIT_ASSERT( s == "foo 42" );

-    s.Printf("%s %s %i", _T("bar"), "=", 11);
+    s.Printf("%s %s %i", wxT("bar"), "=", 11);

 
     // test passing c_str():
     CPPUNIT_ASSERT( s == "bar = 11" );
     s2.Printf("(%s)", s.c_str());
     CPPUNIT_ASSERT( s2 == "(bar = 11)" );
 
     // test passing c_str():
     CPPUNIT_ASSERT( s == "bar = 11" );
     s2.Printf("(%s)", s.c_str());
     CPPUNIT_ASSERT( s2 == "(bar = 11)" );

-    s2.Printf(_T("[%s](%s)"), s.c_str(), "str");
+    s2.Printf(wxT("[%s](%s)"), s.c_str(), "str");

     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     s2.Printf("%s mailbox", wxString("Opening").c_str());
     CPPUNIT_ASSERT( s2 == "Opening mailbox" );
 
     // test passing wxString directly:
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     s2.Printf("%s mailbox", wxString("Opening").c_str());
     CPPUNIT_ASSERT( s2 == "Opening mailbox" );
 
     // test passing wxString directly:

-    s2.Printf(_T("[%s](%s)"), s, "str");
+    s2.Printf(wxT("[%s](%s)"), s, "str");

     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     // test passing wxCharBufferType<T>:
     s = "FooBar";
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     // test passing wxCharBufferType<T>:
     s = "FooBar";

-    s2.Printf(_T("(%s)"), s.mb_str());
+    s2.Printf(wxT("(%s)"), s.mb_str());

     CPPUNIT_ASSERT( s2 == "(FooBar)" );
     CPPUNIT_ASSERT( s2 == "(FooBar)" );

-    s2.Printf(_T("value=%s;"), s.wc_str());
+    s2.Printf(wxT("value=%s;"), s.wc_str());

     CPPUNIT_ASSERT( s2 == "value=FooBar;" );
 
     // this tests correct passing of wxCStrData constructed from string
     // literal:
     bool cond = true;
     CPPUNIT_ASSERT( s2 == "value=FooBar;" );
 
     // this tests correct passing of wxCStrData constructed from string
     // literal:
     bool cond = true;

-    s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
+    s2.Printf(wxT("foo %s"), !cond ? s.c_str() : wxT("bar"));

 }
 
 void VarArgTestCase::CharPrintf()
 }
 
 void VarArgTestCase::CharPrintf()