Fixed HitTest for columns > 1

[wxWidgets.git] / samples / console / console.cpp

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 4bdd88b1b0092acdc0a908335569d755f8e79b13..76c7cef46ae1340c63618e49075fb56b788d5e61 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        samples/console/console.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        samples/console/console.cpp

-// Purpose:     a sample console (as opposed to GUI) progam using wxWindows
+// Purpose:     a sample console (as opposed to GUI) progam using wxWidgets

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.10.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.10.99


@@ -38,22 +38,19 @@
 
 /*
    A note about all these conditional compilation macros: this file is used
 
 /*
    A note about all these conditional compilation macros: this file is used

-   both as a test suite for various non-GUI wxWindows classes and as a
+   both as a test suite for various non-GUI wxWidgets classes and as a

    scratchpad for quick tests. So there are two compilation modes: if you
    define TEST_ALL all tests are run, otherwise you may enable the individual
    tests individually in the "#else" branch below.
  */
 
    scratchpad for quick tests. So there are two compilation modes: if you
    define TEST_ALL all tests are run, otherwise you may enable the individual
    tests individually in the "#else" branch below.
  */
 

-//Sanity check
-#ifdef wxUSE_GUI
-#   undef wxUSE_GUI
-#endif
+// what to test (in alphabetic order)? Define TEST_ALL to 0 to do a single
+// test, define it to 1 to do all tests.
+#define TEST_ALL 0
+
+
+#if TEST_ALL

 
 

-// what to test (in alphabetic order)? uncomment the line below to do all tests
-//#define TEST_ALL
-#ifdef TEST_ALL
-    #define TEST_ARRAYS
-    #define TEST_CHARSET

     #define TEST_CMDLINE
     #define TEST_DATETIME
     #define TEST_DIR
     #define TEST_CMDLINE
     #define TEST_DATETIME
     #define TEST_DIR


@@ -64,15 +61,13 @@
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME

-//    #define TEST_FTP
-    #define TEST_HASH
+ //   #define TEST_FTP  --FIXME! (RN)

     #define TEST_HASHMAP
     #define TEST_HASHSET
     #define TEST_INFO_FUNCTIONS
     #define TEST_LIST
     #define TEST_LOCALE
     #define TEST_LOG
     #define TEST_HASHMAP
     #define TEST_HASHSET
     #define TEST_INFO_FUNCTIONS
     #define TEST_LIST
     #define TEST_LOCALE
     #define TEST_LOG

-    #define TEST_LONGLONG

     #define TEST_MIME
     #define TEST_PATHLIST
     #define TEST_ODBC
     #define TEST_MIME
     #define TEST_PATHLIST
     #define TEST_ODBC


@@ -80,44 +75,38 @@
     #define TEST_REGCONF
     #define TEST_REGEX
     #define TEST_REGISTRY
     #define TEST_REGCONF
     #define TEST_REGEX
     #define TEST_REGISTRY

-//    #define TEST_SCOPEGUARD
+    #define TEST_SCOPEGUARD

     #define TEST_SNGLINST
     #define TEST_SNGLINST

-//    #define TEST_SOCKETS
+//    #define TEST_SOCKETS  --FIXME! (RN)

     #define TEST_STREAMS
     #define TEST_STREAMS

-    #define TEST_STRINGS

     #define TEST_TEXTSTREAM
     #define TEST_THREADS
     #define TEST_TIMER
     #define TEST_TEXTSTREAM
     #define TEST_THREADS
     #define TEST_TIMER

-    #define TEST_UNICODE

     // #define TEST_VCARD            -- don't enable this (VZ)
     // #define TEST_VCARD            -- don't enable this (VZ)

-    #define TEST_VOLUME
+//    #define TEST_VOLUME   --FIXME! (RN)

     #define TEST_WCHAR
     #define TEST_ZIP
     #define TEST_WCHAR
     #define TEST_ZIP

-    #define TEST_ZLIB
-    #define TEST_GZIP

 
 

-    #undef TEST_ALL
-    static const bool TEST_ALL = true;
-#else
-    #define TEST_FILENAME
+#else // #if TEST_ALL
+
+    #define TEST_DATETIME

 
 

-    static const bool TEST_ALL = false;

 #endif
 
 // some tests are interactive, define this to run them
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 
 #endif
 
 // some tests are interactive, define this to run them
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 

-    static const bool TEST_INTERACTIVE = true;
+    #define TEST_INTERACTIVE 1

 #else
 #else

-    static const bool TEST_INTERACTIVE = false;
+    #define TEST_INTERACTIVE 0

 #endif
 
 // ----------------------------------------------------------------------------
 // test class for container objects
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // test class for container objects
 // ----------------------------------------------------------------------------
 

-#if defined(TEST_ARRAYS) || defined(TEST_LIST)
+#if defined(TEST_LIST)

 
 class Bar // Foo is already taken in the hash test
 {
 
 class Bar // Foo is already taken in the hash test
 {


@@ -138,7 +127,7 @@ private:
 
 size_t Bar::ms_bars = 0;
 
 
 size_t Bar::ms_bars = 0;
 

-#endif // defined(TEST_ARRAYS) || defined(TEST_LIST)
+#endif // defined(TEST_LIST)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -148,7 +137,7 @@ size_t Bar::ms_bars = 0;
 // helper functions
 // ----------------------------------------------------------------------------
 
 // helper functions
 // ----------------------------------------------------------------------------
 

-#if defined(TEST_STRINGS) || defined(TEST_SOCKETS)
+#if defined(TEST_SOCKETS)

 
 // replace TABs with \t and CRs with \n
 static wxString MakePrintable(const wxChar *s)
 
 // replace TABs with \t and CRs with \n
 static wxString MakePrintable(const wxChar *s)


@@ -163,46 +152,6 @@ static wxString MakePrintable(const wxChar *s)
 
 #endif // MakePrintable() is used
 
 
 #endif // MakePrintable() is used
 

-// ----------------------------------------------------------------------------
-// wxFontMapper::CharsetToEncoding
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_CHARSET
-
-#include "wx/fontmap.h"
-
-static void TestCharset()
-{
-    static const wxChar *charsets[] =
-    {
-        // some vali charsets
-        _T("us-ascii    "),
-        _T("iso8859-1   "),
-        _T("iso-8859-12 "),
-        _T("koi8-r      "),
-        _T("utf-7       "),
-        _T("cp1250      "),
-        _T("windows-1252"),
-
-        // and now some bogus ones
-        _T("            "),
-        _T("cp1249      "),
-        _T("iso--8859-1 "),
-        _T("iso-8859-19 "),
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
-    {
-        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]);
-        wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"),
-                 charsets[n],
-                 wxFontMapper::Get()->GetEncodingName(enc).c_str(),
-                 wxFontMapper::Get()->GetEncodingDescription(enc).c_str());
-    }
-}
-
-#endif // TEST_CHARSET
-

 // ----------------------------------------------------------------------------
 // wxCmdLineParser
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCmdLineParser
 // ----------------------------------------------------------------------------


@@ -308,7 +257,7 @@ static void TestDirEnumHelper(wxDir& dir,
         cont = dir.GetNext(&filename);
     }
 
         cont = dir.GetNext(&filename);
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestDirEnum()
 }
 
 static void TestDirEnum()


@@ -369,7 +318,7 @@ static void TestDirEnum()
 class DirPrintTraverser : public wxDirTraverser
 {
 public:
 class DirPrintTraverser : public wxDirTraverser
 {
 public:

-    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))

     {
         return wxDIR_CONTINUE;
     }
     {
         return wxDIR_CONTINUE;
     }


@@ -413,7 +362,7 @@ static void TestDirTraverse()
     wxPuts(_T("Now enumerating directories:"));
     wxDir dir(TESTDIR);
     DirPrintTraverser traverser;
     wxPuts(_T("Now enumerating directories:"));
     wxDir dir(TESTDIR);
     DirPrintTraverser traverser;

-    dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
+    dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN);

 }
 
 static void TestDirExists()
 }
 
 static void TestDirExists()


@@ -653,7 +602,7 @@ static void TestFileRead()
         wxPrintf(_T("ERROR: can't open test file.\n"));
     }
 
         wxPrintf(_T("ERROR: can't open test file.\n"));
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestTextFileRead()
 }
 
 static void TestTextFileRead()


@@ -689,7 +638,7 @@ static void TestTextFileRead()
         wxPrintf(_T("ERROR: can't open '%s'\n"), file.GetName());
     }
 
         wxPrintf(_T("ERROR: can't open '%s'\n"), file.GetName());
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestFileCopy()
 }
 
 static void TestFileCopy()


@@ -738,7 +687,7 @@ static void TestFileCopy()
         wxPuts(_T("ERROR: failed to remove the file"));
     }
 
         wxPuts(_T("ERROR: failed to remove the file"));
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 #endif // TEST_FILE
 }
 
 #endif // TEST_FILE


@@ -820,6 +769,7 @@ static void TestFileConfRead()
 
 #include "wx/filename.h"
 
 
 #include "wx/filename.h"
 

+#if 0

 static void DumpFileName(const wxChar *desc, const wxFileName& fn)
 {
     wxPuts(desc);
 static void DumpFileName(const wxChar *desc, const wxFileName& fn)
 {
     wxPuts(desc);


@@ -852,6 +802,7 @@ static void DumpFileName(const wxChar *desc, const wxFileName& fn)
         wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str());
     }
 }
         wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str());
     }
 }

+#endif

 
 static struct FileNameInfo
 {
 
 static struct FileNameInfo
 {


@@ -922,7 +873,7 @@ static void TestFileNameConstruction()
                isAbsolute ? "absolute" : "relative",
                isAbsolute == fni.isAbsolute ? "ok" : "ERROR");
 
                isAbsolute ? "absolute" : "relative",
                isAbsolute == fni.isAbsolute ? "ok" : "ERROR");
 

-        if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) )
+        if ( !fn.Normalize(wxPATH_NORM_ALL, wxEmptyString, fni.format) )

         {
             wxPuts(_T("ERROR (couldn't be normalized)"));
         }
         {
             wxPuts(_T("ERROR (couldn't be normalized)"));
         }


@@ -932,7 +883,7 @@ static void TestFileNameConstruction()
         }
     }
 
         }
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestFileNameSplit()
 }
 
 static void TestFileNameSplit()


@@ -959,7 +910,7 @@ static void TestFileNameSplit()
         if ( ext != fni.ext )
             wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext);
 
         if ( ext != fni.ext )
             wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext);
 

-        wxPuts(_T(""));
+        wxPuts(wxEmptyString);

     }
 }
 
     }
 }
 


@@ -1062,7 +1013,7 @@ static void TestFileNameMakeAbsolute()
         wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
     }
 
         wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestFileNameDirManip()
 }
 
 static void TestFileNameDirManip()


@@ -1116,6 +1067,7 @@ static void TestFileGetTimes()
     }
 }
 
     }
 }
 

+#if 0

 static void TestFileSetTimes()
 {
     wxFileName fn(_T("testdata.fc"));
 static void TestFileSetTimes()
 {
     wxFileName fn(_T("testdata.fc"));


@@ -1125,236 +1077,10 @@ static void TestFileSetTimes()
         wxPrintf(_T("ERROR: Touch() failed.\n"));
     }
 }
         wxPrintf(_T("ERROR: Touch() failed.\n"));
     }
 }

+#endif

 
 #endif // TEST_FILETIME
 
 
 #endif // TEST_FILETIME
 

-// ----------------------------------------------------------------------------
-// wxHashTable
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_HASH
-
-#include "wx/hash.h"
-
-struct Foo
-{
-    Foo(int n_) { n = n_; count++; }
-    ~Foo() { count--; }
-
-    int n;
-
-    static size_t count;
-};
-
-size_t Foo::count = 0;
-
-WX_DECLARE_LIST(Foo, wxListFoos);
-WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
-
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST(wxListFoos);
-
-#include "wx/timer.h"
-
-static void TestHash()
-{
-    wxPuts(_T("*** Testing wxHashTable ***\n"));
-    const int COUNT = 100;
-
-    wxStopWatch sw;
-
-    sw.Start();
-
-    {
-        wxHashTable hash(wxKEY_INTEGER, 10), hash2(wxKEY_STRING);
-        wxObject o;
-        int i;
-
-        for ( i = 0; i < COUNT; ++i )
-            hash.Put(i, &o + i);
-
-        hash.BeginFind();
-        wxHashTable::compatibility_iterator it = hash.Next();
-        i = 0;
-
-        while (it)
-        {
-            ++i;
-            it = hash.Next();
-        }
-
-        if (i != COUNT)
-            wxPuts(_T("Error in wxHashTable::compatibility_iterator\n"));
-
-        for ( i = 99; i >= 0; --i )
-            if( hash.Get(i) != &o + i )
-                wxPuts(_T("Error in wxHashTable::Get/Put\n"));
-
-        for ( i = 0; i < COUNT; ++i )
-            hash.Put(i, &o + i + 20);
-
-        for ( i = 99; i >= 0; --i )
-            if( hash.Get(i) != &o + i)
-                wxPuts(_T("Error (2) in wxHashTable::Get/Put\n"));
-
-        for ( i = 0; i < COUNT/2; ++i )
-            if( hash.Delete(i) != &o + i)
-                wxPuts(_T("Error in wxHashTable::Delete\n"));
-
-        for ( i = COUNT/2; i < COUNT; ++i )
-            if( hash.Get(i) != &o + i)
-                wxPuts(_T("Error (3) in wxHashTable::Get/Put\n"));
-
-        for ( i = 0; i < COUNT/2; ++i )
-            if( hash.Get(i) != &o + i + 20)
-                wxPuts(_T("Error (4) in wxHashTable::Put/Delete\n"));
-
-        for ( i = 0; i < COUNT/2; ++i )
-            if( hash.Delete(i) != &o + i + 20)
-                wxPuts(_T("Error (2) in wxHashTable::Delete\n"));
-
-        for ( i = 0; i < COUNT/2; ++i )
-            if( hash.Get(i) != NULL)
-                wxPuts(_T("Error (5) in wxHashTable::Put/Delete\n"));
-
-        hash2.Put(_T("foo"), &o + 1);
-        hash2.Put(_T("bar"), &o + 2);
-        hash2.Put(_T("baz"), &o + 3);
-
-        if (hash2.Get(_T("moo")) != NULL)
-            wxPuts(_T("Error in wxHashTable::Get\n"));
-
-        if (hash2.Get(_T("bar")) != &o + 2)
-            wxPuts(_T("Error in wxHashTable::Get/Put\n"));
-
-        hash2.Put(_T("bar"), &o + 0);
-
-        if (hash2.Get(_T("bar")) != &o + 2)
-            wxPuts(_T("Error (2) in wxHashTable::Get/Put\n"));
-    }
-
-    // and now some corner-case testing; 3 and 13 hash to the same bucket
-    {
-        wxHashTable hash(wxKEY_INTEGER, 10);
-        wxObject dummy;
-
-        hash.Put(3, &dummy);
-        hash.Delete(3);
-
-        if (hash.Get(3) != NULL)
-            wxPuts(_T("Corner case 1 failure\n"));
-
-        hash.Put(3, &dummy);
-        hash.Put(13, &dummy);
-        hash.Delete(3);
-
-        if (hash.Get(3) != NULL)
-            wxPuts(_T("Corner case 2 failure\n"));
-
-        hash.Delete(13);
-
-        if (hash.Get(13) != NULL)
-            wxPuts(_T("Corner case 3 failure\n"));
-
-        hash.Put(3, &dummy);
-        hash.Put(13, &dummy);
-        hash.Delete(13);
-
-        if (hash.Get(13) != NULL)
-            wxPuts(_T("Corner case 4 failure\n"));
-
-        hash.Delete(3);
-
-        if (hash.Get(3) != NULL)
-            wxPuts(_T("Corner case 5 failure\n"));
-    }
-
-    {
-        wxHashTable hash(wxKEY_INTEGER, 10);
-        wxObject dummy;
-
-        hash.Put(3, 7, &dummy + 7);
-        hash.Put(4, 8, &dummy + 8);
-
-        if (hash.Get(7) != NULL) wxPuts(_T("Key/Hash 1 failure\n"));
-        if (hash.Get(3, 7) != &dummy + 7) wxPuts(_T("Key/Hash 2 failure\n"));
-        if (hash.Get(4) != NULL) wxPuts(_T("Key/Hash 3 failure\n"));
-        if (hash.Get(3) != NULL) wxPuts(_T("Key/Hash 4 failure\n"));
-        if (hash.Get(8) != NULL) wxPuts(_T("Key/Hash 5 failure\n"));
-        if (hash.Get(8, 4) != NULL) wxPuts(_T("Key/Hash 6 failure\n"));
-
-        if (hash.Delete(7) != NULL) wxPuts(_T("Key/Hash 7 failure\n"));
-        if (hash.Delete(3) != NULL) wxPuts(_T("Key/Hash 8 failure\n"));
-        if (hash.Delete(3, 7) != &dummy + 7) wxPuts(_T("Key/Hash 8 failure\n"));
-    }
-
-    {
-        wxHashFoos hash;
-        hash.DeleteContents(true);
-
-        wxPrintf(_T("Hash created: %u foos in hash, %u foos totally\n"),
-               hash.GetCount(), Foo::count);
-
-        static const int hashTestData[] =
-        {
-            0, 1, 17, -2, 2, 4, -4, 345, 3, 3, 2, 1,
-        };
-
-        size_t n;
-        for ( n = 0; n < WXSIZEOF(hashTestData); n++ )
-        {
-            hash.Put(hashTestData[n], n, new Foo(n));
-        }
-
-        wxPrintf(_T("Hash filled: %u foos in hash, %u foos totally\n"),
-               hash.GetCount(), Foo::count);
-
-        wxPuts(_T("Hash access test:"));
-        for ( n = 0; n < WXSIZEOF(hashTestData); n++ )
-        {
-            wxPrintf(_T("\tGetting element with key %d, value %d: "),
-                   hashTestData[n], n);
-            Foo *foo = hash.Get(hashTestData[n], n);
-            if ( !foo )
-            {
-                wxPrintf(_T("ERROR, not found.\n"));
-            }
-            else
-            {
-                wxPrintf(_T("%d (%s)\n"), foo->n,
-                       (size_t)foo->n == n ? "ok" : "ERROR");
-            }
-        }
-
-        wxPrintf(_T("\nTrying to get an element not in hash: "));
-
-        if ( hash.Get(1234) || hash.Get(1, 0) )
-        {
-            wxPuts(_T("ERROR: found!"));
-        }
-        else
-        {
-            wxPuts(_T("ok (not found)"));
-        }
-
-        Foo* foo = hash.Delete(0);
-
-        wxPrintf(_T("Removed 1 foo: %u foos still there\n"), Foo::count);
-
-        delete foo;
-
-        wxPrintf(_T("Foo deleted: %u foos left\n"), Foo::count);
-    }
-
-    wxPrintf(_T("Hash destroyed: %u foos left\n"), Foo::count);
-    wxPuts(_T("*** Testing wxHashTable finished ***\n"));
-
-    wxPrintf(_T("Time: %ld\n"), sw.Time());
-}
-
-#endif // TEST_HASH
-

 // ----------------------------------------------------------------------------
 // wxHashMap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxHashMap
 // ----------------------------------------------------------------------------


@@ -1701,7 +1427,7 @@ static void TestList()
             if ( *it != i + &i )
                 wxPuts(_T("Error in erase()\n"));
     }
             if ( *it != i + &i )
                 wxPuts(_T("Error in erase()\n"));
     }

-    
+

     wxPuts(_T("*** Testing std::list operations finished ***\n"));
 }
 
     wxPuts(_T("*** Testing std::list operations finished ***\n"));
 }
 


@@ -2079,7 +1805,7 @@ static void TestMimeEnum()
                mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
     }
 
                mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestMimeOverride()
 }
 
 static void TestMimeOverride()


@@ -2105,7 +1831,7 @@ static void TestMimeOverride()
         wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
                  mimetypes);
 
         wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
                  mimetypes);
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestMimeFilename()
 }
 
 static void TestMimeFilename()


@@ -2137,7 +1863,7 @@ static void TestMimeFilename()
 
             wxString cmd;
             if ( !ft->GetOpenCommand(&cmd,
 
             wxString cmd;
             if ( !ft->GetOpenCommand(&cmd,

-                                     wxFileType::MessageParameters(fname, _T(""))) )
+                                     wxFileType::MessageParameters(fname, wxEmptyString)) )

                 cmd = _T("<no command available>");
             else
                 cmd = wxString(_T('"')) + cmd + _T('"');
                 cmd = _T("<no command available>");
             else
                 cmd = wxString(_T('"')) + cmd + _T('"');


@@ -2149,7 +1875,7 @@ static void TestMimeFilename()
         }
     }
 
         }
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestMimeAssociate()
 }
 
 static void TestMimeAssociate()


@@ -2177,7 +1903,7 @@ static void TestMimeAssociate()
         delete ft;
     }
 
         delete ft;
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 #endif // TEST_MIME
 }
 
 #endif // TEST_MIME


@@ -2233,7 +1959,7 @@ static void TestOsInfo()
     wxPrintf(_T("Host name is %s (%s).\n"),
            wxGetHostName().c_str(), wxGetFullHostName().c_str());
 
     wxPrintf(_T("Host name is %s (%s).\n"),
            wxGetHostName().c_str(), wxGetFullHostName().c_str());
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestUserInfo()
 }
 
 static void TestUserInfo()


@@ -2245,611 +1971,125 @@ static void TestUserInfo()
     wxPrintf(_T("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
     wxPrintf(_T("Email address:\t%s\n"), wxGetEmailAddress().c_str());
 
     wxPrintf(_T("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
     wxPrintf(_T("Email address:\t%s\n"), wxGetEmailAddress().c_str());
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 #endif // TEST_INFO_FUNCTIONS
 
 // ----------------------------------------------------------------------------
 }
 
 #endif // TEST_INFO_FUNCTIONS
 
 // ----------------------------------------------------------------------------

-// long long
+// path list

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#ifdef TEST_LONGLONG
-
-#include "wx/longlong.h"
-#include "wx/timer.h"
-
-// make a 64 bit number from 4 16 bit ones
-#define MAKE_LL(x1, x2, x3, x4) wxLongLong((x1 << 16) | x2, (x3 << 16) | x3)
-
-// get a random 64 bit number
-#define RAND_LL()   MAKE_LL(rand(), rand(), rand(), rand())
-
-static const long testLongs[] =
-{
-    0,
-    1,
-    -1,
-    LONG_MAX,
-    LONG_MIN,
-    0x1234,
-    -0x1234
-};
+#ifdef TEST_PATHLIST

 
 

-#if wxUSE_LONGLONG_WX
-inline bool operator==(const wxLongLongWx& a, const wxLongLongNative& b)
-    { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); }
-inline bool operator==(const wxLongLongNative& a, const wxLongLongWx& b)
-    { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); }
-#endif // wxUSE_LONGLONG_WX
+#ifdef __UNIX__
+    #define CMD_IN_PATH _T("ls")
+#else
+    #define CMD_IN_PATH _T("command.com")
+#endif

 
 

-static void TestSpeed()
+static void TestPathList()

 {
 {

-    static const long max = 100000000;
-    long n;
-
-    {
-        wxStopWatch sw;
-
-        long l = 0;
-        for ( n = 0; n < max; n++ )
-        {
-            l += n;
-        }
-
-        wxPrintf(_T("Summing longs took %ld milliseconds.\n"), sw.Time());
-    }
+    wxPuts(_T("*** Testing wxPathList ***\n"));

 
 

-#if wxUSE_LONGLONG_NATIVE
+    wxPathList pathlist;
+    pathlist.AddEnvList(_T("PATH"));
+    wxString path = pathlist.FindValidPath(CMD_IN_PATH);
+    if ( path.empty() )

     {
     {

-        wxStopWatch sw;
-
-        wxLongLong_t l = 0;
-        for ( n = 0; n < max; n++ )
-        {
-            l += n;
-        }
-
-        wxPrintf(_T("Summing wxLongLong_t took %ld milliseconds.\n"), sw.Time());
+        wxPrintf(_T("ERROR: command not found in the path.\n"));

     }
     }

-#endif // wxUSE_LONGLONG_NATIVE
-
+    else

     {
     {

-        wxStopWatch sw;
-
-        wxLongLong l;
-        for ( n = 0; n < max; n++ )
-        {
-            l += n;
-        }
-
-        wxPrintf(_T("Summing wxLongLongs took %ld milliseconds.\n"), sw.Time());
+        wxPrintf(_T("Command found in the path as '%s'.\n"), path.c_str());

     }
 }
 
     }
 }
 

-static void TestLongLongConversion()
-{
-    wxPuts(_T("*** Testing wxLongLong conversions ***\n"));
-
-    wxLongLong a;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
-    {
-        a = RAND_LL();
-
-#if wxUSE_LONGLONG_NATIVE
-        wxLongLongNative b(a.GetHi(), a.GetLo());
-
-        wxASSERT_MSG( a == b, _T("conversions failure") );
-#else
-        wxPuts(_T("Can't do it without native long long type, test skipped."));
-
-        return;
-#endif // wxUSE_LONGLONG_NATIVE
+#endif // TEST_PATHLIST

 
 

-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
-        }
+// ----------------------------------------------------------------------------
+// regular expressions
+// ----------------------------------------------------------------------------

 
 

-        nTested++;
-    }
+#ifdef TEST_REGEX

 
 

-    wxPuts(_T(" done!"));
-}
+#include "wx/regex.h"

 
 

-static void TestMultiplication()
+static void TestRegExInteractive()

 {
 {

-    wxPuts(_T("*** Testing wxLongLong multiplication ***\n"));
+    wxPuts(_T("*** Testing RE interactively ***"));

 
 

-    wxLongLong a, b;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
+    for ( ;; )

     {
     {

-        a = RAND_LL();
-        b = RAND_LL();
-
-#if wxUSE_LONGLONG_NATIVE
-        wxLongLongNative aa(a.GetHi(), a.GetLo());
-        wxLongLongNative bb(b.GetHi(), b.GetLo());
-
-        wxASSERT_MSG( a*b == aa*bb, _T("multiplication failure") );
-#else // !wxUSE_LONGLONG_NATIVE
-        wxPuts(_T("Can't do it without native long long type, test skipped."));
+        wxChar pattern[128];
+        wxPrintf(_T("\nEnter a pattern: "));
+        if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) )
+            break;

 
 

-        return;
-#endif // wxUSE_LONGLONG_NATIVE
+        // kill the last '\n'
+        pattern[wxStrlen(pattern) - 1] = 0;

 
 

-        if ( !(nTested % 1000) )
+        wxRegEx re;
+        if ( !re.Compile(pattern) )

         {
         {

-            putchar('.');
-            fflush(stdout);
+            continue;

         }
 
         }
 

-        nTested++;
-    }
-
-    wxPuts(_T(" done!"));
-}
-
-static void TestDivision()
-{
-    wxPuts(_T("*** Testing wxLongLong division ***\n"));
-
-    wxLongLong q, r;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
-    {
-        // get a random wxLongLong (shifting by 12 the MSB ensures that the
-        // multiplication will not overflow)
-        wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand());
-
-        // get a random (but non null) long (not wxLongLong for now) to divide
-        // it with
-        long l;
-        do
+        wxChar text[128];
+        for ( ;; )

         {
         {

-           l = rand();
-        }
-        while ( !l );
+            wxPrintf(_T("Enter text to match: "));
+            if ( !wxFgets(text, WXSIZEOF(text), stdin) )
+                break;

 
 

-        q = ll / l;
-        r = ll % l;
+            // kill the last '\n'
+            text[wxStrlen(text) - 1] = 0;

 
 

-#if wxUSE_LONGLONG_NATIVE
-        wxLongLongNative m(ll.GetHi(), ll.GetLo());
+            if ( !re.Matches(text) )
+            {
+                wxPrintf(_T("No match.\n"));
+            }
+            else
+            {
+                wxPrintf(_T("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());

 
 

-        wxLongLongNative p = m / l, s = m % l;
-        wxASSERT_MSG( q == p && r == s, _T("division failure") );
-#else // !wxUSE_LONGLONG_NATIVE
-        // verify the result
-        wxASSERT_MSG( ll == q*l + r, "division failure" );
-#endif // wxUSE_LONGLONG_NATIVE
+                size_t start, len;
+                for ( size_t n = 1; ; n++ )
+                {
+                    if ( !re.GetMatch(&start, &len, n) )
+                    {
+                        break;
+                    }

 
 

-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
+                    wxPrintf(_T("Subexpr %u matched '%s'\n"),
+                             n, wxString(text + start, len).c_str());
+                }
+            }

         }
         }

-
-        nTested++;

     }
     }

-
-    wxPuts(_T(" done!"));

 }
 
 }
 

-static void TestAddition()
-{
-    wxPuts(_T("*** Testing wxLongLong addition ***\n"));
-
-    wxLongLong a, b, c;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
-    {
-        a = RAND_LL();
-        b = RAND_LL();
-        c = a + b;
+#endif // TEST_REGEX

 
 

-#if wxUSE_LONGLONG_NATIVE
-        wxASSERT_MSG( c == wxLongLongNative(a.GetHi(), a.GetLo()) +
-                           wxLongLongNative(b.GetHi(), b.GetLo()),
-                      _T("addition failure") );
-#else // !wxUSE_LONGLONG_NATIVE
-        wxASSERT_MSG( c - b == a, "addition failure" );
-#endif // wxUSE_LONGLONG_NATIVE
+// ----------------------------------------------------------------------------
+// database
+// ----------------------------------------------------------------------------

 
 

-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
-        }
+#if !wxUSE_ODBC
+    #undef TEST_ODBC
+#endif

 
 

-        nTested++;
-    }
+#ifdef TEST_ODBC

 
 

-    wxPuts(_T(" done!"));
-}
+#include <wx/db.h>

 
 

-static void TestBitOperations()
+static void TestDbOpen()

 {
 {

-    wxPuts(_T("*** Testing wxLongLong bit operation ***\n"));
+    HENV henv;
+    wxDb db(henv);
+}

 
 

-    wxLongLong ll;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
-    {
-        ll = RAND_LL();
-
-#if wxUSE_LONGLONG_NATIVE
-        for ( size_t n = 0; n < 33; n++ )
-        {
-        }
-#else // !wxUSE_LONGLONG_NATIVE
-        wxPuts(_T("Can't do it without native long long type, test skipped."));
-
-        return;
-#endif // wxUSE_LONGLONG_NATIVE
-
-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
-        }
-
-        nTested++;
-    }
-
-    wxPuts(_T(" done!"));
-}
-
-static void TestLongLongComparison()
-{
-#if wxUSE_LONGLONG_WX
-    wxPuts(_T("*** Testing wxLongLong comparison ***\n"));
-
-    static const long ls[2] =
-    {
-        0x1234,
-       -0x1234,
-    };
-
-    wxLongLongWx lls[2];
-    lls[0] = ls[0];
-    lls[1] = ls[1];
-
-    for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
-    {
-        bool res;
-
-        for ( size_t m = 0; m < WXSIZEOF(lls); m++ )
-        {
-            res = lls[m] > testLongs[n];
-            wxPrintf(_T("0x%lx > 0x%lx is %s (%s)\n"),
-                   ls[m], testLongs[n], res ? "true" : "false",
-                   res == (ls[m] > testLongs[n]) ? "ok" : "ERROR");
-
-            res = lls[m] < testLongs[n];
-            wxPrintf(_T("0x%lx < 0x%lx is %s (%s)\n"),
-                   ls[m], testLongs[n], res ? "true" : "false",
-                   res == (ls[m] < testLongs[n]) ? "ok" : "ERROR");
-
-            res = lls[m] == testLongs[n];
-            wxPrintf(_T("0x%lx == 0x%lx is %s (%s)\n"),
-                   ls[m], testLongs[n], res ? "true" : "false",
-                   res == (ls[m] == testLongs[n]) ? "ok" : "ERROR");
-        }
-    }
-#endif // wxUSE_LONGLONG_WX
-}
-
-static void TestLongLongToString()
-{
-    wxPuts(_T("*** Testing wxLongLong::ToString() ***\n"));
-
-    for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
-    {
-        wxLongLong ll = testLongs[n];
-        wxPrintf(_T("%ld == %s\n"), testLongs[n], ll.ToString().c_str());
-    }
-
-    wxLongLong ll(0x12345678, 0x87654321);
-    wxPrintf(_T("0x1234567887654321 = %s\n"), ll.ToString().c_str());
-
-    ll.Negate();
-    wxPrintf(_T("-0x1234567887654321 = %s\n"), ll.ToString().c_str());
-}
-
-static void TestLongLongPrintf()
-{
-    wxPuts(_T("*** Testing wxLongLong printing ***\n"));
-
-#ifdef wxLongLongFmtSpec
-    wxLongLong ll = wxLL(0x1234567890abcdef);
-    wxString s = wxString::Format(_T("%") wxLongLongFmtSpec _T("x"), ll);
-    wxPrintf(_T("0x1234567890abcdef -> %s (%s)\n"),
-             s.c_str(), s == _T("1234567890abcdef") ? _T("ok") : _T("ERROR"));
-#else // !wxLongLongFmtSpec
-    #error "wxLongLongFmtSpec not defined for this compiler/platform"
-#endif
-}
-
-#undef MAKE_LL
-#undef RAND_LL
-
-#endif // TEST_LONGLONG
-
-// ----------------------------------------------------------------------------
-// path list
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_PATHLIST
-
-#ifdef __UNIX__
-    #define CMD_IN_PATH _T("ls")
-#else
-    #define CMD_IN_PATH _T("command.com")
-#endif
-
-static void TestPathList()
-{
-    wxPuts(_T("*** Testing wxPathList ***\n"));
-
-    wxPathList pathlist;
-    pathlist.AddEnvList(_T("PATH"));
-    wxString path = pathlist.FindValidPath(CMD_IN_PATH);
-    if ( path.empty() )
-    {
-        wxPrintf(_T("ERROR: command not found in the path.\n"));
-    }
-    else
-    {
-        wxPrintf(_T("Command found in the path as '%s'.\n"), path.c_str());
-    }
-}
-
-#endif // TEST_PATHLIST
-
-// ----------------------------------------------------------------------------
-// regular expressions
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_REGEX
-
-#include "wx/regex.h"
-
-static void TestRegExCompile()
-{
-    wxPuts(_T("*** Testing RE compilation ***\n"));
-
-    static struct RegExCompTestData
-    {
-        const wxChar *pattern;
-        bool correct;
-    } regExCompTestData[] =
-    {
-        { _T("foo"), true },
-        { _T("foo("), false },
-        { _T("foo(bar"), false },
-        { _T("foo(bar)"), true },
-        { _T("foo["), false },
-        { _T("foo[bar"), false },
-        { _T("foo[bar]"), true },
-        { _T("foo{"), true },
-        { _T("foo{1"), false },
-        { _T("foo{bar"), true },
-        { _T("foo{1}"), true },
-        { _T("foo{1,2}"), true },
-        { _T("foo{bar}"), true },
-        { _T("foo*"), true },
-        { _T("foo**"), false },
-        { _T("foo+"), true },
-        { _T("foo++"), false },
-        { _T("foo?"), true },
-        { _T("foo??"), false },
-        { _T("foo?+"), false },
-    };
-
-    wxRegEx re;
-    for ( size_t n = 0; n < WXSIZEOF(regExCompTestData); n++ )
-    {
-        const RegExCompTestData& data = regExCompTestData[n];
-        bool ok = re.Compile(data.pattern);
-
-        wxPrintf(_T("'%s' is %sa valid RE (%s)\n"),
-                 data.pattern,
-                 ok ? _T("") : _T("not "),
-                 ok == data.correct ? _T("ok") : _T("ERROR"));
-    }
-}
-
-static void TestRegExMatch()
-{
-    wxPuts(_T("*** Testing RE matching ***\n"));
-
-    static struct RegExMatchTestData
-    {
-        const wxChar *pattern;
-        const wxChar *text;
-        bool correct;
-    } regExMatchTestData[] =
-    {
-        { _T("foo"), _T("bar"), false },
-        { _T("foo"), _T("foobar"), true },
-        { _T("^foo"), _T("foobar"), true },
-        { _T("^foo"), _T("barfoo"), false },
-        { _T("bar$"), _T("barbar"), true },
-        { _T("bar$"), _T("barbar "), false },
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(regExMatchTestData); n++ )
-    {
-        const RegExMatchTestData& data = regExMatchTestData[n];
-
-        wxRegEx re(data.pattern);
-        bool ok = re.Matches(data.text);
-
-        wxPrintf(_T("'%s' %s %s (%s)\n"),
-                 data.pattern,
-                 ok ? _T("matches") : _T("doesn't match"),
-                 data.text,
-                 ok == data.correct ? _T("ok") : _T("ERROR"));
-    }
-}
-
-static void TestRegExSubmatch()
-{
-    wxPuts(_T("*** Testing RE subexpressions ***\n"));
-
-    wxRegEx re(_T("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).*([[:digit:]]+)$"));
-    if ( !re.IsValid() )
-    {
-        wxPuts(_T("ERROR: compilation failed."));
-        return;
-    }
-
-    wxString text = _T("Fri Jul 13 18:37:52 CEST 2001");
-
-    if ( !re.Matches(text) )
-    {
-        wxPuts(_T("ERROR: match expected."));
-    }
-    else
-    {
-        wxPrintf(_T("Entire match: %s\n"), re.GetMatch(text).c_str());
-
-        wxPrintf(_T("Date: %s/%s/%s, wday: %s\n"),
-                 re.GetMatch(text, 3).c_str(),
-                 re.GetMatch(text, 2).c_str(),
-                 re.GetMatch(text, 4).c_str(),
-                 re.GetMatch(text, 1).c_str());
-    }
-}
-
-static void TestRegExReplacement()
-{
-    wxPuts(_T("*** Testing RE replacement ***"));
-
-    static struct RegExReplTestData
-    {
-        const wxChar *text;
-        const wxChar *repl;
-        const wxChar *result;
-        size_t count;
-    } regExReplTestData[] =
-    {
-        { _T("foo123"), _T("bar"), _T("bar"), 1 },
-        { _T("foo123"), _T("\\2\\1"), _T("123foo"), 1 },
-        { _T("foo_123"), _T("\\2\\1"), _T("123foo"), 1 },
-        { _T("123foo"), _T("bar"), _T("123foo"), 0 },
-        { _T("123foo456foo"), _T("&&"), _T("123foo456foo456foo"), 1 },
-        { _T("foo123foo123"), _T("bar"), _T("barbar"), 2 },
-        { _T("foo123_foo456_foo789"), _T("bar"), _T("bar_bar_bar"), 3 },
-    };
-
-    const wxChar *pattern = _T("([a-z]+)[^0-9]*([0-9]+)");
-    wxRegEx re(pattern);
-
-    wxPrintf(_T("Using pattern '%s' for replacement.\n"), pattern);
-
-    for ( size_t n = 0; n < WXSIZEOF(regExReplTestData); n++ )
-    {
-        const RegExReplTestData& data = regExReplTestData[n];
-
-        wxString text = data.text;
-        size_t nRepl = re.Replace(&text, data.repl);
-
-        wxPrintf(_T("%s =~ s/RE/%s/g: %u match%s, result = '%s' ("),
-                 data.text, data.repl,
-                 nRepl, nRepl == 1 ? _T("") : _T("es"),
-                 text.c_str());
-        if ( text == data.result && nRepl == data.count )
-        {
-            wxPuts(_T("ok)"));
-        }
-        else
-        {
-            wxPrintf(_T("ERROR: should be %u and '%s')\n"),
-                     data.count, data.result);
-        }
-    }
-}
-
-static void TestRegExInteractive()
-{
-    wxPuts(_T("*** Testing RE interactively ***"));
-
-    for ( ;; )
-    {
-        wxChar pattern[128];
-        wxPrintf(_T("\nEnter a pattern: "));
-        if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) )
-            break;
-
-        // kill the last '\n'
-        pattern[wxStrlen(pattern) - 1] = 0;
-
-        wxRegEx re;
-        if ( !re.Compile(pattern) )
-        {
-            continue;
-        }
-
-        wxChar text[128];
-        for ( ;; )
-        {
-            wxPrintf(_T("Enter text to match: "));
-            if ( !wxFgets(text, WXSIZEOF(text), stdin) )
-                break;
-
-            // kill the last '\n'
-            text[wxStrlen(text) - 1] = 0;
-
-            if ( !re.Matches(text) )
-            {
-                wxPrintf(_T("No match.\n"));
-            }
-            else
-            {
-                wxPrintf(_T("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());
-
-                size_t start, len;
-                for ( size_t n = 1; ; n++ )
-                {
-                    if ( !re.GetMatch(&start, &len, n) )
-                    {
-                        break;
-                    }
-
-                    wxPrintf(_T("Subexpr %u matched '%s'\n"),
-                             n, wxString(text + start, len).c_str());
-                }
-            }
-        }
-    }
-}
-
-#endif // TEST_REGEX
-
-// ----------------------------------------------------------------------------
-// database
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_ODBC
-    #undef TEST_ODBC
-#endif
-
-#ifdef TEST_ODBC
-
-#include <wx/db.h>
-
-static void TestDbOpen()
-{
-    HENV henv;
-    wxDb db(henv);
-}
-
-#endif // TEST_ODBC
+#endif // TEST_ODBC

 
 // ----------------------------------------------------------------------------
 // printf() tests
 
 // ----------------------------------------------------------------------------
 // printf() tests


@@ -2857,7 +2097,7 @@ static void TestDbOpen()
 
 /*
    NB: this stuff was taken from the glibc test suite and modified to build
 
 /*
    NB: this stuff was taken from the glibc test suite and modified to build

-       in wxWindows: if I read the copyright below properly, this shouldn't
+       in wxWidgets: if I read the copyright below properly, this shouldn't

        be a problem
  */
 
        be a problem
  */
 


@@ -2929,6 +2169,8 @@ fmtst2chk (const wxChar *fmt)
  * This exercises the output formatting code.
  */
 
  * This exercises the output formatting code.
  */
 

+wxChar *PointerNull = NULL;
+

 static void
 fp_test (void)
 {
 static void
 fp_test (void)
 {


@@ -2970,8 +2212,8 @@ fp_test (void)
       }
     }
   }
       }
     }
   }

-  wxPrintf(_T("%10s\n"), (wxChar *) NULL);
-  wxPrintf(_T("%-10s\n"), (wxChar *) NULL);
+  wxPrintf(_T("%10s\n"), PointerNull);
+  wxPrintf(_T("%-10s\n"), PointerNull);

 }
 
 static void TestPrintf()
 }
 
 static void TestPrintf()


@@ -2980,6 +2222,7 @@ static void TestPrintf()
   static wxChar longstr[] = _T("Good morning, Doctor Chandra.  This is Hal.  \
 I am ready for my first lesson today.");
   int result = 0;
   static wxChar longstr[] = _T("Good morning, Doctor Chandra.  This is Hal.  \
 I am ready for my first lesson today.");
   int result = 0;

+  wxString test_format;

 
   fmtchk(_T("%.4x"));
   fmtchk(_T("%04x"));
 
   fmtchk(_T("%.4x"));
   fmtchk(_T("%04x"));


@@ -2993,7 +2236,8 @@ I am ready for my first lesson today.");
   fmtst2chk(_T("%*.*x"));
   fmtst2chk(_T("%0*.*x"));
 
   fmtst2chk(_T("%*.*x"));
   fmtst2chk(_T("%0*.*x"));
 

-  wxPrintf(_T("bad format:\t\"%b\"\n"));
+  wxString bad_format = _T("bad format:\t\"%b\"\n");
+  wxPrintf(bad_format.c_str());

   wxPrintf(_T("nil pointer (padded):\t\"%10p\"\n"), (void *) NULL);
 
   wxPrintf(_T("decimal negative:\t\"%d\"\n"), -2345);
   wxPrintf(_T("nil pointer (padded):\t\"%10p\"\n"), (void *) NULL);
 
   wxPrintf(_T("decimal negative:\t\"%d\"\n"), -2345);


@@ -3003,15 +2247,18 @@ I am ready for my first lesson today.");
   wxPrintf(_T("long octal negative:\t\"%lo\"\n"), -2345L);
   wxPrintf(_T("long unsigned decimal number:\t\"%lu\"\n"), -123456L);
   wxPrintf(_T("zero-padded LDN:\t\"%010ld\"\n"), -123456L);
   wxPrintf(_T("long octal negative:\t\"%lo\"\n"), -2345L);
   wxPrintf(_T("long unsigned decimal number:\t\"%lu\"\n"), -123456L);
   wxPrintf(_T("zero-padded LDN:\t\"%010ld\"\n"), -123456L);

-  wxPrintf(_T("left-adjusted ZLDN:\t\"%-010ld\"\n"), -123456);
+  test_format = _T("left-adjusted ZLDN:\t\"%-010ld\"\n");
+  wxPrintf(test_format.c_str(), -123456);

   wxPrintf(_T("space-padded LDN:\t\"%10ld\"\n"), -123456L);
   wxPrintf(_T("left-adjusted SLDN:\t\"%-10ld\"\n"), -123456L);
 
   wxPrintf(_T("space-padded LDN:\t\"%10ld\"\n"), -123456L);
   wxPrintf(_T("left-adjusted SLDN:\t\"%-10ld\"\n"), -123456L);
 

-  wxPrintf(_T("zero-padded string:\t\"%010s\"\n"), shortstr);
-  wxPrintf(_T("left-adjusted Z string:\t\"%-010s\"\n"), shortstr);
+  test_format = _T("zero-padded string:\t\"%010s\"\n");
+  wxPrintf(test_format.c_str(), shortstr);
+  test_format = _T("left-adjusted Z string:\t\"%-010s\"\n");
+  wxPrintf(test_format.c_str(), shortstr);

   wxPrintf(_T("space-padded string:\t\"%10s\"\n"), shortstr);
   wxPrintf(_T("left-adjusted S string:\t\"%-10s\"\n"), shortstr);
   wxPrintf(_T("space-padded string:\t\"%10s\"\n"), shortstr);
   wxPrintf(_T("left-adjusted S string:\t\"%-10s\"\n"), shortstr);

-  wxPrintf(_T("null string:\t\"%s\"\n"), (wxChar *)NULL);
+  wxPrintf(_T("null string:\t\"%s\"\n"), PointerNull);

   wxPrintf(_T("limited string:\t\"%.22s\"\n"), longstr);
 
   wxPrintf(_T("e-style >= 1:\t\"%e\"\n"), 12.34);
   wxPrintf(_T("limited string:\t\"%.22s\"\n"), longstr);
 
   wxPrintf(_T("e-style >= 1:\t\"%e\"\n"), 12.34);


@@ -3044,7 +2291,11 @@ I am ready for my first lesson today.");
     fflush (stdout);
   }
 
     fflush (stdout);
   }
 

+#ifndef __WATCOMC__
+  // Open Watcom cause compiler error here
+  // Error! E173: col(24) floating-point constant too small to represent

   wxPrintf (_T("%15.5e\n"), 4.9406564584124654e-324);
   wxPrintf (_T("%15.5e\n"), 4.9406564584124654e-324);

+#endif

 
 #define FORMAT _T("|%12.4f|%12.4e|%12.4g|\n")
   wxPrintf (FORMAT, 0.0, 0.0, 0.0);
 
 #define FORMAT _T("|%12.4f|%12.4e|%12.4g|\n")
   wxPrintf (FORMAT, 0.0, 0.0, 0.0);


@@ -3112,7 +2363,8 @@ I am ready for my first lesson today.");
           result = 1;
           wxPuts (_T("\tFAILED"));
       }
           result = 1;
           wxPuts (_T("\tFAILED"));
       }

-      wxPuts (_T(""));
+      wxUnusedVar(result);
+      wxPuts (wxEmptyString);

   }
 #endif // wxLongLong_t
 
   }
 #endif // wxLongLong_t
 


@@ -3175,6 +2427,7 @@ rfg2 (void)
 {
   int prec;
   wxChar buf[100];
 {
   int prec;
   wxChar buf[100];

+  wxString test_format;

 
   prec = 0;
   wxSprintf (buf, _T("%.*g"), prec, 3.3);
 
   prec = 0;
   wxSprintf (buf, _T("%.*g"), prec, 3.3);


@@ -3189,19 +2442,23 @@ rfg2 (void)
   if (wxStrcmp (buf, _T("      3")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("      3"));
   prec = 3;
   if (wxStrcmp (buf, _T("      3")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("      3"));
   prec = 3;

-  wxSprintf (buf, _T("%04.*o"), prec, 33);
+  test_format = _T("%04.*o");
+  wxSprintf (buf, test_format.c_str(), prec, 33);

   if (wxStrcmp (buf, _T(" 041")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 041"));
   prec = 7;
   if (wxStrcmp (buf, _T(" 041")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 041"));
   prec = 7;

-  wxSprintf (buf, _T("%09.*u"), prec, 33);
+  test_format = _T("%09.*u");
+  wxSprintf (buf, test_format.c_str(), prec, 33);

   if (wxStrcmp (buf, _T("  0000033")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("  0000033"));
   prec = 3;
   if (wxStrcmp (buf, _T("  0000033")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("  0000033"));
   prec = 3;

-  wxSprintf (buf, _T("%04.*x"), prec, 33);
+  test_format = _T("%04.*x");
+  wxSprintf (buf, test_format.c_str(), prec, 33);

   if (wxStrcmp (buf, _T(" 021")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
   prec = 3;
   if (wxStrcmp (buf, _T(" 021")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
   prec = 3;

-  wxSprintf (buf, _T("%04.*X"), prec, 33);
+  test_format = _T("%04.*X");
+  wxSprintf (buf, test_format.c_str(), prec, 33);

   if (wxStrcmp (buf, _T(" 021")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
 }
   if (wxStrcmp (buf, _T(" 021")) != 0)
     wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
 }


@@ -3223,27 +2480,29 @@ rfg2 (void)
 #include "wx/confbase.h"
 #include "wx/msw/regconf.h"
 
 #include "wx/confbase.h"
 #include "wx/msw/regconf.h"
 

+#if 0

 static void TestRegConfWrite()
 {
 static void TestRegConfWrite()
 {

-    wxConfig *config = new wxConfig("myapp");
-    config->SetPath("/group1");
-    config->Write("entry1", "foo");
-    config->SetPath("/group2");
-    config->Write("entry1", "bar");
+    wxConfig *config = new wxConfig(_T("myapp"));
+    config->SetPath(_T("/group1"));
+    config->Write(_T("entry1"), _T("foo"));
+    config->SetPath(_T("/group2"));
+    config->Write(_T("entry1"), _T("bar"));

 }
 }

+#endif

 
 static void TestRegConfRead()
 {
 
 static void TestRegConfRead()
 {

-    wxConfig *config = new wxConfig("myapp");
+    wxConfig *config = new wxConfig(_T("myapp"));

 
     wxString str;
     long dummy;
 
     wxString str;
     long dummy;

-    config->SetPath("/");
-    puts("Enumerating / subgroups:");
+    config->SetPath(_T("/"));
+    wxPuts(_T("Enumerating / subgroups:"));

     bool bCont = config->GetFirstGroup(str, dummy);
     while(bCont)
     {
     bool bCont = config->GetFirstGroup(str, dummy);
     while(bCont)
     {

-        puts(str);
+        wxPuts(str);

         bCont = config->GetNextGroup(str, dummy);
     }
 }
         bCont = config->GetNextGroup(str, dummy);
     }
 }


@@ -3314,7 +2573,7 @@ static void TestRegistryRead()
             wxPrintf(_T(" (raw value '%s')"), val.c_str());
         }
 
             wxPrintf(_T(" (raw value '%s')"), val.c_str());
         }
 

-        putchar('\n');
+        wxPutchar('\n');

 
         cont = key.GetNextValue(value, dummy);
     }
 
         cont = key.GetNextValue(value, dummy);
     }


@@ -3376,14 +2635,14 @@ struct Object
 
 static void TestScopeGuard()
 {
 
 static void TestScopeGuard()
 {

-    ON_BLOCK_EXIT0(function0);
-    ON_BLOCK_EXIT1(function1, 17);
-    ON_BLOCK_EXIT2(function2, 3.14, 'p');
+    wxON_BLOCK_EXIT0(function0);
+    wxON_BLOCK_EXIT1(function1, 17);
+    wxON_BLOCK_EXIT2(function2, 3.14, 'p');

 
     Object obj;
 
     Object obj;

-    ON_BLOCK_EXIT_OBJ0(obj, &Object::method0);
-    ON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7);
-    ON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e');
+    wxON_BLOCK_EXIT_OBJ0(obj, &Object::method0);
+    wxON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7);
+    wxON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e');

 
     wxScopeGuard dismissed = wxMakeGuard(function0);
     dismissed.Dismiss();
 
     wxScopeGuard dismissed = wxMakeGuard(function0);
     dismissed.Dismiss();


@@ -3504,7 +2763,7 @@ static void TestSocketClient()
 {
     wxPuts(_T("*** Testing wxSocketClient ***\n"));
 
 {
     wxPuts(_T("*** Testing wxSocketClient ***\n"));
 

-    static const wxChar *hostname = _T("www.wxwindows.org");
+    static const wxChar *hostname = _T("www.wxwidgets.org");

 
     wxIPV4address addr;
     addr.Hostname(hostname);
 
     wxIPV4address addr;
     addr.Hostname(hostname);


@@ -3562,7 +2821,7 @@ static bool TestFtpConnect()
     wxPuts(_T("*** Testing FTP connect ***"));
 
 #ifdef FTP_ANONYMOUS
     wxPuts(_T("*** Testing FTP connect ***"));
 
 #ifdef FTP_ANONYMOUS

-    static const wxChar *hostname = _T("ftp.wxwindows.org");
+    static const wxChar *hostname = _T("ftp.wxwidgets.org");

 
     wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
 #else // !FTP_ANONYMOUS
 
     wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
 #else // !FTP_ANONYMOUS


@@ -3874,7 +3133,7 @@ static void TestFileStream()
 {
     wxPuts(_T("*** Testing wxFileInputStream ***"));
 
 {
     wxPuts(_T("*** Testing wxFileInputStream ***"));
 

-    static const wxChar *filename = _T("testdata.fs");
+    static const wxString filename = _T("testdata.fs");

     {
         wxFileOutputStream fsOut(filename);
         fsOut.Write("foo", 3);
     {
         wxFileOutputStream fsOut(filename);
         fsOut.Write("foo", 3);


@@ -3884,12 +3143,12 @@ static void TestFileStream()
     wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize());
     while ( !fsIn.Eof() )
     {
     wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize());
     while ( !fsIn.Eof() )
     {

-        putchar(fsIn.GetC());
+        wxPutchar(fsIn.GetC());

     }
 
     if ( !wxRemoveFile(filename) )
     {
     }
 
     if ( !wxRemoveFile(filename) )
     {

-        wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename);
+        wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename.c_str());

     }
 
     wxPuts(_T("\n*** wxFileInputStream test done ***"));
     }
 
     wxPuts(_T("\n*** wxFileInputStream test done ***"));


@@ -3920,7 +3179,7 @@ static void TestMemoryStream()
     wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
     while ( !memInpStream.Eof() )
     {
     wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
     while ( !memInpStream.Eof() )
     {

-        putchar(memInpStream.GetC());
+        wxPutchar(memInpStream.GetC());

     }
 
     wxPuts(_T("\n*** wxMemoryInputStream test done ***"));
     }
 
     wxPuts(_T("\n*** wxMemoryInputStream test done ***"));


@@ -3980,7 +3239,7 @@ static void TestStopWatch()
             }
         }
 
             }
         }
 

-        putchar('.');
+        wxPutchar('.');

         fflush(stdout);
     }
 
         fflush(stdout);
     }
 


@@ -4048,7 +3307,7 @@ static void DumpVObject(size_t level, const wxVCardObject& vcard)
 
         if ( !!value )
             wxPrintf(_T(" = %s"), value.c_str());
 
         if ( !!value )
             wxPrintf(_T(" = %s"), value.c_str());

-        putchar('\n');
+        wxPutchar('\n');

 
         DumpVObject(level + 1, *vcObj);
 
 
         DumpVObject(level + 1, *vcObj);
 


@@ -4221,7 +3480,7 @@ static void TestVCardWrite()
         // set some fields
         vcard.SetName("Zeitlin", "Vadim");
         vcard.SetFullName("Vadim Zeitlin");
         // set some fields
         vcard.SetName("Zeitlin", "Vadim");
         vcard.SetFullName("Vadim Zeitlin");

-        vcard.SetOrganization("wxWindows", "R&D");
+        vcard.SetOrganization("wxWidgets", "R&D");

 
         // just dump the vCard back
         wxPuts(_T("Entire vCard follows:\n"));
 
         // just dump the vCard back
         wxPuts(_T("Entire vCard follows:\n"));


@@ -4294,43 +3553,6 @@ static void TestFSVolume()
 // wide char and Unicode support
 // ----------------------------------------------------------------------------
 
 // wide char and Unicode support
 // ----------------------------------------------------------------------------
 

-#ifdef TEST_UNICODE
-
-static void TestUnicodeToFromAscii()
-{
-    wxPuts(_T("Testing wxString::To/FromAscii()\n"));
-
-    static const char *msg = "Hello, world!";
-    wxString s = wxString::FromAscii(msg);
-
-    wxPrintf(_T("Message in Unicode: %s\n"), s.c_str());
-    printf("Message in ASCII: %s\n", (const char *)s.ToAscii());
-
-    wxPutchar(_T('\n'));
-}
-
-#include "wx/textfile.h"
-
-static void TestUnicodeTextFileRead()
-{
-    wxPuts(_T("Testing wxTextFile in Unicode build\n"));
-
-    wxTextFile file;
-    if ( file.Open(_T("testdata.fc"), wxConvLocal) )
-       {
-        const size_t count = file.GetLineCount();
-               for ( size_t n = 0; n < count; n++ )
-               {
-            const wxString& s = file[n];
-
-            wxPrintf(_T("Line %u: \"%s\" (len %u, last char = '%c')\n"),
-                     (unsigned)n, s.c_str(), (unsigned)s.length(), s.Last());
-               }
-       }
-}
-
-#endif // TEST_UNICODE
-

 #ifdef TEST_WCHAR
 
 #include "wx/strconv.h"
 #ifdef TEST_WCHAR
 
 #include "wx/strconv.h"


@@ -4415,7 +3637,7 @@ static void TestUtf8()
 
     }
 
 
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 static void TestEncodingConverter()
 }
 
 static void TestEncodingConverter()


@@ -4438,7 +3660,7 @@ static void TestEncodingConverter()
         wxPrintf(_T("The same KOI8-R string using wxEC: %s\n"), buf);
     }
 
         wxPrintf(_T("The same KOI8-R string using wxEC: %s\n"), buf);
     }
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 #endif // TEST_WCHAR
 }
 
 #endif // TEST_WCHAR


@@ -4459,14 +3681,14 @@ static void TestZipStreamRead()
 {
     wxPuts(_T("*** Testing ZIP reading ***\n"));
 
 {
     wxPuts(_T("*** Testing ZIP reading ***\n"));
 

-    static const wxChar *filename = _T("foo");
+    static const wxString filename = _T("foo");

     wxZipInputStream istr(TESTFILE_ZIP, filename);
     wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
 
     wxZipInputStream istr(TESTFILE_ZIP, filename);
     wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
 

-    wxPrintf(_T("Dumping the file '%s':\n"), filename);
+    wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str());

     while ( !istr.Eof() )
     {
     while ( !istr.Eof() )
     {

-        putchar(istr.GetC());
+        wxPutchar(istr.GetC());

         fflush(stdout);
     }
 
         fflush(stdout);
     }
 


@@ -4529,348 +3751,40 @@ static void TestZipFileSystem()
 #endif // TEST_ZIP
 
 // ----------------------------------------------------------------------------
 #endif // TEST_ZIP
 
 // ----------------------------------------------------------------------------

-// ZLIB stream
+// date time

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#ifdef TEST_ZLIB
+#ifdef TEST_DATETIME

 
 

-#include "wx/zstream.h"
-#include "wx/wfstream.h"
+#include <math.h>

 
 

-static const wxChar *FILENAME_GZ = _T("test.gz");
-static const wxChar *TEST_DATA = _T("hello and hello and hello and hello and hello");
+#include "wx/datetime.h"

 
 

-static void TestZlibStreamWrite()
+// this test miscellaneous static wxDateTime functions
+static void TestTimeStatic()

 {
 {

-    wxPuts(_T("*** Testing Zlib stream reading ***\n"));
+    wxPuts(_T("\n*** wxDateTime static methods test ***"));

 
 

-    wxFileOutputStream fileOutStream(FILENAME_GZ);
-    wxZlibOutputStream ostr(fileOutStream);
-    wxPrintf(_T("Compressing the test string... "));
-    ostr.Write(TEST_DATA, wxStrlen(TEST_DATA) + 1);
-    if ( !ostr )
-    {
-        wxPuts(_T("(ERROR: failed)"));
-    }
-    else
-    {
-        wxPuts(_T("(ok)"));
-    }
+    // some info about the current date
+    int year = wxDateTime::GetCurrentYear();
+    wxPrintf(_T("Current year %d is %sa leap one and has %d days.\n"),
+           year,
+           wxDateTime::IsLeapYear(year) ? "" : "not ",
+           wxDateTime::GetNumberOfDays(year));

 
 

-    wxPuts(_T("\n----- done ------"));
+    wxDateTime::Month month = wxDateTime::GetCurrentMonth();
+    wxPrintf(_T("Current month is '%s' ('%s') and it has %d days\n"),
+           wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
+           wxDateTime::GetMonthName(month).c_str(),
+           wxDateTime::GetNumberOfDays(month));

 }
 
 }
 

-static void TestZlibStreamRead()
+// test time zones stuff
+static void TestTimeZones()

 {
 {

-    wxPuts(_T("*** Testing Zlib stream reading ***\n"));
+    wxPuts(_T("\n*** wxDateTime timezone test ***"));

 
 

-    wxFileInputStream fileInStream(FILENAME_GZ);
-    wxZlibInputStream istr(fileInStream);
-    wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
-
-    wxPuts(_T("Dumping the file:"));
-    while ( !istr.Eof() )
-    {
-        putchar(istr.GetC());
-        fflush(stdout);
-    }
-
-    wxPuts(_T("\n----- done ------"));
-}
-
-#endif // TEST_ZLIB
-
-// ----------------------------------------------------------------------------
-// Gzip streams
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_GZIP
-
-#include "wx/wfstream.h"
-#include "wx/gzstream.h"
-#include "wx/filename.h"
-#include "wx/txtstrm.h"
-
-// Reads two input streams and verifies that they are the same (and non-emtpy)
-//
-void GzipVerify(wxInputStream &in1, wxInputStream &in2)
-{
-    if (!in1 || !in2) {
-        wxPuts(_T("    Can't verify"));
-        return;
-    }
-
-    const int BUFSIZE = 8192;
-    wxCharBuffer buf1(BUFSIZE);
-    wxCharBuffer buf2(BUFSIZE);
-    bool none = true;
-    
-    for (;;) {
-        int n1 = in1.Read(buf1.data(), BUFSIZE).LastRead();
-        int n2 = in2.Read(buf2.data(), BUFSIZE).LastRead();
-
-        if (n1 != n2 || (n1 && memcmp(buf1, buf2, n1) != 0) || (!n1 && none)) {
-            wxPuts(_T("    Failure"));
-            break;
-        }
-
-        if (!n1) {
-            wxPuts(_T("    Success"));
-            break;
-        }
-
-        none = false;
-    }
-
-    while (in1.IsOk())
-        in1.Read(buf1.data(), BUFSIZE);
-    while (in2.IsOk())
-        in2.Read(buf2.data(), BUFSIZE);
-}
-
-// Write a gzip file and read it back.
-//
-void TestGzip()
-{
-    wxPuts(_T("*** Testing gzip streams ***\n"));
-
-    const wxString testname = _T("gziptest");
-    const wxString gzipname = testname + _T(".gz");
-
-    // write some random test data to a testfile
-    wxPuts(_T("Writing random test data to ") + testname + _T("..."));
-    {
-        wxFFileOutputStream outstream(testname);
-        wxTextOutputStream textout(outstream);
-
-        for (int i = 0; i < 1000 && outstream.Ok(); i++)
-            textout << rand() << rand() << rand() << rand() << endl;
-
-        wxPuts(_T("    Done"));
-    }
-
-    wxFileName fn(testname);
-    wxDateTime dt = fn.GetModificationTime();
-    wxFFileInputStream instream(testname);
-
-    // try writing a gzip file
-    wxPuts(_T("Writing ") + gzipname + _T(" using wxGzipOutputStream..."));
-    {
-        wxFFileOutputStream outstream(gzipname);
-        wxGzipOutputStream gzip(outstream, testname, dt);
-
-        if (!gzip.Write(instream))
-            wxPuts(_T("    Failure"));
-        else
-            wxPuts(_T("    Success"));
-    }
-
-    // try reading the gzip file
-    wxPuts(_T("Reading ") + gzipname + _T(" using wxGzipInputStream..."));
-    {
-        instream.SeekI(0);
-        wxFFileInputStream instream2(gzipname);
-        wxGzipInputStream gzip(instream2);
-        GzipVerify(instream, gzip);
-
-        if (gzip.GetName() != fn.GetFullName())
-            wxPuts(gzipname + _T(" contains incorrect filename: ")
-                    + gzip.GetName());
-        if (dt.IsValid() && gzip.GetDateTime() != dt)
-            wxPuts(gzipname + _T(" contains incorrect timestamp: ")
-                    + gzip.GetDateTime().Format());
-    }
-
-#ifdef __UNIX__
-    // then verify it using gzip program if it is in the path
-    wxPuts(_T("Reading ") + gzipname + _T(" using gzip program..."));
-    wxFFile file(popen((_T("gzip -d -c ") + gzipname).mb_str(), "r"));
-    if (file.fp()) {
-        wxFFileInputStream instream2(file);
-        instream.SeekI(0);
-        GzipVerify(instream, instream2);
-        pclose(file.fp());
-        file.Detach();
-    }
-
-    // try reading a gzip created by gzip program
-    wxPuts(_T("Reading output of gzip program using wxGzipInputStream..."));
-    file.Attach(popen((_T("gzip -c ") + testname).mb_str(), "r"));
-    if (file.fp()) {
-        wxFFileInputStream instream2(file);
-        wxGzipInputStream gzip(instream2);
-        instream.SeekI(0);
-        GzipVerify(instream, gzip);
-        pclose(file.fp());
-        file.Detach();
-    }
-#endif
-
-    wxPuts(_T("\n--- Done gzip streams ---"));
-}
-
-#endif // TEST_GZIP
-
-// ----------------------------------------------------------------------------
-// date time
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_DATETIME
-
-#include <math.h>
-
-#include "wx/datetime.h"
-
-// the test data
-struct Date
-{
-    wxDateTime::wxDateTime_t day;
-    wxDateTime::Month month;
-    int year;
-    wxDateTime::wxDateTime_t hour, min, sec;
-    double jdn;
-    wxDateTime::WeekDay wday;
-    time_t gmticks, ticks;
-
-    void Init(const wxDateTime::Tm& tm)
-    {
-        day = tm.mday;
-        month = tm.mon;
-        year = tm.year;
-        hour = tm.hour;
-        min = tm.min;
-        sec = tm.sec;
-        jdn = 0.0;
-        gmticks = ticks = -1;
-    }
-
-    wxDateTime DT() const
-        { return wxDateTime(day, month, year, hour, min, sec); }
-
-    bool SameDay(const wxDateTime::Tm& tm) const
-    {
-        return day == tm.mday && month == tm.mon && year == tm.year;
-    }
-
-    wxString Format() const
-    {
-        wxString s;
-        s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"),
-                 hour, min, sec,
-                 wxDateTime::GetMonthName(month).c_str(),
-                 day,
-                 abs(wxDateTime::ConvertYearToBC(year)),
-                 year > 0 ? _T("AD") : _T("BC"));
-        return s;
-    }
-
-    wxString FormatDate() const
-    {
-        wxString s;
-        s.Printf(_T("%02d-%s-%4d%s"),
-                 day,
-                 wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
-                 abs(wxDateTime::ConvertYearToBC(year)),
-                 year > 0 ? _T("AD") : _T("BC"));
-        return s;
-    }
-};
-
-static const Date testDates[] =
-{
-    {  1, wxDateTime::Jan,  1970, 00, 00, 00, 2440587.5, wxDateTime::Thu,         0,     -3600 },
-    {  7, wxDateTime::Feb,  2036, 00, 00, 00, 2464730.5, wxDateTime::Thu,        -1,        -1 },
-    {  8, wxDateTime::Feb,  2036, 00, 00, 00, 2464731.5, wxDateTime::Fri,        -1,        -1 },
-    {  1, wxDateTime::Jan,  2037, 00, 00, 00, 2465059.5, wxDateTime::Thu,        -1,        -1 },
-    {  1, wxDateTime::Jan,  2038, 00, 00, 00, 2465424.5, wxDateTime::Fri,        -1,        -1 },
-    { 21, wxDateTime::Jan,  2222, 00, 00, 00, 2532648.5, wxDateTime::Mon,        -1,        -1 },
-    { 29, wxDateTime::May,  1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200, 202212000 },
-    { 29, wxDateTime::Feb,  1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000, 194396400 },
-    {  1, wxDateTime::Jan,  1900, 12, 00, 00, 2415021.0, wxDateTime::Mon,        -1,        -1 },
-    {  1, wxDateTime::Jan,  1900, 00, 00, 00, 2415020.5, wxDateTime::Mon,        -1,        -1 },
-    { 15, wxDateTime::Oct,  1582, 00, 00, 00, 2299160.5, wxDateTime::Fri,        -1,        -1 },
-    {  4, wxDateTime::Oct,  1582, 00, 00, 00, 2299149.5, wxDateTime::Mon,        -1,        -1 },
-    {  1, wxDateTime::Mar,     1, 00, 00, 00, 1721484.5, wxDateTime::Thu,        -1,        -1 },
-    {  1, wxDateTime::Jan,     1, 00, 00, 00, 1721425.5, wxDateTime::Mon,        -1,        -1 },
-    { 31, wxDateTime::Dec,     0, 00, 00, 00, 1721424.5, wxDateTime::Sun,        -1,        -1 },
-    {  1, wxDateTime::Jan,     0, 00, 00, 00, 1721059.5, wxDateTime::Sat,        -1,        -1 },
-    { 12, wxDateTime::Aug, -1234, 00, 00, 00, 1270573.5, wxDateTime::Fri,        -1,        -1 },
-    { 12, wxDateTime::Aug, -4000, 00, 00, 00,  260313.5, wxDateTime::Sat,        -1,        -1 },
-    { 24, wxDateTime::Nov, -4713, 00, 00, 00,      -0.5, wxDateTime::Mon,        -1,        -1 },
-};
-
-// this test miscellaneous static wxDateTime functions
-static void TestTimeStatic()
-{
-    wxPuts(_T("\n*** wxDateTime static methods test ***"));
-
-    // some info about the current date
-    int year = wxDateTime::GetCurrentYear();
-    wxPrintf(_T("Current year %d is %sa leap one and has %d days.\n"),
-           year,
-           wxDateTime::IsLeapYear(year) ? "" : "not ",
-           wxDateTime::GetNumberOfDays(year));
-
-    wxDateTime::Month month = wxDateTime::GetCurrentMonth();
-    wxPrintf(_T("Current month is '%s' ('%s') and it has %d days\n"),
-           wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
-           wxDateTime::GetMonthName(month).c_str(),
-           wxDateTime::GetNumberOfDays(month));
-
-    // leap year logic
-    static const size_t nYears = 5;
-    static const size_t years[2][nYears] =
-    {
-        // first line: the years to test
-        { 1990, 1976, 2000, 2030, 1984, },
-
-        // second line: true if leap, false otherwise
-        { false, true, true, false, true }
-    };
-
-    for ( size_t n = 0; n < nYears; n++ )
-    {
-        int year = years[0][n];
-        bool should = years[1][n] != 0,
-             is = wxDateTime::IsLeapYear(year);
-
-        wxPrintf(_T("Year %d is %sa leap year (%s)\n"),
-               year,
-               is ? "" : "not ",
-               should == is ? "ok" : "ERROR");
-
-        wxASSERT( should == wxDateTime::IsLeapYear(year) );
-    }
-}
-
-// test constructing wxDateTime objects
-static void TestTimeSet()
-{
-    wxPuts(_T("\n*** wxDateTime construction test ***"));
-
-    for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
-    {
-        const Date& d1 = testDates[n];
-        wxDateTime dt = d1.DT();
-
-        Date d2;
-        d2.Init(dt.GetTm());
-
-        wxString s1 = d1.Format(),
-                 s2 = d2.Format();
-
-        wxPrintf(_T("Date: %s == %s (%s)\n"),
-                 s1.c_str(), s2.c_str(),
-                 s1 == s2 ? _T("ok") : _T("ERROR"));
-    }
-}
-
-// test time zones stuff
-static void TestTimeZones()
-{
-    wxPuts(_T("\n*** wxDateTime timezone test ***"));
-
-    wxDateTime now = wxDateTime::Now();
+    wxDateTime now = wxDateTime::Now();

 
     wxPrintf(_T("Current GMT time:\t%s\n"), now.Format(_T("%c"), wxDateTime::GMT0).c_str());
     wxPrintf(_T("Unix epoch (GMT):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::GMT0).c_str());
 
     wxPrintf(_T("Current GMT time:\t%s\n"), now.Format(_T("%c"), wxDateTime::GMT0).c_str());
     wxPrintf(_T("Unix epoch (GMT):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::GMT0).c_str());


@@ -4879,6 +3793,8 @@ static void TestTimeZones()
     wxPrintf(_T("               Moscow:\t%s\n"), now.Format(_T("%c"), wxDateTime::MSK).c_str());
     wxPrintf(_T("             New York:\t%s\n"), now.Format(_T("%c"), wxDateTime::EST).c_str());
 
     wxPrintf(_T("               Moscow:\t%s\n"), now.Format(_T("%c"), wxDateTime::MSK).c_str());
     wxPrintf(_T("             New York:\t%s\n"), now.Format(_T("%c"), wxDateTime::EST).c_str());
 

+    wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str());
+

     wxDateTime::Tm tm = now.GetTm();
     if ( wxDateTime(tm) != now )
     {
     wxDateTime::Tm tm = now.GetTm();
     if ( wxDateTime(tm) != now )
     {


@@ -4906,2215 +3822,634 @@ static void TestTimeRange()
              wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
 }
 
              wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
 }
 

-static void TestTimeTicks()
+// test DST calculations
+static void TestTimeDST()

 {
 {

-    wxPuts(_T("\n*** wxDateTime ticks test ***"));
-
-    for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
-    {
-        const Date& d = testDates[n];
-        if ( d.ticks == -1 )
-            continue;
+    wxPuts(_T("\n*** wxDateTime DST test ***"));

 
 

-        wxDateTime dt = d.DT();
-        long ticks = (dt.GetValue() / 1000).ToLong();
-        wxPrintf(_T("Ticks of %s:\t% 10ld"), d.Format().c_str(), ticks);
-        if ( ticks == d.ticks )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"),
-                     (long)d.ticks, (long)(ticks - d.ticks));
-        }
+    wxPrintf(_T("DST is%s in effect now.\n\n"),
+             wxDateTime::Now().IsDST() ? wxEmptyString : _T(" not"));

 
 

-        dt = d.DT().ToTimezone(wxDateTime::GMT0);
-        ticks = (dt.GetValue() / 1000).ToLong();
-        wxPrintf(_T("GMtks of %s:\t% 10ld"), d.Format().c_str(), ticks);
-        if ( ticks == d.gmticks )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"),
-                     (long)d.gmticks, (long)(ticks - d.gmticks));
-        }
+    for ( int year = 1990; year < 2005; year++ )
+    {
+        wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"),
+                 year,
+                 wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(),
+                 wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str());

     }
     }

-
-    wxPuts(_T(""));

 }
 
 }
 

-// test conversions to JDN &c
-static void TestTimeJDN()
+static void TestDateTimeInteractive()

 {
 {

-    wxPuts(_T("\n*** wxDateTime to JDN test ***"));
+    wxPuts(_T("\n*** interactive wxDateTime tests ***"));
+
+    wxChar buf[128];

 
 

-    for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
+    for ( ;; )

     {
     {

-        const Date& d = testDates[n];
-        wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
-        double jdn = dt.GetJulianDayNumber();
+        wxPrintf(_T("Enter a date: "));
+        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
+            break;
+
+        // kill the last '\n'
+        buf[wxStrlen(buf) - 1] = 0;

 
 

-        wxPrintf(_T("JDN of %s is:\t% 15.6f"), d.Format().c_str(), jdn);
-        if ( jdn == d.jdn )
+        wxDateTime dt;
+        const wxChar *p = dt.ParseDate(buf);
+        if ( !p )

         {
         {

-            wxPuts(_T(" (ok)"));
+            wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf);
+
+            continue;

         }
         }

-        else
+        else if ( *p )

         {
         {

-            wxPrintf(_T(" (ERROR: should be %f, delta = %f)\n"),
-                     d.jdn, jdn - d.jdn);
+            wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf);

         }
         }

+
+        wxPrintf(_T("%s: day %u, week of month %u/%u, week of year %u\n"),
+                 dt.Format(_T("%b %d, %Y")).c_str(),
+                 dt.GetDayOfYear(),
+                 dt.GetWeekOfMonth(wxDateTime::Monday_First),
+                 dt.GetWeekOfMonth(wxDateTime::Sunday_First),
+                 dt.GetWeekOfYear(wxDateTime::Monday_First));

     }
     }

+
+    wxPuts(_T("\n*** done ***"));

 }
 
 }
 

-// test week days computation
-static void TestTimeWDays()
+static void TestTimeMS()

 {
 {

-    wxPuts(_T("\n*** wxDateTime weekday test ***"));
-
-    // test GetWeekDay()
-    size_t n;
-    for ( n = 0; n < WXSIZEOF(testDates); n++ )
-    {
-        const Date& d = testDates[n];
-        wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
-
-        wxDateTime::WeekDay wday = dt.GetWeekDay();
-        wxPrintf(_T("%s is: %s"),
-                 d.Format().c_str(),
-                 wxDateTime::GetWeekDayName(wday).c_str());
-        if ( wday == d.wday )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %s)\n"),
-                     wxDateTime::GetWeekDayName(d.wday).c_str());
-        }
-    }
+    wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***"));

 
 

-    wxPuts(_T(""));
+    wxDateTime dt1 = wxDateTime::Now(),
+               dt2 = wxDateTime::UNow();

 
 

-    // test SetToWeekDay()
-    struct WeekDateTestData
+    wxPrintf(_T("Now = %s\n"), dt1.Format(_T("%H:%M:%S:%l")).c_str());
+    wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());
+    wxPrintf(_T("Dummy loop: "));
+    for ( int i = 0; i < 6000; i++ )

     {
     {

-        Date date;                  // the real date (precomputed)
-        int nWeek;                  // its week index in the month
-        wxDateTime::WeekDay wday;   // the weekday
-        wxDateTime::Month month;    // the month
-        int year;                   // and the year
-
-        wxString Format() const
+        //for ( int j = 0; j < 10; j++ )

         {
         {

-            wxString s, which;
-            switch ( nWeek < -1 ? -nWeek : nWeek )
-            {
-                case 1: which = _T("first"); break;
-                case 2: which = _T("second"); break;
-                case 3: which = _T("third"); break;
-                case 4: which = _T("fourth"); break;
-                case 5: which = _T("fifth"); break;
-
-                case -1: which = _T("last"); break;
-            }
-
-            if ( nWeek < -1 )
-            {
-                which += _T(" from end");
-            }
-
-            s.Printf(_T("The %s %s of %s in %d"),
-                     which.c_str(),
-                     wxDateTime::GetWeekDayName(wday).c_str(),
-                     wxDateTime::GetMonthName(month).c_str(),
-                     year);
-
-            return s;
+            wxString s;
+            s.Printf(_T("%g"), sqrt((float)i));

         }
         }

-    };

 
 

-    // the array data was generated by the following python program
-    /*
-from DateTime import *
-from whrandom import *
-from string import *
-
-monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]
-wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ]
+        if ( !(i % 100) )
+            wxPutchar('.');
+    }
+    wxPuts(_T(", done"));

 
 

-week = DateTimeDelta(7)
+    dt1 = dt2;
+    dt2 = wxDateTime::UNow();
+    wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());

 
 

-for n in range(20):
-    year = randint(1900, 2100)
-    month = randint(1, 12)
-    day = randint(1, 28)
-    dt = DateTime(year, month, day)
-    wday = dt.day_of_week
+    wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str());

 
 

-    countFromEnd = choice([-1, 1])
-    weekNum = 0;
+    wxPuts(_T("\n*** done ***"));
+}

 
 

-    while dt.month is month:
-        dt = dt - countFromEnd * week
-        weekNum = weekNum + countFromEnd
+static void TestTimeHolidays()
+{
+    wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n"));

 
 

-    data = { 'day': rjust(`day`, 2), 'month': monthNames[month - 1], 'year': year, 'weekNum': rjust(`weekNum`, 2), 'wday': wdayNames[wday] }
+    wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm();
+    wxDateTime dtStart(1, tm.mon, tm.year),
+               dtEnd = dtStart.GetLastMonthDay();

 
 

-    print "{ { %(day)s, wxDateTime::%(month)s, %(year)d }, %(weekNum)d, "\
-          "wxDateTime::%(wday)s, wxDateTime::%(month)s, %(year)d }," % data
-    */
+    wxDateTimeArray hol;
+    wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);

 
 

-    static const WeekDateTestData weekDatesTestData[] =
-    {
-        { { 20, wxDateTime::Mar, 2045 },  3, wxDateTime::Mon, wxDateTime::Mar, 2045 },
-        { {  5, wxDateTime::Jun, 1985 }, -4, wxDateTime::Wed, wxDateTime::Jun, 1985 },
-        { { 12, wxDateTime::Nov, 1961 }, -3, wxDateTime::Sun, wxDateTime::Nov, 1961 },
-        { { 27, wxDateTime::Feb, 2093 }, -1, wxDateTime::Fri, wxDateTime::Feb, 2093 },
-        { {  4, wxDateTime::Jul, 2070 }, -4, wxDateTime::Fri, wxDateTime::Jul, 2070 },
-        { {  2, wxDateTime::Apr, 1906 }, -5, wxDateTime::Mon, wxDateTime::Apr, 1906 },
-        { { 19, wxDateTime::Jul, 2023 }, -2, wxDateTime::Wed, wxDateTime::Jul, 2023 },
-        { {  5, wxDateTime::May, 1958 }, -4, wxDateTime::Mon, wxDateTime::May, 1958 },
-        { { 11, wxDateTime::Aug, 1900 },  2, wxDateTime::Sat, wxDateTime::Aug, 1900 },
-        { { 14, wxDateTime::Feb, 1945 },  2, wxDateTime::Wed, wxDateTime::Feb, 1945 },
-        { { 25, wxDateTime::Jul, 1967 }, -1, wxDateTime::Tue, wxDateTime::Jul, 1967 },
-        { {  9, wxDateTime::May, 1916 }, -4, wxDateTime::Tue, wxDateTime::May, 1916 },
-        { { 20, wxDateTime::Jun, 1927 },  3, wxDateTime::Mon, wxDateTime::Jun, 1927 },
-        { {  2, wxDateTime::Aug, 2000 },  1, wxDateTime::Wed, wxDateTime::Aug, 2000 },
-        { { 20, wxDateTime::Apr, 2044 },  3, wxDateTime::Wed, wxDateTime::Apr, 2044 },
-        { { 20, wxDateTime::Feb, 1932 }, -2, wxDateTime::Sat, wxDateTime::Feb, 1932 },
-        { { 25, wxDateTime::Jul, 2069 },  4, wxDateTime::Thu, wxDateTime::Jul, 2069 },
-        { {  3, wxDateTime::Apr, 1925 },  1, wxDateTime::Fri, wxDateTime::Apr, 1925 },
-        { { 21, wxDateTime::Mar, 2093 },  3, wxDateTime::Sat, wxDateTime::Mar, 2093 },
-        { {  3, wxDateTime::Dec, 2074 }, -5, wxDateTime::Mon, wxDateTime::Dec, 2074 },
-    };
+    const wxChar *format = _T("%d-%b-%Y (%a)");

 
 

-    static const wxChar *fmt = _T("%d-%b-%Y");
+    wxPrintf(_T("All holidays between %s and %s:\n"),
+           dtStart.Format(format).c_str(), dtEnd.Format(format).c_str());

 
 

-    wxDateTime dt;
-    for ( n = 0; n < WXSIZEOF(weekDatesTestData); n++ )
+    size_t count = hol.GetCount();
+    for ( size_t n = 0; n < count; n++ )

     {
     {

-        const WeekDateTestData& wd = weekDatesTestData[n];
-
-        dt.SetToWeekDay(wd.wday, wd.nWeek, wd.month, wd.year);
-
-        wxPrintf(_T("%s is %s"), wd.Format().c_str(), dt.Format(fmt).c_str());
-
-        const Date& d = wd.date;
-        if ( d.SameDay(dt.GetTm()) )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            dt.Set(d.day, d.month, d.year);
-
-            wxPrintf(_T(" (ERROR: should be %s)\n"), dt.Format(fmt).c_str());
-        }
+        wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str());

     }
     }

+
+    wxPuts(wxEmptyString);

 }
 
 }
 

-// test the computation of (ISO) week numbers
-static void TestTimeWNumber()
+static void TestTimeZoneBug()

 {
 {

-    wxPuts(_T("\n*** wxDateTime week number test ***"));
+    wxPuts(_T("\n*** testing for DST/timezone bug ***\n"));

 
 

-    struct WeekNumberTestData
+    wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000);
+    for ( int i = 0; i < 31; i++ )

     {
     {

-        Date date;                          // the date
-        wxDateTime::wxDateTime_t week;      // the week number in the year
-        wxDateTime::wxDateTime_t wmon;      // the week number in the month
-        wxDateTime::wxDateTime_t wmon2;     // same but week starts with Sun
-        wxDateTime::wxDateTime_t dnum;      // day number in the year
-    };
-
-    // data generated with the following python script:
-    /*
-from DateTime import *
-from whrandom import *
-from string import *
-
-monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]
-wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ]
-
-def GetMonthWeek(dt):
-    weekNumMonth = dt.iso_week[1] - DateTime(dt.year, dt.month, 1).iso_week[1] + 1
-    if weekNumMonth < 0:
-        weekNumMonth = weekNumMonth + 53
-    return weekNumMonth
-
-def GetLastSundayBefore(dt):
-    if dt.iso_week[2] == 7:
-        return dt
-    else:
-        return dt - DateTimeDelta(dt.iso_week[2])
-
-for n in range(20):
-    year = randint(1900, 2100)
-    month = randint(1, 12)
-    day = randint(1, 28)
-    dt = DateTime(year, month, day)
-    dayNum = dt.day_of_year
-    weekNum = dt.iso_week[1]
-    weekNumMonth = GetMonthWeek(dt)
-
-    weekNumMonth2 = 0
-    dtSunday = GetLastSundayBefore(dt)
-
-    while dtSunday >= GetLastSundayBefore(DateTime(dt.year, dt.month, 1)):
-        weekNumMonth2 = weekNumMonth2 + 1
-        dtSunday = dtSunday - DateTimeDelta(7)
-
-    data = { 'day': rjust(`day`, 2), \
-             'month': monthNames[month - 1], \
-             'year': year, \
-             'weekNum': rjust(`weekNum`, 2), \
-             'weekNumMonth': weekNumMonth, \
-             'weekNumMonth2': weekNumMonth2, \
-             'dayNum': rjust(`dayNum`, 3) }
-
-    print "        { { %(day)s, "\
-          "wxDateTime::%(month)s, "\
-          "%(year)d }, "\
-          "%(weekNum)s, "\
-          "%(weekNumMonth)s, "\
-          "%(weekNumMonth2)s, "\
-          "%(dayNum)s }," % data
-
-    */
-    static const WeekNumberTestData weekNumberTestDates[] =
-    {
-        { { 27, wxDateTime::Dec, 1966 }, 52, 5, 5, 361 },
-        { { 22, wxDateTime::Jul, 1926 }, 29, 4, 4, 203 },
-        { { 22, wxDateTime::Oct, 2076 }, 43, 4, 4, 296 },
-        { {  1, wxDateTime::Jul, 1967 }, 26, 1, 1, 182 },
-        { {  8, wxDateTime::Nov, 2004 }, 46, 2, 2, 313 },
-        { { 21, wxDateTime::Mar, 1920 }, 12, 3, 4,  81 },
-        { {  7, wxDateTime::Jan, 1965 },  1, 2, 2,   7 },
-        { { 19, wxDateTime::Oct, 1999 }, 42, 4, 4, 292 },
-        { { 13, wxDateTime::Aug, 1955 }, 32, 2, 2, 225 },
-        { { 18, wxDateTime::Jul, 2087 }, 29, 3, 3, 199 },
-        { {  2, wxDateTime::Sep, 2028 }, 35, 1, 1, 246 },
-        { { 28, wxDateTime::Jul, 1945 }, 30, 5, 4, 209 },
-        { { 15, wxDateTime::Jun, 1901 }, 24, 3, 3, 166 },
-        { { 10, wxDateTime::Oct, 1939 }, 41, 3, 2, 283 },
-        { {  3, wxDateTime::Dec, 1965 }, 48, 1, 1, 337 },
-        { { 23, wxDateTime::Feb, 1940 },  8, 4, 4,  54 },
-        { {  2, wxDateTime::Jan, 1987 },  1, 1, 1,   2 },
-        { { 11, wxDateTime::Aug, 2079 }, 32, 2, 2, 223 },
-        { {  2, wxDateTime::Feb, 2063 },  5, 1, 1,  33 },
-        { { 16, wxDateTime::Oct, 1942 }, 42, 3, 3, 289 },
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
-    {
-        const WeekNumberTestData& wn = weekNumberTestDates[n];
-        const Date& d = wn.date;
-
-        wxDateTime dt = d.DT();
-
-        wxDateTime::wxDateTime_t
-            week = dt.GetWeekOfYear(wxDateTime::Monday_First),
-            wmon = dt.GetWeekOfMonth(wxDateTime::Monday_First),
-            wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
-            dnum = dt.GetDayOfYear();
-
-        wxPrintf(_T("%s: the day number is %d"), d.FormatDate().c_str(), dnum);
-        if ( dnum == wn.dnum )
-        {
-            wxPrintf(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %d)"), wn.dnum);
-        }
-
-        wxPrintf(_T(", week in month = %d"), wmon);
-        if ( wmon != wn.wmon )
-        {
-            wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon);
-        }
-
-        wxPrintf(_T(" or %d"), wmon2);
-        if ( wmon2 == wn.wmon2 )
-        {
-            wxPrintf(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon2);
-        }
-
-        wxPrintf(_T(", week in year = %d"), week);
-        if ( week != wn.week )
-        {
-            wxPrintf(_T(" (ERROR: should be %d)"), wn.week);
-        }
-
-        wxPutchar(_T('\n'));
-
-        wxDateTime dt2(1, wxDateTime::Jan, d.year);
-        dt2.SetToTheWeek(wn.week, dt.GetWeekDay());
-        if ( dt2 != dt )
-        {
-            Date d2;
-            d2.Init(dt2.GetTm());
-            wxPrintf(_T("ERROR: SetToTheWeek() returned %s\n"),
-                     d2.FormatDate().c_str());
-        }
-    }
-}
-
-// test DST calculations
-static void TestTimeDST()
-{
-    wxPuts(_T("\n*** wxDateTime DST test ***"));
-
-    wxPrintf(_T("DST is%s in effect now.\n\n"),
-             wxDateTime::Now().IsDST() ? _T("") : _T(" not"));
-
-    // taken from http://www.energy.ca.gov/daylightsaving.html
-    static const Date datesDST[2][2004 - 1900 + 1] =
-    {
-        {
-            { 1, wxDateTime::Apr, 1990 },
-            { 7, wxDateTime::Apr, 1991 },
-            { 5, wxDateTime::Apr, 1992 },
-            { 4, wxDateTime::Apr, 1993 },
-            { 3, wxDateTime::Apr, 1994 },
-            { 2, wxDateTime::Apr, 1995 },
-            { 7, wxDateTime::Apr, 1996 },
-            { 6, wxDateTime::Apr, 1997 },
-            { 5, wxDateTime::Apr, 1998 },
-            { 4, wxDateTime::Apr, 1999 },
-            { 2, wxDateTime::Apr, 2000 },
-            { 1, wxDateTime::Apr, 2001 },
-            { 7, wxDateTime::Apr, 2002 },
-            { 6, wxDateTime::Apr, 2003 },
-            { 4, wxDateTime::Apr, 2004 },
-        },
-        {
-            { 28, wxDateTime::Oct, 1990 },
-            { 27, wxDateTime::Oct, 1991 },
-            { 25, wxDateTime::Oct, 1992 },
-            { 31, wxDateTime::Oct, 1993 },
-            { 30, wxDateTime::Oct, 1994 },
-            { 29, wxDateTime::Oct, 1995 },
-            { 27, wxDateTime::Oct, 1996 },
-            { 26, wxDateTime::Oct, 1997 },
-            { 25, wxDateTime::Oct, 1998 },
-            { 31, wxDateTime::Oct, 1999 },
-            { 29, wxDateTime::Oct, 2000 },
-            { 28, wxDateTime::Oct, 2001 },
-            { 27, wxDateTime::Oct, 2002 },
-            { 26, wxDateTime::Oct, 2003 },
-            { 31, wxDateTime::Oct, 2004 },
-        }
-    };
-
-    int year;
-    for ( year = 1990; year < 2005; year++ )
-    {
-        wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
-                   dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
-
-        wxPrintf(_T("DST period in the US for year %d: from %s to %s"),
-                 year, dtBegin.Format().c_str(), dtEnd.Format().c_str());
-
-        size_t n = year - 1990;
-        const Date& dBegin = datesDST[0][n];
-        const Date& dEnd = datesDST[1][n];
-
-        if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %s %d to %s %d)\n"),
-                     wxDateTime::GetMonthName(dBegin.month).c_str(), dBegin.day,
-                     wxDateTime::GetMonthName(dEnd.month).c_str(), dEnd.day);
-        }
-    }
-
-    wxPuts(_T(""));
+        wxPrintf(_T("Date %s: week day %s.\n"),
+               date.Format(_T("%d-%m-%Y")).c_str(),
+               date.GetWeekDayName(date.GetWeekDay()).c_str());

 
 

-    for ( year = 1990; year < 2005; year++ )
-    {
-        wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"),
-                 year,
-                 wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(),
-                 wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str());
+        date += wxDateSpan::Day();

     }
     }

-}
-
-// test wxDateTime -> text conversion
-static void TestTimeFormat()
-{
-    wxPuts(_T("\n*** wxDateTime formatting test ***"));
-
-    // some information may be lost during conversion, so store what kind
-    // of info should we recover after a round trip
-    enum CompareKind
-    {
-        CompareNone,        // don't try comparing
-        CompareBoth,        // dates and times should be identical
-        CompareDate,        // dates only
-        CompareTime         // time only
-    };
-
-    static const struct
-    {
-        CompareKind compareKind;
-        const wxChar *format;
-    } formatTestFormats[] =
-    {
-       { CompareBoth, _T("---> %c") },
-       { CompareDate, _T("Date is %A, %d of %B, in year %Y") },
-       { CompareBoth, _T("Date is %x, time is %X") },
-       { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") },
-       { CompareNone, _T("The day of year: %j, the week of year: %W") },
-       { CompareDate, _T("ISO date without separators: %Y%m%d") },
-    };
-
-    static const Date formatTestDates[] =
-    {
-        { 29, wxDateTime::May, 1976, 18, 30, 00 },
-        { 31, wxDateTime::Dec, 1999, 23, 30, 00 },
-#if 0
-        // this test can't work for other centuries because it uses two digit
-        // years in formats, so don't even try it
-        { 29, wxDateTime::May, 2076, 18, 30, 00 },
-        { 29, wxDateTime::Feb, 2400, 02, 15, 25 },
-        { 01, wxDateTime::Jan,  -52, 03, 16, 47 },
-#endif
-    };
-
-    // an extra test (as it doesn't depend on date, don't do it in the loop)
-    wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str());
-
-    for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ )
-    {
-        wxPuts(_T(""));
-
-        wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT();
-        for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
-        {
-            wxString s = dt.Format(formatTestFormats[n].format);
-            wxPrintf(_T("%s"), s.c_str());
-
-            // what can we recover?
-            int kind = formatTestFormats[n].compareKind;
-
-            // convert back
-            wxDateTime dt2;
-            const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format);
-            if ( !result )
-            {
-                // converion failed - should it have?
-                if ( kind == CompareNone )
-                    wxPuts(_T(" (ok)"));
-                else
-                    wxPuts(_T(" (ERROR: conversion back failed)"));
-            }
-            else if ( *result )
-            {
-                // should have parsed the entire string
-                wxPuts(_T(" (ERROR: conversion back stopped too soon)"));
-            }
-            else
-            {
-                bool equal = false; // suppress compilaer warning
-                switch ( kind )
-                {
-                    case CompareBoth:
-                        equal = dt2 == dt;
-                        break;
-
-                    case CompareDate:
-                        equal = dt.IsSameDate(dt2);
-                        break;

 
 

-                    case CompareTime:
-                        equal = dt.IsSameTime(dt2);
-                        break;
-                }
-
-                if ( !equal )
-                {
-                    wxPrintf(_T(" (ERROR: got back '%s' instead of '%s')\n"),
-                           dt2.Format().c_str(), dt.Format().c_str());
-                }
-                else
-                {
-                    wxPuts(_T(" (ok)"));
-                }
-            }
-        }
-    }
+    wxPuts(wxEmptyString);

 }
 
 }
 

-// test text -> wxDateTime conversion
-static void TestTimeParse()
+static void TestTimeSpanFormat()

 {
 {

-    wxPuts(_T("\n*** wxDateTime parse test ***"));
-
-    struct ParseTestData
-    {
-        const wxChar *format;
-        Date date;
-        bool good;
-    };
+    wxPuts(_T("\n*** wxTimeSpan tests ***"));

 
 

-    static const ParseTestData parseTestDates[] =
+    static const wxChar *formats[] =

     {
     {

-        { _T("Sat, 18 Dec 1999 00:46:40 +0100"), { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, true },
-        { _T("Wed, 1 Dec 1999 05:17:20 +0300"),  {  1, wxDateTime::Dec, 1999, 03, 17, 20 }, true },
+        _T("(default) %H:%M:%S"),
+        _T("%E weeks and %D days"),
+        _T("%l milliseconds"),
+        _T("(with ms) %H:%M:%S:%l"),
+        _T("100%% of minutes is %M"),       // test "%%"
+        _T("%D days and %H hours"),
+        _T("or also %S seconds"),

     };
 
     };
 

-    for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
-    {
-        const wxChar *format = parseTestDates[n].format;
-
-        wxPrintf(_T("%s => "), format);
-
-        wxDateTime dt;
-        if ( dt.ParseRfc822Date(format) )
-        {
-            wxPrintf(_T("%s "), dt.Format().c_str());
-
-            if ( parseTestDates[n].good )
-            {
-                wxDateTime dtReal = parseTestDates[n].date.DT();
-                if ( dt == dtReal )
-                {
-                    wxPuts(_T("(ok)"));
-                }
-                else
-                {
-                    wxPrintf(_T("(ERROR: should be %s)\n"), dtReal.Format().c_str());
-                }
-            }
-            else
-            {
-                wxPuts(_T("(ERROR: bad format)"));
-            }
-        }
-        else
-        {
-            wxPrintf(_T("bad format (%s)\n"),
-                   parseTestDates[n].good ? "ERROR" : "ok");
-        }
-    }
-}
-
-static void TestDateTimeInteractive()
-{
-    wxPuts(_T("\n*** interactive wxDateTime tests ***"));
-
-    wxChar buf[128];
-
-    for ( ;; )
-    {
-        wxPrintf(_T("Enter a date: "));
-        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
-            break;
-
-        // kill the last '\n'
-        buf[wxStrlen(buf) - 1] = 0;
-
-        wxDateTime dt;
-        const wxChar *p = dt.ParseDate(buf);
-        if ( !p )
-        {
-            wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf);
-
-            continue;
-        }
-        else if ( *p )
-        {
-            wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf);
-        }
-
-        wxPrintf(_T("%s: day %u, week of month %u/%u, week of year %u\n"),
-                 dt.Format(_T("%b %d, %Y")).c_str(),
-                 dt.GetDayOfYear(),
-                 dt.GetWeekOfMonth(wxDateTime::Monday_First),
-                 dt.GetWeekOfMonth(wxDateTime::Sunday_First),
-                 dt.GetWeekOfYear(wxDateTime::Monday_First));
-    }
-
-    wxPuts(_T("\n*** done ***"));
-}
-
-static void TestTimeMS()
-{
-    wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***"));
-
-    wxDateTime dt1 = wxDateTime::Now(),
-               dt2 = wxDateTime::UNow();
-
-    wxPrintf(_T("Now = %s\n"), dt1.Format(_T("%H:%M:%S:%l")).c_str());
-    wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());
-    wxPrintf(_T("Dummy loop: "));
-    for ( int i = 0; i < 6000; i++ )
+    wxTimeSpan ts1(1, 2, 3, 4),
+                ts2(111, 222, 333);
+    for ( size_t n = 0; n < WXSIZEOF(formats); n++ )

     {
     {

-        //for ( int j = 0; j < 10; j++ )
-        {
-            wxString s;
-            s.Printf(_T("%g"), sqrt(i));
-        }
-
-        if ( !(i % 100) )
-            putchar('.');
+        wxPrintf(_T("ts1 = %s\tts2 = %s\n"),
+               ts1.Format(formats[n]).c_str(),
+               ts2.Format(formats[n]).c_str());

     }
     }

-    wxPuts(_T(", done"));
-
-    dt1 = dt2;
-    dt2 = wxDateTime::UNow();
-    wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());
-
-    wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str());

 
 

-    wxPuts(_T("\n*** done ***"));
+    wxPuts(wxEmptyString);

 }
 
 }
 

-static void TestTimeArithmetics()
-{
-    wxPuts(_T("\n*** testing arithmetic operations on wxDateTime ***"));
-
-    static const struct ArithmData
-    {
-        ArithmData(const wxDateSpan& sp, const wxChar *nam)
-            : span(sp), name(nam) { }
-
-        wxDateSpan span;
-        const wxChar *name;
-    } testArithmData[] =
-    {
-        ArithmData(wxDateSpan::Day(), _T("day")),
-        ArithmData(wxDateSpan::Week(), _T("week")),
-        ArithmData(wxDateSpan::Month(), _T("month")),
-        ArithmData(wxDateSpan::Year(), _T("year")),
-        ArithmData(wxDateSpan(1, 2, 3, 4), _T("year, 2 months, 3 weeks, 4 days")),
-    };
-
-    wxDateTime dt(29, wxDateTime::Dec, 1999), dt1, dt2;
-
-    for ( size_t n = 0; n < WXSIZEOF(testArithmData); n++ )
-    {
-        wxDateSpan span = testArithmData[n].span;
-        dt1 = dt + span;
-        dt2 = dt - span;
-
-        const wxChar *name = testArithmData[n].name;
-        wxPrintf(_T("%s + %s = %s, %s - %s = %s\n"),
-               dt.FormatISODate().c_str(), name, dt1.FormatISODate().c_str(),
-               dt.FormatISODate().c_str(), name, dt2.FormatISODate().c_str());
-
-        wxPrintf(_T("Going back: %s"), (dt1 - span).FormatISODate().c_str());
-        if ( dt1 - span == dt )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str());
-        }
+#endif // TEST_DATETIME

 
 

-        wxPrintf(_T("Going forward: %s"), (dt2 + span).FormatISODate().c_str());
-        if ( dt2 + span == dt )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str());
-        }
+// ----------------------------------------------------------------------------
+// wxTextInput/OutputStream
+// ----------------------------------------------------------------------------

 
 

-        wxPrintf(_T("Double increment: %s"), (dt2 + 2*span).FormatISODate().c_str());
-        if ( dt2 + 2*span == dt1 )
-        {
-            wxPuts(_T(" (ok)"));
-        }
-        else
-        {
-            wxPrintf(_T(" (ERROR: should be %s)\n"), dt2.FormatISODate().c_str());
-        }
+#ifdef TEST_TEXTSTREAM

 
 

-        wxPuts(_T(""));
-    }
-}
+#include "wx/txtstrm.h"
+#include "wx/wfstream.h"

 
 

-static void TestTimeHolidays()
-{
-    wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n"));
-
-    wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm();
-    wxDateTime dtStart(1, tm.mon, tm.year),
-               dtEnd = dtStart.GetLastMonthDay();
-
-    wxDateTimeArray hol;
-    wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);
-
-    const wxChar *format = _T("%d-%b-%Y (%a)");
-
-    wxPrintf(_T("All holidays between %s and %s:\n"),
-           dtStart.Format(format).c_str(), dtEnd.Format(format).c_str());
-
-    size_t count = hol.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str());
-    }
-
-    wxPuts(_T(""));
-}
-
-static void TestTimeZoneBug()
-{
-    wxPuts(_T("\n*** testing for DST/timezone bug ***\n"));
-
-    wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000);
-    for ( int i = 0; i < 31; i++ )
-    {
-        wxPrintf(_T("Date %s: week day %s.\n"),
-               date.Format(_T("%d-%m-%Y")).c_str(),
-               date.GetWeekDayName(date.GetWeekDay()).c_str());
-
-        date += wxDateSpan::Day();
-    }
-
-    wxPuts(_T(""));
-}
-
-static void TestTimeSpanFormat()
-{
-    wxPuts(_T("\n*** wxTimeSpan tests ***"));
-
-    static const wxChar *formats[] =
-    {
-        _T("(default) %H:%M:%S"),
-        _T("%E weeks and %D days"),
-        _T("%l milliseconds"),
-        _T("(with ms) %H:%M:%S:%l"),
-        _T("100%% of minutes is %M"),       // test "%%"
-        _T("%D days and %H hours"),
-        _T("or also %S seconds"),
-    };
-
-    wxTimeSpan ts1(1, 2, 3, 4),
-                ts2(111, 222, 333);
-    for ( size_t n = 0; n < WXSIZEOF(formats); n++ )
-    {
-        wxPrintf(_T("ts1 = %s\tts2 = %s\n"),
-               ts1.Format(formats[n]).c_str(),
-               ts2.Format(formats[n]).c_str());
-    }
-
-    wxPuts(_T(""));
-}
-
-#endif // TEST_DATETIME
-
-// ----------------------------------------------------------------------------
-// wxTextInput/OutputStream
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_TEXTSTREAM
-
-#include "wx/txtstrm.h"
-#include "wx/wfstream.h"
-
-static void TestTextInputStream()
+static void TestTextInputStream()

 {
     wxPuts(_T("\n*** wxTextInputStream test ***"));
 
 {
     wxPuts(_T("\n*** wxTextInputStream test ***"));
 

-    wxFileInputStream fsIn(_T("testdata.fc"));
-    if ( !fsIn.Ok() )
-    {
-        wxPuts(_T("ERROR: couldn't open file."));
-    }
-    else
-    {
-        wxTextInputStream tis(fsIn);
-
-        size_t line = 1;
-        for ( ;; )
-        {
-            const wxString s = tis.ReadLine();
-
-            // line could be non empty if the last line of the file isn't
-            // terminated with EOL
-            if ( fsIn.Eof() && s.empty() )
-                break;
-
-            wxPrintf(_T("Line %d: %s\n"), line++, s.c_str());
-        }
-    }
-}
-
-#endif // TEST_TEXTSTREAM
-
-// ----------------------------------------------------------------------------
-// threads
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_THREADS
-
-#include "wx/thread.h"
-
-static size_t gs_counter = (size_t)-1;
-static wxCriticalSection gs_critsect;
-static wxSemaphore gs_cond;
-
-class MyJoinableThread : public wxThread
-{
-public:
-    MyJoinableThread(size_t n) : wxThread(wxTHREAD_JOINABLE)
-        { m_n = n; Create(); }
-
-    // thread execution starts here
-    virtual ExitCode Entry();
-
-private:
-    size_t m_n;
-};
-
-wxThread::ExitCode MyJoinableThread::Entry()
-{
-    unsigned long res = 1;
-    for ( size_t n = 1; n < m_n; n++ )
-    {
-        res *= n;
-
-        // it's a loooong calculation :-)
-        Sleep(100);
-    }
-
-    return (ExitCode)res;
-}
-
-class MyDetachedThread : public wxThread
-{
-public:
-    MyDetachedThread(size_t n, wxChar ch)
-    {
-        m_n = n;
-        m_ch = ch;
-        m_cancelled = false;
-
-        Create();
-    }
-
-    // thread execution starts here
-    virtual ExitCode Entry();
-
-    // and stops here
-    virtual void OnExit();
-
-private:
-    size_t m_n; // number of characters to write
-    wxChar m_ch;  // character to write
-
-    bool m_cancelled;   // false if we exit normally
-};
-
-wxThread::ExitCode MyDetachedThread::Entry()
-{
-    {
-        wxCriticalSectionLocker lock(gs_critsect);
-        if ( gs_counter == (size_t)-1 )
-            gs_counter = 1;
-        else
-            gs_counter++;
-    }
-
-    for ( size_t n = 0; n < m_n; n++ )
-    {
-        if ( TestDestroy() )
-        {
-            m_cancelled = true;
-
-            break;
-        }
-
-        putchar(m_ch);
-        fflush(stdout);
-
-        wxThread::Sleep(100);
-    }
-
-    return 0;
-}
-
-void MyDetachedThread::OnExit()
-{
-    wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId());
-
-    wxCriticalSectionLocker lock(gs_critsect);
-    if ( !--gs_counter && !m_cancelled )
-        gs_cond.Post();
-}
-
-static void TestDetachedThreads()
-{
-    wxPuts(_T("\n*** Testing detached threads ***"));
-
-    static const size_t nThreads = 3;
-    MyDetachedThread *threads[nThreads];
-    size_t n;
-    for ( n = 0; n < nThreads; n++ )
-    {
-        threads[n] = new MyDetachedThread(10, 'A' + n);
-    }
-
-    threads[0]->SetPriority(WXTHREAD_MIN_PRIORITY);
-    threads[1]->SetPriority(WXTHREAD_MAX_PRIORITY);
-
-    for ( n = 0; n < nThreads; n++ )
-    {
-        threads[n]->Run();
-    }
-
-    // wait until all threads terminate
-    gs_cond.Wait();
-
-    wxPuts(_T(""));
-}
-
-static void TestJoinableThreads()
-{
-    wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***"));
-
-    // calc 10! in the background
-    MyJoinableThread thread(10);
-    thread.Run();
-
-    wxPrintf(_T("\nThread terminated with exit code %lu.\n"),
-             (unsigned long)thread.Wait());
-}
-
-static void TestThreadSuspend()
-{
-    wxPuts(_T("\n*** Testing thread suspend/resume functions ***"));
-
-    MyDetachedThread *thread = new MyDetachedThread(15, 'X');
-
-    thread->Run();
-
-    // this is for this demo only, in a real life program we'd use another
-    // condition variable which would be signaled from wxThread::Entry() to
-    // tell us that the thread really started running - but here just wait a
-    // bit and hope that it will be enough (the problem is, of course, that
-    // the thread might still not run when we call Pause() which will result
-    // in an error)
-    wxThread::Sleep(300);
-
-    for ( size_t n = 0; n < 3; n++ )
-    {
-        thread->Pause();
-
-        wxPuts(_T("\nThread suspended"));
-        if ( n > 0 )
-        {
-            // don't sleep but resume immediately the first time
-            wxThread::Sleep(300);
-        }
-        wxPuts(_T("Going to resume the thread"));
-
-        thread->Resume();
-    }
-
-    wxPuts(_T("Waiting until it terminates now"));
-
-    // wait until the thread terminates
-    gs_cond.Wait();
-
-    wxPuts(_T(""));
-}
-
-static void TestThreadDelete()
-{
-    // As above, using Sleep() is only for testing here - we must use some
-    // synchronisation object instead to ensure that the thread is still
-    // running when we delete it - deleting a detached thread which already
-    // terminated will lead to a crash!
-
-    wxPuts(_T("\n*** Testing thread delete function ***"));
-
-    MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');
-
-    thread0->Delete();
-
-    wxPuts(_T("\nDeleted a thread which didn't start to run yet."));
-
-    MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');
-
-    thread1->Run();
-
-    wxThread::Sleep(300);
-
-    thread1->Delete();
-
-    wxPuts(_T("\nDeleted a running thread."));
-
-    MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');
-
-    thread2->Run();
-
-    wxThread::Sleep(300);
-
-    thread2->Pause();
-
-    thread2->Delete();
-
-    wxPuts(_T("\nDeleted a sleeping thread."));
-
-    MyJoinableThread thread3(20);
-    thread3.Run();
-
-    thread3.Delete();
-
-    wxPuts(_T("\nDeleted a joinable thread."));
-
-    MyJoinableThread thread4(2);
-    thread4.Run();
-
-    wxThread::Sleep(300);
-
-    thread4.Delete();
-
-    wxPuts(_T("\nDeleted a joinable thread which already terminated."));
-
-    wxPuts(_T(""));
-}
-
-class MyWaitingThread : public wxThread
-{
-public:
-    MyWaitingThread( wxMutex *mutex, wxCondition *condition )
-    {
-        m_mutex = mutex;
-        m_condition = condition;
-
-        Create();
-    }
-
-    virtual ExitCode Entry()
-    {
-        wxPrintf(_T("Thread %lu has started running.\n"), GetId());
-        fflush(stdout);
-
-        gs_cond.Post();
-
-        wxPrintf(_T("Thread %lu starts to wait...\n"), GetId());
-        fflush(stdout);
-
-        m_mutex->Lock();
-        m_condition->Wait();
-        m_mutex->Unlock();
-
-        wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId());
-        fflush(stdout);
-
-        return 0;
-    }
-
-private:
-    wxMutex *m_mutex;
-    wxCondition *m_condition;
-};
-
-static void TestThreadConditions()
-{
-    wxMutex mutex;
-    wxCondition condition(mutex);
-
-    // otherwise its difficult to understand which log messages pertain to
-    // which condition
-    //wxLogTrace(_T("thread"), _T("Local condition var is %08x, gs_cond = %08x"),
-    //           condition.GetId(), gs_cond.GetId());
-
-    // create and launch threads
-    MyWaitingThread *threads[10];
-
-    size_t n;
-    for ( n = 0; n < WXSIZEOF(threads); n++ )
-    {
-        threads[n] = new MyWaitingThread( &mutex, &condition );
-    }
-
-    for ( n = 0; n < WXSIZEOF(threads); n++ )
-    {
-        threads[n]->Run();
-    }
-
-    // wait until all threads run
-    wxPuts(_T("Main thread is waiting for the other threads to start"));
-    fflush(stdout);
-
-    size_t nRunning = 0;
-    while ( nRunning < WXSIZEOF(threads) )
-    {
-        gs_cond.Wait();
-
-        nRunning++;
-
-        wxPrintf(_T("Main thread: %u already running\n"), nRunning);
-        fflush(stdout);
-    }
-
-    wxPuts(_T("Main thread: all threads started up."));
-    fflush(stdout);
-
-    wxThread::Sleep(500);
-
-#if 1
-    // now wake one of them up
-    wxPrintf(_T("Main thread: about to signal the condition.\n"));
-    fflush(stdout);
-    condition.Signal();
-#endif
-
-    wxThread::Sleep(200);
-
-    // wake all the (remaining) threads up, so that they can exit
-    wxPrintf(_T("Main thread: about to broadcast the condition.\n"));
-    fflush(stdout);
-    condition.Broadcast();
-
-    // give them time to terminate (dirty!)
-    wxThread::Sleep(500);
-}
-
-#include "wx/utils.h"
-
-class MyExecThread : public wxThread
-{
-public:
-    MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE),
-                                            m_command(command)
-    {
-        Create();
-    }
-
-    virtual ExitCode Entry()
-    {
-        return (ExitCode)wxExecute(m_command, wxEXEC_SYNC);
-    }
-
-private:
-    wxString m_command;
-};
-
-static void TestThreadExec()
-{
-    wxPuts(_T("*** Testing wxExecute interaction with threads ***\n"));
-
-    MyExecThread thread(_T("true"));
-    thread.Run();
-
-    wxPrintf(_T("Main program exit code: %ld.\n"),
-             wxExecute(_T("false"), wxEXEC_SYNC));
-
-    wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait());
-}
-
-// semaphore tests
-#include "wx/datetime.h"
-
-class MySemaphoreThread : public wxThread
-{
-public:
-    MySemaphoreThread(int i, wxSemaphore *sem)
-        : wxThread(wxTHREAD_JOINABLE),
-          m_sem(sem),
-          m_i(i)
-    {
-        Create();
-    }
-
-    virtual ExitCode Entry()
-    {
-        wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
-
-        m_sem->Wait();
-
-        wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
-
-        Sleep(1000);
-
-        wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
-
-        m_sem->Post();
-
-        return 0;
-    }
-
-private:
-    wxSemaphore *m_sem;
-    int m_i;
-};
-
-WX_DEFINE_ARRAY(wxThread *, ArrayThreads);
-
-static void TestSemaphore()
-{
-    wxPuts(_T("*** Testing wxSemaphore class. ***"));
-
-    static const int SEM_LIMIT = 3;
-
-    wxSemaphore sem(SEM_LIMIT, SEM_LIMIT);
-    ArrayThreads threads;
-
-    for ( int i = 0; i < 3*SEM_LIMIT; i++ )
+    wxString filename = _T("testdata.fc");
+    wxFileInputStream fsIn(filename);
+    if ( !fsIn.Ok() )

     {
     {

-        threads.Add(new MySemaphoreThread(i, &sem));
-        threads.Last()->Run();
+        wxPuts(_T("ERROR: couldn't open file."));

     }
     }

-
-    for ( size_t n = 0; n < threads.GetCount(); n++ )
+    else

     {
     {

-        threads[n]->Wait();
-        delete threads[n];
+        wxTextInputStream tis(fsIn);
+
+        size_t line = 1;
+        for ( ;; )
+        {
+            const wxString s = tis.ReadLine();
+
+            // line could be non empty if the last line of the file isn't
+            // terminated with EOL
+            if ( fsIn.Eof() && s.empty() )
+                break;
+
+            wxPrintf(_T("Line %d: %s\n"), line++, s.c_str());
+        }

     }
 }
 
     }
 }
 

-#endif // TEST_THREADS
+#endif // TEST_TEXTSTREAM

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// arrays
+// threads

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-#ifdef TEST_ARRAYS
+#ifdef TEST_THREADS

 
 

-#include "wx/dynarray.h"
+#include "wx/thread.h"

 
 

-typedef unsigned short ushort;
+static size_t gs_counter = (size_t)-1;
+static wxCriticalSection gs_critsect;
+static wxSemaphore gs_cond;

 
 

-static int MyStringCompare(wxString* s1, wxString* s2)
+class MyJoinableThread : public wxThread

 {
 {

-    return wxStrcmp(s1->c_str(), s2->c_str());
-}
+public:
+    MyJoinableThread(size_t n) : wxThread(wxTHREAD_JOINABLE)
+        { m_n = n; Create(); }

 
 

-static int MyStringReverseCompare(wxString* s1, wxString* s2)
-{
-    return -wxStrcmp(s1->c_str(), s2->c_str());
-}
+    // thread execution starts here
+    virtual ExitCode Entry();

 
 

+private:
+    size_t m_n;
+};

 
 

-#define DefineCompare(name, T)                                                \
-                                                                              \
-int wxCMPFUNC_CONV name ## CompareValues(T first, T second)                   \
-{                                                                             \
-    return first - second;                                                    \
-}                                                                             \
-                                                                              \
-int wxCMPFUNC_CONV name ## Compare(T* first, T* second)                       \
-{                                                                             \
-    return *first - *second;                                                  \
-}                                                                             \
-                                                                              \
-int wxCMPFUNC_CONV name ## RevCompare(T* first, T* second)                    \
-{                                                                             \
-    return *second - *first;                                                  \
-}                                                                             \
-
-DefineCompare(UShort, ushort);
-DefineCompare(Int, int);
-
-// test compilation of all macros
-WX_DEFINE_ARRAY_SHORT(ushort, wxArrayUShort);
-WX_DEFINE_SORTED_ARRAY_SHORT(ushort, wxSortedArrayUShortNoCmp);
-WX_DEFINE_SORTED_ARRAY_CMP_SHORT(ushort, UShortCompareValues, wxSortedArrayUShort);
-WX_DEFINE_SORTED_ARRAY_CMP_INT(int, IntCompareValues, wxSortedArrayInt);
-
-WX_DECLARE_OBJARRAY(Bar, ArrayBars);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(ArrayBars);
-
-static void PrintArray(const wxChar* name, const wxArrayString& array)
+wxThread::ExitCode MyJoinableThread::Entry()

 {
 {

-    wxPrintf(_T("Dump of the array '%s'\n"), name);
-
-    size_t nCount = array.GetCount();
-    for ( size_t n = 0; n < nCount; n++ )
+    unsigned long res = 1;
+    for ( size_t n = 1; n < m_n; n++ )

     {
     {

-        wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str());
+        res *= n;
+
+        // it's a loooong calculation :-)
+        Sleep(100);

     }
     }

+
+    return (ExitCode)res;

 }
 
 }
 

-static void PrintArray(const wxChar* name, const wxSortedArrayString& array)
+class MyDetachedThread : public wxThread

 {
 {

-    wxPrintf(_T("Dump of the array '%s'\n"), name);
-
-    size_t nCount = array.GetCount();
-    for ( size_t n = 0; n < nCount; n++ )
+public:
+    MyDetachedThread(size_t n, wxChar ch)

     {
     {

-        wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str());
+        m_n = n;
+        m_ch = ch;
+        m_cancelled = false;
+
+        Create();

     }
     }

-}

 
 

-int wxCMPFUNC_CONV StringLenCompare(const wxString& first,
-                                    const wxString& second)
-{
-    return first.length() - second.length();
-}
+    // thread execution starts here
+    virtual ExitCode Entry();

 
 

-#define TestArrayOf(name)                                                     \
-                                                                              \
-static void PrintArray(const wxChar* name, const wxSortedArray##name & array) \
-{                                                                             \
-    wxPrintf(_T("Dump of the array '%s'\n"), name);                           \
-                                                                              \
-    size_t nCount = array.GetCount();                                         \
-    for ( size_t n = 0; n < nCount; n++ )                                     \
-    {                                                                         \
-        wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]);                   \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-static void PrintArray(const wxChar* name, const wxArray##name & array)       \
-{                                                                             \
-    wxPrintf(_T("Dump of the array '%s'\n"), name);                           \
-                                                                              \
-    size_t nCount = array.GetCount();                                         \
-    for ( size_t n = 0; n < nCount; n++ )                                     \
-    {                                                                         \
-        wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]);                   \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-static void TestArrayOf ## name ## s()                                        \
-{                                                                             \
-    wxPrintf(_T("*** Testing wxArray%s ***\n"), #name);                       \
-                                                                              \
-    wxArray##name a;                                                          \
-    a.Add(1);                                                                 \
-    a.Add(17,2);                                                              \
-    a.Add(5,3);                                                               \
-    a.Add(3,4);                                                               \
-                                                                              \
-    wxPuts(_T("Initially:"));                                                 \
-    PrintArray(_T("a"), a);                                                   \
-                                                                              \
-    wxPuts(_T("After sort:"));                                                \
-    a.Sort(name ## Compare);                                                  \
-    PrintArray(_T("a"), a);                                                   \
-                                                                              \
-    wxPuts(_T("After reverse sort:"));                                        \
-    a.Sort(name ## RevCompare);                                               \
-    PrintArray(_T("a"), a);                                                   \
-                                                                              \
-    wxSortedArray##name b;                                                    \
-    b.Add(1);                                                                 \
-    b.Add(17);                                                                \
-    b.Add(5);                                                                 \
-    b.Add(3);                                                                 \
-                                                                              \
-    wxPuts(_T("Sorted array initially:"));                                    \
-    PrintArray(_T("b"), b);                                                       \
-}
+    // and stops here
+    virtual void OnExit();

 
 

-TestArrayOf(UShort);
-TestArrayOf(Int);
+private:
+    size_t m_n; // number of characters to write
+    wxChar m_ch;  // character to write

 
 

-static void TestStlArray()
-{
-    wxPuts(_T("*** Testing std::vector operations ***\n"));
+    bool m_cancelled;   // false if we exit normally
+};

 
 

+wxThread::ExitCode MyDetachedThread::Entry()
+{

     {
     {

-        wxArrayInt list1;
-        wxArrayInt::iterator it, en;
-        wxArrayInt::reverse_iterator rit, ren;
-        int i;
-        for ( i = 0; i < 5; ++i )
-            list1.push_back(i);
+        wxCriticalSectionLocker lock(gs_critsect);
+        if ( gs_counter == (size_t)-1 )
+            gs_counter = 1;
+        else
+            gs_counter++;
+    }

 
 

-        for ( it = list1.begin(), en = list1.end(), i = 0;
-              it != en; ++it, ++i )
-            if ( *it != i )
-                wxPuts(_T("Error in iterator\n"));
+    for ( size_t n = 0; n < m_n; n++ )
+    {
+        if ( TestDestroy() )
+        {
+            m_cancelled = true;

 
 

-        for ( rit = list1.rbegin(), ren = list1.rend(), i = 4;
-              rit != ren; ++rit, --i )
-            if ( *rit != i )
-                wxPuts(_T("Error in reverse_iterator\n"));
+            break;
+        }

 
 

-        if ( *list1.rbegin() != *(list1.end()-1) ||
-             *list1.begin() != *(list1.rend()-1) )
-            wxPuts(_T("Error in iterator/reverse_iterator\n"));
+        wxPutchar(m_ch);
+        fflush(stdout);

 
 

-        it = list1.begin()+1;
-        rit = list1.rbegin()+1;
-        if ( *list1.begin() != *(it-1) ||
-             *list1.rbegin() != *(rit-1) )
-            wxPuts(_T("Error in iterator/reverse_iterator\n"));
+        wxThread::Sleep(100);
+    }

 
 

-        if ( list1.front() != 0 || list1.back() != 4 )
-            wxPuts(_T("Error in front()/back()\n"));
+    return 0;
+}

 
 

-        list1.erase(list1.begin());
-        list1.erase(list1.end()-1);
+void MyDetachedThread::OnExit()
+{
+    wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId());

 
 

-        for ( it = list1.begin(), en = list1.end(), i = 1;
-              it != en; ++it, ++i )
-            if ( *it != i )
-                wxPuts(_T("Error in erase()\n"));
-    }
-    
-    wxPuts(_T("*** Testing std::vector operations finished ***\n"));
+    wxCriticalSectionLocker lock(gs_critsect);
+    if ( !--gs_counter && !m_cancelled )
+        gs_cond.Post();

 }
 
 }
 

-static void TestArrayOfObjects()
+static void TestDetachedThreads()

 {
 {

-    wxPuts(_T("*** Testing wxObjArray ***\n"));
+    wxPuts(_T("\n*** Testing detached threads ***"));

 
 

+    static const size_t nThreads = 3;
+    MyDetachedThread *threads[nThreads];
+    size_t n;
+    for ( n = 0; n < nThreads; n++ )

     {
     {

-        ArrayBars bars;
-        Bar bar(_T("second bar (two copies!)"));
-
-        wxPrintf(_T("Initially: %u objects in the array, %u objects total.\n"),
-               bars.GetCount(), Bar::GetNumber());
+        threads[n] = new MyDetachedThread(10, 'A' + n);
+    }

 
 

-        bars.Add(new Bar(_T("first bar")));
-        bars.Add(bar,2);
+    threads[0]->SetPriority(WXTHREAD_MIN_PRIORITY);
+    threads[1]->SetPriority(WXTHREAD_MAX_PRIORITY);

 
 

-        wxPrintf(_T("Now: %u objects in the array, %u objects total.\n"),
-               bars.GetCount(), Bar::GetNumber());
+    for ( n = 0; n < nThreads; n++ )
+    {
+        threads[n]->Run();
+    }

 
 

-        bars.RemoveAt(1, bars.GetCount() - 1);
+    // wait until all threads terminate
+    gs_cond.Wait();

 
 

-        wxPrintf(_T("After removing all but first element: %u objects in the ")
-                 _T("array, %u objects total.\n"),
-               bars.GetCount(), Bar::GetNumber());
+    wxPuts(wxEmptyString);
+}

 
 

-        bars.Empty();
+static void TestJoinableThreads()
+{
+    wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***"));

 
 

-        wxPrintf(_T("After Empty(): %u objects in the array, %u objects total.\n"),
-               bars.GetCount(), Bar::GetNumber());
-    }
+    // calc 10! in the background
+    MyJoinableThread thread(10);
+    thread.Run();

 
 

-    wxPrintf(_T("Finally: no more objects in the array, %u objects total.\n"),
-           Bar::GetNumber());
+    wxPrintf(_T("\nThread terminated with exit code %lu.\n"),
+             (unsigned long)thread.Wait());

 }
 
 }
 

-#endif // TEST_ARRAYS
+static void TestThreadSuspend()
+{
+    wxPuts(_T("\n*** Testing thread suspend/resume functions ***"));

 
 

-// ----------------------------------------------------------------------------
-// strings
-// ----------------------------------------------------------------------------
+    MyDetachedThread *thread = new MyDetachedThread(15, 'X');

 
 

-#ifdef TEST_STRINGS
+    thread->Run();

 
 

-#include "wx/timer.h"
-#include "wx/tokenzr.h"
+    // this is for this demo only, in a real life program we'd use another
+    // condition variable which would be signaled from wxThread::Entry() to
+    // tell us that the thread really started running - but here just wait a
+    // bit and hope that it will be enough (the problem is, of course, that
+    // the thread might still not run when we call Pause() which will result
+    // in an error)
+    wxThread::Sleep(300);

 
 

-static void TestStringConstruction()
-{
-    wxPuts(_T("*** Testing wxString constructores ***"));
-
-    #define TEST_CTOR(args, res)                                               \
-        {                                                                      \
-            wxString s args ;                                                  \
-            wxPrintf(_T("wxString%s = %s "), #args, s.c_str());                      \
-            if ( s == res )                                                    \
-            {                                                                  \
-                wxPuts(_T("(ok)"));                                                  \
-            }                                                                  \
-            else                                                               \
-            {                                                                  \
-                wxPrintf(_T("(ERROR: should be %s)\n"), res);                        \
-            }                                                                  \
+    for ( size_t n = 0; n < 3; n++ )
+    {
+        thread->Pause();
+
+        wxPuts(_T("\nThread suspended"));
+        if ( n > 0 )
+        {
+            // don't sleep but resume immediately the first time
+            wxThread::Sleep(300);

         }
         }

+        wxPuts(_T("Going to resume the thread"));
+
+        thread->Resume();
+    }

 
 

-    TEST_CTOR((_T('Z'), 4), _T("ZZZZ"));
-    TEST_CTOR((_T("Hello"), 4), _T("Hell"));
-    TEST_CTOR((_T("Hello"), 5), _T("Hello"));
-    // TEST_CTOR((_T("Hello"), 6), _T("Hello")); -- should give assert failure
+    wxPuts(_T("Waiting until it terminates now"));

 
 

-    static const wxChar *s = _T("?really!");
-    const wxChar *start = wxStrchr(s, _T('r'));
-    const wxChar *end = wxStrchr(s, _T('!'));
-    TEST_CTOR((start, end), _T("really"));
+    // wait until the thread terminates
+    gs_cond.Wait();

 
 

-    wxPuts(_T(""));
+    wxPuts(wxEmptyString);

 }
 
 }
 

-static void TestString()
+static void TestThreadDelete()

 {
 {

-    wxStopWatch sw;
+    // As above, using Sleep() is only for testing here - we must use some
+    // synchronisation object instead to ensure that the thread is still
+    // running when we delete it - deleting a detached thread which already
+    // terminated will lead to a crash!

 
 

-    wxString a, b, c;
+    wxPuts(_T("\n*** Testing thread delete function ***"));

 
 

-    a.reserve (128);
-    b.reserve (128);
-    c.reserve (128);
+    MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');

 
 

-    for (int i = 0; i < 1000000; ++i)
-    {
-        a = _T("Hello");
-        b = _T(" world");
-        c = _T("! How'ya doin'?");
-        a += b;
-        a += c;
-        c = _T("Hello world! What's up?");
-        if (c != a)
-            c = _T("Doh!");
-    }
+    thread0->Delete();

 
 

-    wxPrintf(_T("TestString elapsed time: %ld\n"), sw.Time());
-}
+    wxPuts(_T("\nDeleted a thread which didn't start to run yet."));

 
 

-static void TestPChar()
-{
-    wxStopWatch sw;
+    MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');

 
 

-    wxChar a [128];
-    wxChar b [128];
-    wxChar c [128];
+    thread1->Run();

 
 

-    for (int i = 0; i < 1000000; ++i)
-    {
-        wxStrcpy (a, _T("Hello"));
-        wxStrcpy (b, _T(" world"));
-        wxStrcpy (c, _T("! How'ya doin'?"));
-        wxStrcat (a, b);
-        wxStrcat (a, c);
-        wxStrcpy (c, _T("Hello world! What's up?"));
-        if (wxStrcmp (c, a) == 0)
-            wxStrcpy (c, _T("Doh!"));
-    }
+    wxThread::Sleep(300);

 
 

-    wxPrintf(_T("TestPChar elapsed time: %ld\n"), sw.Time());
-}
+    thread1->Delete();

 
 

-static void TestStringSub()
-{
-    wxString s(_T("Hello, world!"));
+    wxPuts(_T("\nDeleted a running thread."));

 
 

-    wxPuts(_T("*** Testing wxString substring extraction ***"));
+    MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');

 
 

-    wxPrintf(_T("String = '%s'\n"), s.c_str());
-    wxPrintf(_T("Left(5) = '%s'\n"), s.Left(5).c_str());
-    wxPrintf(_T("Right(6) = '%s'\n"), s.Right(6).c_str());
-    wxPrintf(_T("Mid(3, 5) = '%s'\n"), s(3, 5).c_str());
-    wxPrintf(_T("Mid(3) = '%s'\n"), s.Mid(3).c_str());
-    wxPrintf(_T("substr(3, 5) = '%s'\n"), s.substr(3, 5).c_str());
-    wxPrintf(_T("substr(3) = '%s'\n"), s.substr(3).c_str());
+    thread2->Run();

 
 

-    static const wxChar *prefixes[] =
-    {
-        _T("Hello"),
-        _T("Hello, "),
-        _T("Hello, world!"),
-        _T("Hello, world!!!"),
-        _T(""),
-        _T("Goodbye"),
-        _T("Hi"),
-    };
+    wxThread::Sleep(300);

 
 

-    for ( size_t n = 0; n < WXSIZEOF(prefixes); n++ )
-    {
-        wxString prefix = prefixes[n], rest;
-        bool rc = s.StartsWith(prefix, &rest);
-        wxPrintf(_T("StartsWith('%s') = %s"), prefix.c_str(), rc ? _T("true") : _T("false"));
-        if ( rc )
-        {
-            wxPrintf(_T(" (the rest is '%s')\n"), rest.c_str());
-        }
-        else
-        {
-            putchar('\n');
-        }
-    }
+    thread2->Pause();

 
 

-    wxPuts(_T(""));
-}
+    thread2->Delete();

 
 

-static void TestStringFormat()
-{
-    wxPuts(_T("*** Testing wxString formatting ***"));
+    wxPuts(_T("\nDeleted a sleeping thread."));

 
 

-    wxString s;
-    s.Printf(_T("%03d"), 18);
+    MyJoinableThread thread3(20);
+    thread3.Run();

 
 

-    wxPrintf(_T("Number 18: %s\n"), wxString::Format(_T("%03d"), 18).c_str());
-    wxPrintf(_T("Number 18: %s\n"), s.c_str());
+    thread3.Delete();

 
 

-    wxPuts(_T(""));
-}
+    wxPuts(_T("\nDeleted a joinable thread."));

 
 

-// returns "not found" for npos, value for all others
-static wxString PosToString(size_t res)
-{
-    wxString s = res == wxString::npos ? wxString(_T("not found"))
-                                       : wxString::Format(_T("%u"), res);
-    return s;
+    MyJoinableThread thread4(2);
+    thread4.Run();
+
+    wxThread::Sleep(300);
+
+    thread4.Delete();
+
+    wxPuts(_T("\nDeleted a joinable thread which already terminated."));
+
+    wxPuts(wxEmptyString);

 }
 
 }
 

-static void TestStringFind()
+class MyWaitingThread : public wxThread

 {
 {

-    wxPuts(_T("*** Testing wxString find() functions ***"));
-
-    static const wxChar *strToFind = _T("ell");
-    static const struct StringFindTest
+public:
+    MyWaitingThread( wxMutex *mutex, wxCondition *condition )

     {
     {

-        const wxChar *str;
-        size_t        start,
-                      result;   // of searching "ell" in str
-    } findTestData[] =
+        m_mutex = mutex;
+        m_condition = condition;
+
+        Create();
+    }
+
+    virtual ExitCode Entry()

     {
     {

-        { _T("Well, hello world"),  0, 1 },
-        { _T("Well, hello world"),  6, 7 },
-        { _T("Well, hello world"),  9, wxString::npos },
-    };
+        wxPrintf(_T("Thread %lu has started running.\n"), GetId());
+        fflush(stdout);
+
+        gs_cond.Post();
+
+        wxPrintf(_T("Thread %lu starts to wait...\n"), GetId());
+        fflush(stdout);

 
 

-    for ( size_t n = 0; n < WXSIZEOF(findTestData); n++ )
-    {
-        const StringFindTest& ft = findTestData[n];
-        size_t res = wxString(ft.str).find(strToFind, ft.start);
+        m_mutex->Lock();
+        m_condition->Wait();
+        m_mutex->Unlock();

 
 

-        wxPrintf(_T("Index of '%s' in '%s' starting from %u is %s "),
-               strToFind, ft.str, ft.start, PosToString(res).c_str());
+        wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId());
+        fflush(stdout);

 
 

-        size_t resTrue = ft.result;
-        if ( res == resTrue )
-        {
-            wxPuts(_T("(ok)"));
-        }
-        else
-        {
-            wxPrintf(_T("(ERROR: should be %s)\n"),
-                   PosToString(resTrue).c_str());
-        }
+        return 0;

     }
 
     }
 

-    wxPuts(_T(""));
-}
+private:
+    wxMutex *m_mutex;
+    wxCondition *m_condition;
+};

 
 

-static void TestStringTokenizer()
+static void TestThreadConditions()

 {
 {

-    wxPuts(_T("*** Testing wxStringTokenizer ***"));
+    wxMutex mutex;
+    wxCondition condition(mutex);

 
 

-    static const wxChar *modeNames[] =
-    {
-        _T("default"),
-        _T("return empty"),
-        _T("return all empty"),
-        _T("with delims"),
-        _T("like strtok"),
-    };
+    // otherwise its difficult to understand which log messages pertain to
+    // which condition
+    //wxLogTrace(_T("thread"), _T("Local condition var is %08x, gs_cond = %08x"),
+    //           condition.GetId(), gs_cond.GetId());

 
 

-    static const struct StringTokenizerTest
-    {
-        const wxChar *str;              // string to tokenize
-        const wxChar *delims;           // delimiters to use
-        size_t        count;            // count of token
-        wxStringTokenizerMode mode;     // how should we tokenize it
-    } tokenizerTestData[] =
-    {
-        { _T(""), _T(" "), 0 },
-        { _T("Hello, world"), _T(" "), 2 },
-        { _T("Hello,   world  "), _T(" "), 2 },
-        { _T("Hello, world"), _T(","), 2 },
-        { _T("Hello, world!"), _T(",!"), 2 },
-        { _T("Hello,, world!"), _T(",!"), 3 },
-        { _T("Hello, world!"), _T(",!"), 3, wxTOKEN_RET_EMPTY_ALL },
-        { _T("username:password:uid:gid:gecos:home:shell"), _T(":"), 7 },
-        { _T("1 \t3\t4  6   "), wxDEFAULT_DELIMITERS, 4 },
-        { _T("1 \t3\t4  6   "), wxDEFAULT_DELIMITERS, 6, wxTOKEN_RET_EMPTY },
-        { _T("1 \t3\t4  6   "), wxDEFAULT_DELIMITERS, 9, wxTOKEN_RET_EMPTY_ALL },
-        { _T("01/02/99"), _T("/-"), 3 },
-        { _T("01-02/99"), _T("/-"), 3, wxTOKEN_RET_DELIMS },
-    };
+    // create and launch threads
+    MyWaitingThread *threads[10];

 
 

-    for ( size_t n = 0; n < WXSIZEOF(tokenizerTestData); n++ )
+    size_t n;
+    for ( n = 0; n < WXSIZEOF(threads); n++ )

     {
     {

-        const StringTokenizerTest& tt = tokenizerTestData[n];
-        wxStringTokenizer tkz(tt.str, tt.delims, tt.mode);
-
-        size_t count = tkz.CountTokens();
-        wxPrintf(_T("String '%s' has %u tokens delimited by '%s' (mode = %s) "),
-               MakePrintable(tt.str).c_str(),
-               count,
-               MakePrintable(tt.delims).c_str(),
-               modeNames[tkz.GetMode()]);
-        if ( count == tt.count )
-        {
-            wxPuts(_T("(ok)"));
-        }
-        else
-        {
-            wxPrintf(_T("(ERROR: should be %u)\n"), tt.count);
+        threads[n] = new MyWaitingThread( &mutex, &condition );
+    }

 
 

-            continue;
-        }
+    for ( n = 0; n < WXSIZEOF(threads); n++ )
+    {
+        threads[n]->Run();
+    }

 
 

-        // if we emulate strtok(), check that we do it correctly
-        wxChar *buf, *s = NULL, *last;
+    // wait until all threads run
+    wxPuts(_T("Main thread is waiting for the other threads to start"));
+    fflush(stdout);

 
 

-        if ( tkz.GetMode() == wxTOKEN_STRTOK )
-        {
-            buf = new wxChar[wxStrlen(tt.str) + 1];
-            wxStrcpy(buf, tt.str);
+    size_t nRunning = 0;
+    while ( nRunning < WXSIZEOF(threads) )
+    {
+        gs_cond.Wait();

 
 

-            s = wxStrtok(buf, tt.delims, &last);
-        }
-        else
-        {
-            buf = NULL;
-        }
+        nRunning++;

 
 

-        // now show the tokens themselves
-        size_t count2 = 0;
-        while ( tkz.HasMoreTokens() )
-        {
-            wxString token = tkz.GetNextToken();
+        wxPrintf(_T("Main thread: %u already running\n"), nRunning);
+        fflush(stdout);
+    }

 
 

-            wxPrintf(_T("\ttoken %u: '%s'"),
-                   ++count2,
-                   MakePrintable(token).c_str());
+    wxPuts(_T("Main thread: all threads started up."));
+    fflush(stdout);

 
 

-            if ( buf )
-            {
-                if ( token == s )
-                {
-                    wxPuts(_T(" (ok)"));
-                }
-                else
-                {
-                    wxPrintf(_T(" (ERROR: should be %s)\n"), s);
-                }
+    wxThread::Sleep(500);

 
 

-                s = wxStrtok(NULL, tt.delims, &last);
-            }
-            else
-            {
-                // nothing to compare with
-                wxPuts(_T(""));
-            }
-        }
+#if 1
+    // now wake one of them up
+    wxPrintf(_T("Main thread: about to signal the condition.\n"));
+    fflush(stdout);
+    condition.Signal();
+#endif

 
 

-        if ( count2 != count )
-        {
-            wxPuts(_T("\tERROR: token count mismatch"));
-        }
+    wxThread::Sleep(200);

 
 

-        delete [] buf;
-    }
+    // wake all the (remaining) threads up, so that they can exit
+    wxPrintf(_T("Main thread: about to broadcast the condition.\n"));
+    fflush(stdout);
+    condition.Broadcast();

 
 

-    wxPuts(_T(""));
+    // give them time to terminate (dirty!)
+    wxThread::Sleep(500);

 }
 
 }
 

-static void TestStringReplace()
-{
-    wxPuts(_T("*** Testing wxString::replace ***"));
+#include "wx/utils.h"

 
 

-    static const struct StringReplaceTestData
-    {
-        const wxChar *original;     // original test string
-        size_t start, len;          // the part to replace
-        const wxChar *replacement;  // the replacement string
-        const wxChar *result;       // and the expected result
-    } stringReplaceTestData[] =
+class MyExecThread : public wxThread
+{
+public:
+    MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE),
+                                            m_command(command)

     {
     {

-        { _T("012-AWORD-XYZ"), 4, 5, _T("BWORD"), _T("012-BWORD-XYZ") },
-        { _T("increase"), 0, 2, _T("de"), _T("decrease") },
-        { _T("wxWindow"), 8, 0, _T("s"), _T("wxWindows") },
-        { _T("foobar"), 3, 0, _T("-"), _T("foo-bar") },
-        { _T("barfoo"), 0, 6, _T("foobar"), _T("foobar") },
-    };
+        Create();
+    }

 
 

-    for ( size_t n = 0; n < WXSIZEOF(stringReplaceTestData); n++ )
+    virtual ExitCode Entry()

     {
     {

-        const StringReplaceTestData data = stringReplaceTestData[n];
-
-        wxString original = data.original;
-        original.replace(data.start, data.len, data.replacement);
-
-        wxPrintf(_T("wxString(\"%s\").replace(%u, %u, %s) = %s "),
-                 data.original, data.start, data.len, data.replacement,
-                 original.c_str());
-
-        if ( original == data.result )
-        {
-            wxPuts(_T("(ok)"));
-        }
-        else
-        {
-            wxPrintf(_T("(ERROR: should be '%s')\n"), data.result);
-        }
+        return (ExitCode)wxExecute(m_command, wxEXEC_SYNC);

     }
 
     }
 

-    wxPuts(_T(""));
-}
+private:
+    wxString m_command;
+};

 
 

-static void TestStringMatch()
+static void TestThreadExec()

 {
 {

-    wxPuts(_T("*** Testing wxString::Matches() ***"));
-
-    static const struct StringMatchTestData
-    {
-        const wxChar *text;
-        const wxChar *wildcard;
-        bool matches;
-    } stringMatchTestData[] =
-    {
-        { _T("foobar"), _T("foo*"), 1 },
-        { _T("foobar"), _T("*oo*"), 1 },
-        { _T("foobar"), _T("*bar"), 1 },
-        { _T("foobar"), _T("??????"), 1 },
-        { _T("foobar"), _T("f??b*"), 1 },
-        { _T("foobar"), _T("f?b*"), 0 },
-        { _T("foobar"), _T("*goo*"), 0 },
-        { _T("foobar"), _T("*foo"), 0 },
-        { _T("foobarfoo"), _T("*foo"), 1 },
-        { _T(""), _T("*"), 1 },
-        { _T(""), _T("?"), 0 },
-    };
+    wxPuts(_T("*** Testing wxExecute interaction with threads ***\n"));

 
 

-    for ( size_t n = 0; n < WXSIZEOF(stringMatchTestData); n++ )
-    {
-        const StringMatchTestData& data = stringMatchTestData[n];
-        bool matches = wxString(data.text).Matches(data.wildcard);
-        wxPrintf(_T("'%s' %s '%s' (%s)\n"),
-                 data.wildcard,
-                 matches ? _T("matches") : _T("doesn't match"),
-                 data.text,
-                 matches == data.matches ? _T("ok") : _T("ERROR"));
-    }
+    MyExecThread thread(_T("true"));
+    thread.Run();

 
 

-    wxPuts(_T(""));
-}
+    wxPrintf(_T("Main program exit code: %ld.\n"),
+             wxExecute(_T("false"), wxEXEC_SYNC));

 
 

-// Sigh, I want Test::Simple, Test::More and Test::Harness...
-void ok(int line, bool ok, const wxString& msg = wxEmptyString)
-{
-    if( !ok )
-        wxPuts(_T("NOT OK: (") + wxString::Format(_T("%d"), line) +
-               _T(") ") + msg);
+    wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait());

 }
 
 }
 

-void is(int line, const wxString& got, const wxString& expected,
-        const wxString& msg = wxEmptyString)
+// semaphore tests
+#include "wx/datetime.h"
+
+class MySemaphoreThread : public wxThread

 {
 {

-    bool isOk = got == expected;
-    ok(line, isOk, msg);
-    if( !isOk )
+public:
+    MySemaphoreThread(int i, wxSemaphore *sem)
+        : wxThread(wxTHREAD_JOINABLE),
+          m_sem(sem),
+          m_i(i)

     {
     {

-        wxPuts(_T("Got: ") + got);
-        wxPuts(_T("Expected: ") + expected);
+        Create();

     }
     }

-}

 
 

-#if 0
-void is(int line, const wxChar* got, const wxChar* expected,
-        const wxString& msg = wxEmptyString)
-{
-    bool isOk = wxStrcmp( got, expected ) == 0;
-    ok(line, isOk, msg);
-    if( !isOk )
+    virtual ExitCode Entry()

     {
     {

-        wxPuts(_T("Got: ") + wxString(got));
-        wxPuts(_T("Expected: ") + wxString(expected));
+        wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
+
+        m_sem->Wait();
+
+        wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
+
+        Sleep(1000);
+
+        wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
+
+        m_sem->Post();
+
+        return 0;

     }
     }

-}
-#endif

 
 

-void is(int line, const wxChar& got, const wxChar& expected,
-        const wxString& msg = wxEmptyString)
+private:
+    wxSemaphore *m_sem;
+    int m_i;
+};
+
+WX_DEFINE_ARRAY_PTR(wxThread *, ArrayThreads);
+
+static void TestSemaphore()

 {
 {

-    bool isOk = got == expected;
-    ok(line, isOk, msg);
-    if( !isOk )
+    wxPuts(_T("*** Testing wxSemaphore class. ***"));
+
+    static const int SEM_LIMIT = 3;
+
+    wxSemaphore sem(SEM_LIMIT, SEM_LIMIT);
+    ArrayThreads threads;
+
+    for ( int i = 0; i < 3*SEM_LIMIT; i++ )

     {
     {

-        wxPuts(_T("Got: ") + got);
-        wxPuts(_T("Expected: ") + expected);
+        threads.Add(new MySemaphoreThread(i, &sem));
+        threads.Last()->Run();

     }
     }

-}

 
 

-void is(int line, size_t got, size_t expected,
-        const wxString& msg = wxEmptyString)
-{
-    bool isOk = got == expected;
-    ok(line, isOk, msg);
-    if( !isOk )
+    for ( size_t n = 0; n < threads.GetCount(); n++ )

     {
     {

-        wxPuts(wxString::Format(_T("Got: %ld"), got));
-        wxPuts(wxString::Format(_T("Expected: %ld"), expected));
+        threads[n]->Wait();
+        delete threads[n];

     }
 }
 
     }
 }
 

-#define is_m( got, expected, message ) is( __LINE__, (got), (expected), (message) )
-#define is_nom( got, expected ) is( __LINE__, (got), (expected), wxEmptyString )
-
-void TestStdString()
-{
-    wxPuts(_T("*** Testing std::string operations ***\n"));
-
-    // test ctors
-    wxString s1(_T("abcdefgh")),
-             s2(_T("abcdefghijklm"), 8),
-             s3(_T("abcdefghijklm")),
-             s4(8, _T('a'));
-    wxString s5(s1),
-             s6(s3, 0, 8),
-             s7(s3.begin(), s3.begin() + 8);
-    wxString s8(s1, 4, 8), s9, s10, s11;
-
-    is( __LINE__, s1, _T("abcdefgh") );
-    is( __LINE__, s2, s1 );
-    is( __LINE__, s4, _T("aaaaaaaa") );
-    is( __LINE__, s5, _T("abcdefgh") );
-    is( __LINE__, s6, s1 );
-    is( __LINE__, s7, s1 );
-    is( __LINE__, s8, _T("efgh") );
-
-    // test append
-    s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc");
-    s1.append(_T("def"));
-    s2.append(_T("defgh"), 3);
-    s3.append(wxString(_T("abcdef")), 3, 6);
-    s4.append(s1);
-    s5.append(3, _T('a'));
-    s6.append(s1.begin() + 3, s1.end());
-
-    is( __LINE__, s1, _T("abcdef") );
-    is( __LINE__, s2, _T("abcdef") );
-    is( __LINE__, s3, _T("abcdef") );
-    is( __LINE__, s4, _T("abcabcdef") );
-    is( __LINE__, s5, _T("abcaaa") );
-    is( __LINE__, s6, _T("abcdef") );
-
-    // test assign
-    s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc");
-    s1.assign(_T("def"));
-    s2.assign(_T("defgh"), 3);
-    s3.assign(wxString(_T("abcdef")), 3, 6);
-    s4.assign(s1);
-    s5.assign(3, _T('a'));
-    s6.assign(s1.begin() + 1, s1.end());
-
-    is( __LINE__, s1, _T("def") );
-    is( __LINE__, s2, _T("def") );
-    is( __LINE__, s3, _T("def") );
-    is( __LINE__, s4, _T("def") );
-    is( __LINE__, s5, _T("aaa") );
-    is( __LINE__, s6, _T("ef") );
-
-    // test compare
-    s1 = _T("abcdefgh");
-    s2 = _T("abcdefgh");
-    s3 = _T("abc");
-    s4 = _T("abcdefghi");
-    s5 = _T("aaa");
-    s6 = _T("zzz");
-    s7 = _T("zabcdefg");
-
-    ok( __LINE__, s1.compare(s2) == 0 );
-    ok( __LINE__, s1.compare(s3) > 0 );
-    ok( __LINE__, s1.compare(s4) < 0 );
-    ok( __LINE__, s1.compare(s5) > 0 );
-    ok( __LINE__, s1.compare(s6) < 0 );
-    ok( __LINE__, s1.compare(1, 12, s1) > 0);
-    ok( __LINE__, s1.compare(_T("abcdefgh")) == 0);
-    ok( __LINE__, s1.compare(1, 7, _T("bcdefgh")) == 0);
-    ok( __LINE__, s1.compare(1, 7, _T("bcdefgh"), 7) == 0);
-
-    // test erase
-    s1.erase(1, 1);
-    s2.erase(4, 12);
-    wxString::iterator it = s3.erase(s3.begin() + 1);
-    wxString::iterator it2 = s4.erase(s4.begin() + 4, s4.begin() + 6);
-    wxString::iterator it3 = s7.erase(s7.begin() + 4, s7.begin() + 8);
-
-    is( __LINE__, s1, _T("acdefgh") );
-    is( __LINE__, s2, _T("abcd") );
-    is( __LINE__, s3, _T("ac") );
-    is( __LINE__, s4, _T("abcdghi") );
-    is( __LINE__, s7, _T("zabc") );
-    is( __LINE__, *it, _T('c') );
-    is( __LINE__, *it2, _T('g') );
-    ok( __LINE__, it3 == s7.end() );
-
-    // find
-    //       0         1         2
-    //       01234567890123456789012345
-    s1 = _T("abcdefgABCDEFGabcABCabcABC");
-    s2 = _T("gAB");
-
-    is_nom( s1.find(_T('A')), 7u );
-    is_nom( s1.find(_T('A'), 7), 7u );
-    is_nom( s1.find(_T('Z')), wxString::npos );
-    is_nom( s1.find(_T('C'), 22), 25u );
-
-    is_nom( s1.find(_T("gAB")), 6u );
-    is_nom( s1.find(_T("gAB"), 7), wxString::npos );
-    is_nom( s1.find(_T("gAB"), 6), 6u );
-
-    is_nom( s1.find(_T("gABZZZ"), 2, 3), 6u );
-    is_nom( s1.find(_T("gABZZZ"), 7, 3), wxString::npos );
-
-    is_nom( s1.find(s2), 6u );
-    is_nom( s1.find(s2, 7), wxString::npos );
-    is_nom( s1.find(s2, 6), 6u );
-
-    // find_first_not_of
-    //       0         1         2         3
-    //       01234567890123456789012345678901234
-    s1 = _T("aaaaaabcdefghlkjiaaaaaabcdbcdbcdbcd");
-    s2 = _T("aaaaaa");
-
-    is_nom( s1.find_first_not_of(_T('a')), 6u );
-    is_nom( s1.find_first_not_of(_T('a'), 7), 7u );
-    is_nom( s2.find_first_not_of(_T('a')), wxString::npos );
-
-    is_nom( s1.find_first_not_of(_T("abde"), 4), 7u );
-    is_nom( s1.find_first_not_of(_T("abde"), 7), 7u );
-    is_nom( s1.find_first_not_of(_T("abcdefghijkl")), wxString::npos );
-
-    is_nom( s1.find_first_not_of(_T("abcdefghi"), 0, 4), 9u );
-
-    // find_first_of
-    is_nom( s1.find_first_of(_T('c')), 7u );
-    is_nom( s1.find_first_of(_T('v')), wxString::npos );
-    is_nom( s1.find_first_of(_T('c'), 10), 24u );
-
-    is_nom( s1.find_first_of(_T("ijkl")), 13u );
-    is_nom( s1.find_first_of(_T("ddcfg"), 17), 24u );
-    is_nom( s1.find_first_of(_T("ddcfga"), 17, 5), 24u );
-
-    // find_last_not_of
-    //       0         1         2         3
-    //       01234567890123456789012345678901234
-    s1 = _T("aaaaaabcdefghlkjiaaaaaabcdbcdbcdbcd");
-    s2 = _T("aaaaaa");
-
-    is_nom( s2.find_last_not_of(_T('a')), wxString::npos );
-    is_nom( s1.find_last_not_of(_T('d')), 33u );
-    is_nom( s1.find_last_not_of(_T('d'), 25), 24u );
-
-    is_nom( s1.find_last_not_of(_T("bcd")), 22u );
-    is_nom( s1.find_last_not_of(_T("abc"), 24), 16u );
-
-    is_nom( s1.find_last_not_of(_T("abcdefghijklmnopqrstuv"), 24, 3), 16u );
-
-    // find_last_of
-    is_nom( s2.find_last_of(_T('c')), wxString::npos );
-    is_nom( s1.find_last_of(_T('a')), 22u );
-    is_nom( s1.find_last_of(_T('b'), 24), 23u );
-
-    is_nom( s1.find_last_of(_T("ijklm")), 16u );
-    is_nom( s1.find_last_of(_T("ijklma"), 33, 4), 16u );
-    is_nom( s1.find_last_of(_T("a"), 17), 17u );
-
-    // test insert
-    s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("aaaa");
-    s9 = s10 = _T("cdefg");
-
-    s1.insert(1, _T("cc") );
-    s2.insert(2, _T("cdef"), 3);
-    s3.insert(2, s10);
-    s4.insert(2, s10, 3, 7);
-    s5.insert(1, 2, _T('c'));
-    it = s6.insert(s6.begin() + 3, _T('X'));
-    s7.insert(s7.begin(), s9.begin(), s9.end() - 1);
-    s8.insert(s8.begin(), 2, _T('c'));
-
-    is( __LINE__, s1, _T("accaaa") );
-    is( __LINE__, s2, _T("aacdeaa") );
-    is( __LINE__, s3, _T("aacdefgaa") );
-    is( __LINE__, s4, _T("aafgaa") );
-    is( __LINE__, s5, _T("accaaa") );
-    is( __LINE__, s6, _T("aaaXa") );
-    is( __LINE__, s7, _T("cdefaaaa") );
-    is( __LINE__, s8, _T("ccaaaa") );
-
-    s1 = s2 = s3 = _T("aaaa");
-    s1.insert(0, _T("ccc"), 2);
-    s2.insert(4, _T("ccc"), 2);
-
-    is( __LINE__, s1, _T("ccaaaa") );
-    is( __LINE__, s2, _T("aaaacc") );
-
-    // test replace
-    s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("QWERTYUIOP");
-    s9 = s10 = _T("werty");
-
-    s1.replace(3, 4, _T("rtyu"));
-    s1.replace(8, 7, _T("opopop"));
-    s2.replace(10, 12, _T("WWWW"));
-    s3.replace(1, 5, s9);
-    s4.replace(1, 4, s9, 0, 4);
-    s5.replace(1, 2, s9, 1, 12);
-    s6.replace(0, 123, s9, 0, 123);
-    s7.replace(2, 7, s9);
-
-    is( __LINE__, s1, _T("QWErtyuIopopop") );
-    is( __LINE__, s2, _T("QWERTYUIOPWWWW") );
-    is( __LINE__, s3, _T("QwertyUIOP") );
-    is( __LINE__, s4, _T("QwertYUIOP") );
-    is( __LINE__, s5, _T("QertyRTYUIOP") );
-    is( __LINE__, s6, s9);
-    is( __LINE__, s7, _T("QWwertyP") );
-
-    // rfind
-    //       0         1         2
-    //       01234567890123456789012345
-    s1 = _T("abcdefgABCDEFGabcABCabcABC");
-    s2 = _T("gAB");
-    s3 = _T("ab");
-
-    is_nom( s1.rfind(_T('A')), 23u );
-    is_nom( s1.rfind(_T('A'), 7), 7u );
-    is_nom( s1.rfind(_T('Z')), wxString::npos );
-    is_nom( s1.rfind(_T('C'), 22), 19u );
-
-    is_nom( s1.rfind(_T("cAB")), 22u );
-    is_nom( s1.rfind(_T("cAB"), 15), wxString::npos );
-    is_nom( s1.rfind(_T("cAB"), 21), 16u );
-
-    is_nom( s1.rfind(_T("gABZZZ"), 7, 3), 6u );
-    is_nom( s1.rfind(_T("gABZZZ"), 5, 3), wxString::npos );
-
-    is_nom( s1.rfind(s2), 6u );
-    is_nom( s1.rfind(s2, 5), wxString::npos );
-    is_nom( s1.rfind(s2, 6), 6u );
-    is_nom( s1.rfind(s3, 1), 0u );
-
-    // resize
-    s1 = s2 = s3 = s4 = _T("abcABCdefDEF");
-
-    s1.resize( 12 );
-    s2.resize( 10 );
-    s3.resize( 14, _T(' ') );
-    s4.resize( 14, _T('W') );
-
-    is_nom( s1, _T("abcABCdefDEF") );
-    is_nom( s2, _T("abcABCdefD") );
-    is_nom( s3, _T("abcABCdefDEF  ") );
-    is_nom( s4, _T("abcABCdefDEFWW") );
-
-    // substr
-    s1 = _T("abcdefgABCDEFG");
-
-    is_nom( s1.substr( 0, 14 ), s1 );
-    is_nom( s1.substr( 1, 13 ), _T("bcdefgABCDEFG") );
-    is_nom( s1.substr( 1, 20 ), _T("bcdefgABCDEFG") );
-    is_nom( s1.substr( 14, 30 ), _T("") );
-
-    wxPuts(_T("*** Testing std::string operations finished ***\n"));
-}
-
-#endif // TEST_STRINGS
+#endif // TEST_THREADS

 
 // ----------------------------------------------------------------------------
 // entry point
 
 // ----------------------------------------------------------------------------
 // entry point


@@ -7131,7 +4466,7 @@ int main(int argc, char **argv)
     wxInitializer initializer;
     if ( !initializer )
     {
     wxInitializer initializer;
     if ( !initializer )
     {

-        fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
+        fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");

 
         return -1;
     }
 
         return -1;
     }


@@ -7157,10 +4492,6 @@ int main(int argc, char **argv)
     }
 #endif // TEST_SNGLINST
 
     }
 #endif // TEST_SNGLINST
 

-#ifdef TEST_CHARSET
-    TestCharset();
-#endif // TEST_CHARSET
-

 #ifdef TEST_CMDLINE
     TestCmdLineConvert();
 
 #ifdef TEST_CMDLINE
     TestCmdLineConvert();
 


@@ -7236,96 +4567,11 @@ int main(int argc, char **argv)
 
 #endif // TEST_CMDLINE
 
 
 #endif // TEST_CMDLINE
 

-#ifdef TEST_STRINGS
-    if ( TEST_ALL )
-    {
-        TestPChar();
-        TestString();
-        TestStringSub();
-        TestStringConstruction();
-        TestStringFormat();
-        TestStringFind();
-        TestStringTokenizer();
-        TestStringReplace();
-    }
-    else
-    {
-        TestStringMatch();
-    }
-
-    TestStdString();
-#endif // TEST_STRINGS
-
-#ifdef TEST_ARRAYS
-    if ( 1 || TEST_ALL )
-    {
-        wxArrayString a1;
-        a1.Add(_T("tiger"));
-        a1.Add(_T("cat"));
-        a1.Add(_T("lion"), 3);
-        a1.Add(_T("dog"));
-        a1.Add(_T("human"));
-        a1.Add(_T("ape"));
-
-        wxPuts(_T("*** Initially:"));
-
-        PrintArray(_T("a1"), a1);
-
-        wxArrayString a2(a1);
-        PrintArray(_T("a2"), a2);
-
-#if !wxUSE_STL
-        wxSortedArrayString a3(a1);
-#else
-        wxSortedArrayString a3;
-        for (wxArrayString::iterator it = a1.begin(), en = a1.end();
-             it != en; ++it)
-            a3.Add(*it);
-#endif
-        PrintArray(_T("a3"), a3);
-
-        wxPuts(_T("*** After deleting three strings from a1"));
-        a1.RemoveAt(2,3);
-
-        PrintArray(_T("a1"), a1);
-        PrintArray(_T("a2"), a2);
-        PrintArray(_T("a3"), a3);
-
-#if !wxUSE_STL
-        wxPuts(_T("*** After reassigning a1 to a2 and a3"));
-        a3 = a2 = a1;
-        PrintArray(_T("a2"), a2);
-        PrintArray(_T("a3"), a3);
-#endif
-
-        wxPuts(_T("*** After sorting a1"));
-        a1.Sort(false);
-        PrintArray(_T("a1"), a1);
-
-        wxPuts(_T("*** After sorting a1 in reverse order"));
-        a1.Sort(true);
-        PrintArray(_T("a1"), a1);
-
-#if !wxUSE_STL
-        wxPuts(_T("*** After sorting a1 by the string length"));
-        a1.Sort(&StringLenCompare);
-        PrintArray(_T("a1"), a1);
-#endif
-
-        TestArrayOfObjects();
-        TestArrayOfUShorts();
-    }
-
-    TestArrayOfInts();
-    TestStlArray();
-#endif // TEST_ARRAYS
-

 #ifdef TEST_DIR
 #ifdef TEST_DIR

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestDirExists();
         TestDirEnum();
         TestDirExists();
         TestDirEnum();

-    }
+    #endif

     TestDirTraverse();
 #endif // TEST_DIR
 
     TestDirTraverse();
 #endif // TEST_DIR
 


@@ -7379,83 +4625,53 @@ int main(int argc, char **argv)
 #endif // TEST_LOG
 
 #ifdef TEST_FILE
 #endif // TEST_LOG
 
 #ifdef TEST_FILE

-    if ( TEST_ALL )
-    {
-        TestFileRead();
-        TestTextFileRead();
-        TestFileCopy();
-    }
+    TestFileRead();
+    TestTextFileRead();
+    TestFileCopy();

 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME

-    if ( TEST_ALL )
-    {
-        TestFileNameConstruction();
-        TestFileNameMakeRelative();
-        TestFileNameMakeAbsolute();
-        TestFileNameSplit();
-        TestFileNameTemp();
-        TestFileNameCwd();
-        TestFileNameDirManip();
-        TestFileNameComparison();
-        TestFileNameOperations();
-    }
+    TestFileNameConstruction();
+    TestFileNameMakeRelative();
+    TestFileNameMakeAbsolute();
+    TestFileNameSplit();
+    TestFileNameTemp();
+    TestFileNameCwd();
+    TestFileNameDirManip();
+    TestFileNameComparison();
+    TestFileNameOperations();

 #endif // TEST_FILENAME
 
 #ifdef TEST_FILETIME
     TestFileGetTimes();
 #endif // TEST_FILENAME
 
 #ifdef TEST_FILETIME
     TestFileGetTimes();

-    if ( 0 )
+    #if 0

     TestFileSetTimes();
     TestFileSetTimes();

+    #endif

 #endif // TEST_FILETIME
 
 #ifdef TEST_FTP
     wxLog::AddTraceMask(FTP_TRACE_MASK);
     if ( TestFtpConnect() )
     {
 #endif // TEST_FILETIME
 
 #ifdef TEST_FTP
     wxLog::AddTraceMask(FTP_TRACE_MASK);
     if ( TestFtpConnect() )
     {

-        if ( TEST_ALL )
-        {
+        #if TEST_ALL

             TestFtpList();
             TestFtpDownload();
             TestFtpMisc();
             TestFtpFileSize();
             TestFtpUpload();
             TestFtpList();
             TestFtpDownload();
             TestFtpMisc();
             TestFtpFileSize();
             TestFtpUpload();

-        }
+        #endif

 
 

-        if ( TEST_INTERACTIVE )
+        #if TEST_INTERACTIVE

             TestFtpInteractive();
             TestFtpInteractive();

+        #endif

     }
     //else: connecting to the FTP server failed
 
     }
     //else: connecting to the FTP server failed
 

-    if ( 0 )
+    #if 0

         TestFtpWuFtpd();
         TestFtpWuFtpd();

+    #endif

 #endif // TEST_FTP
 
 #endif // TEST_FTP
 

-#ifdef TEST_LONGLONG
-    // seed pseudo random generator
-    srand((unsigned)time(NULL));
-
-    if ( 0 )
-    {
-        TestSpeed();
-    }
-
-    if ( TEST_ALL )
-    {
-        TestMultiplication();
-        TestDivision();
-        TestAddition();
-        TestLongLongConversion();
-        TestBitOperations();
-        TestLongLongComparison();
-        TestLongLongToString();
-        TestLongLongPrintf();
-    }
-#endif // TEST_LONGLONG
-
-#ifdef TEST_HASH
-    TestHash();
-#endif // TEST_HASH
-

 #ifdef TEST_HASHMAP
     TestHashMap();
 #endif // TEST_HASHMAP
 #ifdef TEST_HASHMAP
     TestHashMap();
 #endif // TEST_HASHMAP


@@ -7466,24 +4682,23 @@ int main(int argc, char **argv)
 
 #ifdef TEST_MIME
     wxLog::AddTraceMask(_T("mime"));
 
 #ifdef TEST_MIME
     wxLog::AddTraceMask(_T("mime"));

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestMimeEnum();
         TestMimeOverride();
         TestMimeAssociate();
         TestMimeEnum();
         TestMimeOverride();
         TestMimeAssociate();

-    }
+    #endif

     TestMimeFilename();
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
     TestMimeFilename();
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestOsInfo();
         TestUserInfo();
 
         TestOsInfo();
         TestUserInfo();
 

-        if ( TEST_INTERACTIVE )
+        #if TEST_INTERACTIVE

             TestDiskInfo();
             TestDiskInfo();

-    }
+        #endif
+    #endif

 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST
 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST


@@ -7499,23 +4714,15 @@ int main(int argc, char **argv)
 #endif // TEST_PRINTF
 
 #ifdef TEST_REGCONF
 #endif // TEST_PRINTF
 
 #ifdef TEST_REGCONF

-    //TestRegConfWrite();
+    #if 0
+    TestRegConfWrite();
+    #endif

     TestRegConfRead();
 #endif // TEST_REGCONF
 
     TestRegConfRead();
 #endif // TEST_REGCONF
 

-#ifdef TEST_REGEX
-    // TODO: write a real test using src/regex/tests file
-    if ( TEST_ALL )
-    {
-        TestRegExCompile();
-        TestRegExMatch();
-        TestRegExSubmatch();
-        TestRegExReplacement();
-
-        if ( TEST_INTERACTIVE )
-            TestRegExInteractive();
-    }
-#endif // TEST_REGEX
+#if defined TEST_REGEX && TEST_INTERACTIVE
+    TestRegExInteractive();
+#endif // defined TEST_REGEX && TEST_INTERACTIVE

 
 #ifdef TEST_REGISTRY
     TestRegistryRead();
 
 #ifdef TEST_REGISTRY
     TestRegistryRead();


@@ -7528,10 +4735,9 @@ int main(int argc, char **argv)
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestFileStream();
         TestFileStream();

-    }
+    #endif

         TestMemoryStream();
 #endif // TEST_STREAMS
 
         TestMemoryStream();
 #endif // TEST_STREAMS
 


@@ -7547,8 +4753,7 @@ int main(int argc, char **argv)
 
         TestJoinableThreads();
 
 
         TestJoinableThreads();
 

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestJoinableThreads();
         TestDetachedThreads();
         TestThreadSuspend();
         TestJoinableThreads();
         TestDetachedThreads();
         TestThreadSuspend();


@@ -7556,7 +4761,7 @@ int main(int argc, char **argv)
         TestThreadConditions();
         TestThreadExec();
         TestSemaphore();
         TestThreadConditions();
         TestThreadExec();
         TestSemaphore();

-    }
+    #endif

 #endif // TEST_THREADS
 
 #ifdef TEST_TIMER
 #endif // TEST_THREADS
 
 #ifdef TEST_TIMER


@@ -7564,8 +4769,7 @@ int main(int argc, char **argv)
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL

         TestTimeSet();
         TestTimeStatic();
         TestTimeRange();
         TestTimeSet();
         TestTimeStatic();
         TestTimeRange();


@@ -7578,15 +4782,15 @@ int main(int argc, char **argv)
         TestTimeParse();
         TestTimeArithmetics();
         TestTimeHolidays();
         TestTimeParse();
         TestTimeArithmetics();
         TestTimeHolidays();

-        TestTimeFormat();

         TestTimeSpanFormat();
         TestTimeMS();
 
         TestTimeZoneBug();
         TestTimeSpanFormat();
         TestTimeMS();
 
         TestTimeZoneBug();

-    }
+    #endif

 
 

-    if ( TEST_INTERACTIVE )
+    #if TEST_INTERACTIVE

         TestDateTimeInteractive();
         TestDateTimeInteractive();

+    #endif

 #endif // TEST_DATETIME
 
 #ifdef TEST_SCOPEGUARD
 #endif // TEST_DATETIME
 
 #ifdef TEST_SCOPEGUARD


@@ -7607,14 +4811,6 @@ int main(int argc, char **argv)
     TestFSVolume();
 #endif // TEST_VOLUME
 
     TestFSVolume();
 #endif // TEST_VOLUME
 

-#ifdef TEST_UNICODE
-    TestUnicodeTextFileRead();
-    if ( TEST_ALL )
-    {
-        TestUnicodeToFromAscii();
-    }
-#endif // TEST_UNICODE
-

 #ifdef TEST_WCHAR
     TestUtf8();
     TestEncodingConverter();
 #ifdef TEST_WCHAR
     TestUtf8();
     TestEncodingConverter();


@@ -7625,15 +4821,8 @@ int main(int argc, char **argv)
     TestZipFileSystem();
 #endif // TEST_ZIP
 
     TestZipFileSystem();
 #endif // TEST_ZIP
 

-#ifdef TEST_ZLIB
-    TestZlibStreamWrite();
-    TestZlibStreamRead();
-#endif // TEST_ZLIB
-
-#ifdef TEST_GZIP
-    TestGzip();
-#endif
-
+    wxUnusedVar(argc);
+    wxUnusedVar(argv);

     return 0;
 }
 
     return 0;
 }