first phase of transition to unified Unicode build:

1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*) 2. added template type-safe wrappers for vararg functions 3. added wxUniChar class representing single Unicode character 4. changed wxString::operator[] and wxString::iterator to return wxUniChar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
parent cd632a8617
commit c9f7896861
80 changed files with 2229 additions and 435 deletions
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -71,7 +71,9 @@ TEST_OBJECTS =  \
 	test_strings.o \
 	test_stdstrings.o \
 	test_tokenizer.o \
+	test_unichar.o \
 	test_unicode.o \
+	test_vararg.o \
 	test_crt.o \
 	test_vsnprintf.o \
 	test_bstream.o \
@@ -360,9 +362,15 @@ test_stdstrings.o: $(srcdir)/strings/stdstrings.cpp $(TEST_ODEP)
 test_tokenizer.o: $(srcdir)/strings/tokenizer.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/tokenizer.cpp

+test_unichar.o: $(srcdir)/strings/unichar.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/unichar.cpp
+
 test_unicode.o: $(srcdir)/strings/unicode.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/unicode.cpp

+test_vararg.o: $(srcdir)/strings/vararg.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/vararg.cpp
+
 test_crt.o: $(srcdir)/strings/crt.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/strings/crt.cpp

@@ -409,7 +417,7 @@ test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/uris/uris.cpp

 test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP)
-	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)  $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5)  $(__EXCEPTIONS_DEFINE_p_5) $(__RTTI_DEFINE_p_5) $(__THREAD_DEFINE_p_5)   --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include

 test_gui_test.o: $(srcdir)/test.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/test.cpp
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -59,7 +59,9 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_strings.obj \
 	$(OBJS)\test_stdstrings.obj \
 	$(OBJS)\test_tokenizer.obj \
+	$(OBJS)\test_unichar.obj \
 	$(OBJS)\test_unicode.obj \
+	$(OBJS)\test_vararg.obj \
 	$(OBJS)\test_crt.obj \
 	$(OBJS)\test_vsnprintf.obj \
 	$(OBJS)\test_bstream.obj \
@@ -396,9 +398,15 @@ $(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
 $(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_unicode.obj: .\strings\unicode.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_crt.obj: .\strings\crt.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

@@ -445,7 +453,7 @@ $(OBJS)\test_uris.obj: .\uris\uris.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

 $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include   -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include -i. $(__DLLFLAG_p_3) -i.\..\samples $**
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\include -i. $(__DLLFLAG_p_3) -i.\..\samples -dNOPCH $**

 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H $**
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -51,7 +51,9 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_strings.o \
 	$(OBJS)\test_stdstrings.o \
 	$(OBJS)\test_tokenizer.o \
+	$(OBJS)\test_unichar.o \
 	$(OBJS)\test_unicode.o \
+	$(OBJS)\test_vararg.o \
 	$(OBJS)\test_crt.o \
 	$(OBJS)\test_vsnprintf.o \
 	$(OBJS)\test_bstream.o \
@@ -374,9 +376,15 @@ $(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
 $(OBJS)\test_tokenizer.o: ./strings/tokenizer.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\test_unichar.o: ./strings/unichar.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_unicode.o: ./strings/unicode.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\test_vararg.o: ./strings/vararg.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_crt.o: ./strings/crt.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

@@ -423,7 +431,7 @@ $(OBJS)\test_uris.o: ./uris/uris.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples
+	windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples --define NOPCH

 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -51,7 +51,9 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_strings.obj \
 	$(OBJS)\test_stdstrings.obj \
 	$(OBJS)\test_tokenizer.obj \
+	$(OBJS)\test_unichar.obj \
 	$(OBJS)\test_unicode.obj \
+	$(OBJS)\test_vararg.obj \
 	$(OBJS)\test_crt.obj \
 	$(OBJS)\test_vsnprintf.obj \
 	$(OBJS)\test_bstream.obj \
@@ -77,8 +79,8 @@ TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \
 	$(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
-	$(OBJS)\test_gui_sample.res \
 	$(OBJS)\test_gui_dummy.obj \
+	$(OBJS)\test_gui_sample.res \
 	$(OBJS)\test_gui_test.obj \
 	$(OBJS)\test_gui_rect.obj \
 	$(OBJS)\test_gui_size.obj \
@@ -480,9 +482,15 @@ $(OBJS)\test_stdstrings.obj: .\strings\stdstrings.cpp
 $(OBJS)\test_tokenizer.obj: .\strings\tokenizer.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

+$(OBJS)\test_unichar.obj: .\strings\unichar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_unicode.obj: .\strings\unicode.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

+$(OBJS)\test_vararg.obj: .\strings\vararg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_crt.obj: .\strings\crt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

@@ -528,12 +536,12 @@ $(OBJS)\test_textfiletest.obj: .\textfile\textfiletest.cpp
 $(OBJS)\test_uris.obj: .\uris\uris.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

-$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
-	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_17_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples $**
-
 $(OBJS)\test_gui_dummy.obj: .\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h $**

+$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc
+	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_17_p_1) $(__NO_VC_CRTDBG_p_3)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE $**
+
 $(OBJS)\test_gui_test.obj: .\test.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $**

--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -256,7 +256,9 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_strings.obj &
 	$(OBJS)\test_stdstrings.obj &
 	$(OBJS)\test_tokenizer.obj &
+	$(OBJS)\test_unichar.obj &
 	$(OBJS)\test_unicode.obj &
+	$(OBJS)\test_vararg.obj &
 	$(OBJS)\test_crt.obj &
 	$(OBJS)\test_vsnprintf.obj &
 	$(OBJS)\test_bstream.obj &
@@ -429,9 +431,15 @@ $(OBJS)\test_stdstrings.obj :  .AUTODEPEND .\strings\stdstrings.cpp
 $(OBJS)\test_tokenizer.obj :  .AUTODEPEND .\strings\tokenizer.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

+$(OBJS)\test_unichar.obj :  .AUTODEPEND .\strings\unichar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_unicode.obj :  .AUTODEPEND .\strings\unicode.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

+$(OBJS)\test_vararg.obj :  .AUTODEPEND .\strings\vararg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_crt.obj :  .AUTODEPEND .\strings\crt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

@@ -478,7 +486,7 @@ $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

 $(OBJS)\test_gui_sample.res :  .AUTODEPEND .\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples $<
+	wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -i=. $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $<

 $(OBJS)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
--- a/tests/streams/sstream.cpp
+++ b/tests/streams/sstream.cpp
@@ -74,7 +74,7 @@ strStream::strStream()
    m_str.reserve(LEN);
    for ( size_t n = 0; n < LEN; n++ )
    {
-        m_str += _T('A') + n % (_T('Z') - _T('A') + 1);
+        m_str += wxChar(_T('A') + n % (_T('Z') - _T('A') + 1));
    }
 }

--- a/tests/strings/stdstrings.cpp
+++ b/tests/strings/stdstrings.cpp
@@ -451,19 +451,19 @@ void StdStringTestCase::StdRiter()
    const wxString s(_T("fozbar"));

    wxString::const_reverse_iterator ri(s.rbegin());
-    CPPUNIT_ASSERT_EQUAL( _T('r'), *ri );
-    CPPUNIT_ASSERT_EQUAL( _T('a'), *++ri );
-    CPPUNIT_ASSERT_EQUAL( _T('r'), *--ri );
+    CPPUNIT_ASSERT( _T('r') == *ri );
+    CPPUNIT_ASSERT( _T('a') == *++ri );
+    CPPUNIT_ASSERT( _T('r') == *--ri );

    ri = s.rend();
    ri--;
-    CPPUNIT_ASSERT_EQUAL( _T('f'), *ri );
+    CPPUNIT_ASSERT( _T('f') == *ri );

    --ri;
-    CPPUNIT_ASSERT_EQUAL( _T('o'), *ri );
+    CPPUNIT_ASSERT( _T('o') == *ri );

    wxString::const_iterator i = ri.base();
-    CPPUNIT_ASSERT_EQUAL( _T('z'), *i );
+    CPPUNIT_ASSERT( _T('z') == *i );
 }

 void StdStringTestCase::StdSubstr()
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -630,9 +630,10 @@ void StringTestCase::WriteBuf()
    wxString s;
    wxStrcpy(wxStringBuffer(s, 10), _T("foo"));

-    CPPUNIT_ASSERT_EQUAL(_T('f'), s[0u]);
-    CPPUNIT_ASSERT_EQUAL(_T('o'), s[1]);
-    CPPUNIT_ASSERT_EQUAL(_T('o'), s[2]);
+    CPPUNIT_ASSERT(s[0u] == _T('f') );
+    CPPUNIT_ASSERT(_T('f') == s[0u]);
+    CPPUNIT_ASSERT(_T('o') == s[1]);
+    CPPUNIT_ASSERT(_T('o') == s[2]);
    CPPUNIT_ASSERT_EQUAL((size_t)3, s.length());


@@ -642,10 +643,10 @@ void StringTestCase::WriteBuf()
        buf.SetLength(4);
    }

-    CPPUNIT_ASSERT_EQUAL(_T('b'), s[0u]);
-    CPPUNIT_ASSERT_EQUAL(_T('a'), s[1]);
-    CPPUNIT_ASSERT_EQUAL(_T('r'), s[2]);
-    CPPUNIT_ASSERT_EQUAL(_T('r'), s[3]);
+    CPPUNIT_ASSERT(_T('b') == s[0u]);
+    CPPUNIT_ASSERT(_T('a') == s[1]);
+    CPPUNIT_ASSERT(_T('r') == s[2]);
+    CPPUNIT_ASSERT(_T('r') == s[3]);
    CPPUNIT_ASSERT_EQUAL((size_t)4, s.length());

    CPPUNIT_ASSERT_EQUAL( 0, wxStrcmp(_T("barr"), s) );
--- a/tests/strings/unichar.cpp
+++ b/tests/strings/unichar.cpp
@@ -0,0 +1,236 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/strings/unichar.cpp
+// Purpose:     Test for wxUniChar class
+// Author:      Vaclav Slavik
+// Created:     2007-03-11
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 REA Elektronik GmbH
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
+#include "wx/string.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class UniCharTestCase : public CppUnit::TestCase
+{
+public:
+    UniCharTestCase() {}
+
+private:
+    CPPUNIT_TEST_SUITE( UniCharTestCase );
+        CPPUNIT_TEST( CharCompare );
+        CPPUNIT_TEST( CharCompareIntl );
+        CPPUNIT_TEST( StringCompare );
+        CPPUNIT_TEST( StringCompareIntl );
+    CPPUNIT_TEST_SUITE_END();
+
+    void CharCompare();
+    void CharCompareIntl();
+    void StringCompare();
+    void StringCompareIntl();
+
+    DECLARE_NO_COPY_CLASS(UniCharTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( UniCharTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UniCharTestCase, "UniCharTestCase" );
+
+void UniCharTestCase::CharCompare()
+{
+    wxUniChar a('a');
+    wxUniChar b('b');
+
+    CPPUNIT_ASSERT( a == a );
+    CPPUNIT_ASSERT( a == 'a' );
+    CPPUNIT_ASSERT( a == _T('a') );
+    CPPUNIT_ASSERT( a == wxUniChar('a') );
+    CPPUNIT_ASSERT( a == wxUniChar(_T('a')) );
+
+    CPPUNIT_ASSERT( a != b );
+    CPPUNIT_ASSERT( a != 'b' );
+    CPPUNIT_ASSERT( a != _T('b') );
+    CPPUNIT_ASSERT( a != wxUniChar('b') );
+    CPPUNIT_ASSERT( a != wxUniChar(_T('b')) );
+
+    CPPUNIT_ASSERT( a < b );
+    CPPUNIT_ASSERT( a < 'b' );
+    CPPUNIT_ASSERT( a < _T('b') );
+    CPPUNIT_ASSERT( a < wxUniChar('b') );
+    CPPUNIT_ASSERT( a < wxUniChar(_T('b')) );
+
+    CPPUNIT_ASSERT( a <= b );
+    CPPUNIT_ASSERT( a <= 'b' );
+    CPPUNIT_ASSERT( a <= _T('b') );
+    CPPUNIT_ASSERT( a <= wxUniChar('b') );
+    CPPUNIT_ASSERT( a <= wxUniChar(_T('b')) );
+
+    CPPUNIT_ASSERT( a <= a );
+    CPPUNIT_ASSERT( a <= 'a' );
+    CPPUNIT_ASSERT( a <= _T('a') );
+    CPPUNIT_ASSERT( a <= wxUniChar('a') );
+    CPPUNIT_ASSERT( a <= wxUniChar(_T('a')) );
+
+    CPPUNIT_ASSERT( b > a );
+    CPPUNIT_ASSERT( b > 'a' );
+    CPPUNIT_ASSERT( b > _T('a') );
+    CPPUNIT_ASSERT( b > wxUniChar('a') );
+    CPPUNIT_ASSERT( b > wxUniChar(_T('a')) );
+
+    CPPUNIT_ASSERT( b >= a );
+    CPPUNIT_ASSERT( b >= 'a' );
+    CPPUNIT_ASSERT( b >= _T('a') );
+    CPPUNIT_ASSERT( b >= wxUniChar('a') );
+    CPPUNIT_ASSERT( b >= wxUniChar(_T('a')) );
+
+    CPPUNIT_ASSERT( b >= b );
+    CPPUNIT_ASSERT( b >= 'b' );
+    CPPUNIT_ASSERT( b >= _T('b') );
+    CPPUNIT_ASSERT( b >= wxUniChar('b') );
+    CPPUNIT_ASSERT( b >= wxUniChar(_T('b')) );
+
+    CPPUNIT_ASSERT( b - a == 1 );
+    CPPUNIT_ASSERT( a - b == -1 );
+}
+
+
+#define CYRILLIC_SMALL_LETTER_YU  ((wchar_t)0x044E)
+#define ARABIC_LETTER_NOON        ((wchar_t)0x0646)
+
+void UniCharTestCase::CharCompareIntl()
+{
+    wxUniChar a(CYRILLIC_SMALL_LETTER_YU);
+    wxUniChar b(ARABIC_LETTER_NOON);
+
+    CPPUNIT_ASSERT( a == a );
+    CPPUNIT_ASSERT( a == CYRILLIC_SMALL_LETTER_YU );
+    CPPUNIT_ASSERT( a == wxUniChar(CYRILLIC_SMALL_LETTER_YU) );
+
+    CPPUNIT_ASSERT( a != b );
+    CPPUNIT_ASSERT( a != ARABIC_LETTER_NOON );
+    CPPUNIT_ASSERT( a != wxUniChar(ARABIC_LETTER_NOON) );
+
+    CPPUNIT_ASSERT( a < b );
+    CPPUNIT_ASSERT( a < ARABIC_LETTER_NOON );
+    CPPUNIT_ASSERT( a < wxUniChar(ARABIC_LETTER_NOON) );
+
+    CPPUNIT_ASSERT( a <= b );
+    CPPUNIT_ASSERT( a <= ARABIC_LETTER_NOON );
+    CPPUNIT_ASSERT( a <= wxUniChar(ARABIC_LETTER_NOON) );
+
+    CPPUNIT_ASSERT( a <= a );
+    CPPUNIT_ASSERT( a <= CYRILLIC_SMALL_LETTER_YU );
+    CPPUNIT_ASSERT( a <= wxUniChar(CYRILLIC_SMALL_LETTER_YU) );
+
+    CPPUNIT_ASSERT( b > a );
+    CPPUNIT_ASSERT( b > CYRILLIC_SMALL_LETTER_YU );
+    CPPUNIT_ASSERT( b > wxUniChar(CYRILLIC_SMALL_LETTER_YU) );
+
+    CPPUNIT_ASSERT( b >= a );
+    CPPUNIT_ASSERT( b >= CYRILLIC_SMALL_LETTER_YU );
+    CPPUNIT_ASSERT( b >= wxUniChar(CYRILLIC_SMALL_LETTER_YU) );
+
+    CPPUNIT_ASSERT( b >= b );
+    CPPUNIT_ASSERT( b >= ARABIC_LETTER_NOON );
+    CPPUNIT_ASSERT( b >= wxUniChar(ARABIC_LETTER_NOON) );
+
+    CPPUNIT_ASSERT( b - a == 504 );
+    CPPUNIT_ASSERT( a - b == -504 );
+}
+
+void UniCharTestCase::StringCompare()
+{
+    // test string comparison with chars
+    wxString sa = "a";
+    const wxString sb = "b";
+    char c1 = 'a';
+    wchar_t c2 = _T('a');
+    wxUniChar c3 = 'a';
+
+    CPPUNIT_ASSERT( sa == 'a');
+    CPPUNIT_ASSERT( 'a' == sa);
+    CPPUNIT_ASSERT( sb != 'a');
+    CPPUNIT_ASSERT( 'a' != sb);
+
+    CPPUNIT_ASSERT( sa == c1);
+    CPPUNIT_ASSERT( c1 == sa);
+    CPPUNIT_ASSERT( sb != c1);
+    CPPUNIT_ASSERT( c1 != sb);
+
+    CPPUNIT_ASSERT( sa == c2);
+    CPPUNIT_ASSERT( c2 == sa);
+    CPPUNIT_ASSERT( sb != c2);
+    CPPUNIT_ASSERT( c2 != sb);
+
+    CPPUNIT_ASSERT( sa == c3);
+    CPPUNIT_ASSERT( c3 == sa);
+    CPPUNIT_ASSERT( sb != c3);
+    CPPUNIT_ASSERT( c3 != sb);
+
+    // test wxUniCharRef:
+    CPPUNIT_ASSERT( sa == sa[0]);
+    CPPUNIT_ASSERT( sa[0] == sa);
+    CPPUNIT_ASSERT( sb != sa[0]);
+    CPPUNIT_ASSERT( sa[0] != sb);
+
+    // test const version of operator[] (returns wxUniChar, not wxUniCharRef):
+    CPPUNIT_ASSERT( sb == sb[0]);
+    CPPUNIT_ASSERT( sb[0] == sb);
+    CPPUNIT_ASSERT( sa != sb[0]);
+    CPPUNIT_ASSERT( sb[0] != sa);
+}
+
+void UniCharTestCase::StringCompareIntl()
+{
+    // test string comparison with chars
+    wxString sa = CYRILLIC_SMALL_LETTER_YU;
+    const wxString sb = ARABIC_LETTER_NOON;
+    wchar_t c2 = CYRILLIC_SMALL_LETTER_YU;
+    wxUniChar c3 = CYRILLIC_SMALL_LETTER_YU;
+
+    CPPUNIT_ASSERT( sa == CYRILLIC_SMALL_LETTER_YU);
+    CPPUNIT_ASSERT( CYRILLIC_SMALL_LETTER_YU == sa);
+    CPPUNIT_ASSERT( sb != CYRILLIC_SMALL_LETTER_YU);
+    CPPUNIT_ASSERT( CYRILLIC_SMALL_LETTER_YU != sb);
+
+    CPPUNIT_ASSERT( sa == c2);
+    CPPUNIT_ASSERT( c2 == sa);
+    CPPUNIT_ASSERT( sb != c2);
+    CPPUNIT_ASSERT( c2 != sb);
+
+    CPPUNIT_ASSERT( sa == c3);
+    CPPUNIT_ASSERT( c3 == sa);
+    CPPUNIT_ASSERT( sb != c3);
+    CPPUNIT_ASSERT( c3 != sb);
+
+    // test wxUniCharRef:
+    CPPUNIT_ASSERT( sa == sa[0]);
+    CPPUNIT_ASSERT( sa[0] == sa);
+    CPPUNIT_ASSERT( sb != sa[0]);
+    CPPUNIT_ASSERT( sa[0] != sb);
+
+    // test const version of operator[] (returns wxUniChar, not wxUniCharRef):
+    CPPUNIT_ASSERT( sb == sb[0]);
+    CPPUNIT_ASSERT( sb[0] == sb);
+    CPPUNIT_ASSERT( sa != sb[0]);
+    CPPUNIT_ASSERT( sb[0] != sa);
+}
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -0,0 +1,67 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/strings/vararg.cpp
+// Purpose:     Test for wx vararg look-alike macros
+// Author:      Vaclav Slavik
+// Created:     2007-02-20
+// RCS-ID:      $Id$
+// Copyright:   (c) 2007 REA Elektronik GmbH
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
+#include "wx/string.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class VarArgTestCase : public CppUnit::TestCase
+{
+public:
+    VarArgTestCase() {}
+
+private:
+    CPPUNIT_TEST_SUITE( VarArgTestCase );
+        CPPUNIT_TEST( StringPrintf );
+    CPPUNIT_TEST_SUITE_END();
+
+    void StringPrintf();
+
+    DECLARE_NO_COPY_CLASS(VarArgTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( VarArgTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VarArgTestCase, "VarArgTestCase" );
+
+void VarArgTestCase::StringPrintf()
+{
+    wxString s, s2;
+
+    s.Printf("%s %i", "foo", 42);
+    CPPUNIT_ASSERT( s == "foo 42" );
+    s.Printf("%s %s %i", _T("bar"), "=", 11);
+    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");
+    CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
+
+    s2.Printf(_T("[%s](%s)"), s, "str");
+    CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
+}
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -46,7 +46,9 @@
            strings/strings.cpp
            strings/stdstrings.cpp
            strings/tokenizer.cpp
+            strings/unichar.cpp
            strings/unicode.cpp
+            strings/vararg.cpp
            strings/crt.cpp
            strings/vsnprintf.cpp
            streams/bstream.cpp
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -573,6 +573,10 @@ SOURCE=.\strings\tokenizer.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\strings\unichar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\strings\unicode.cpp
 # End Source File
 # Begin Source File
@@ -581,6 +585,10 @@ SOURCE=.\uris\uris.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\strings\vararg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\strings\vsnprintf.cpp
 # End Source File
 # Begin Source File