Add a test of precisely sized status bar fields.

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index fba92070c9ac5efd387d0fbc7301719dd2f60a5c..e62d060ea7358f4f2668c48c50dd9143595a5206 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) program using wxWidgets

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


@@ -9,6 +9,57 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// IMPORTANT NOTE FOR WXWIDGETS USERS:
+// If you're a wxWidgets user and you're looking at this file to learn how to
+// structure a wxWidgets console application, then you don't have much to learn.
+// This application is used more for testing rather than as sample but
+// basically the following simple block is enough for you to start your
+// own console application:
+
+/*
+    int main(int argc, char **argv)
+    {
+        wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
+
+        wxInitializer initializer;
+        if ( !initializer )
+        {
+            fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
+            return -1;
+        }
+
+        static const wxCmdLineEntryDesc cmdLineDesc[] =
+        {
+            { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
+                wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+            // ... your other command line options here...
+
+            { wxCMD_LINE_NONE }
+        };
+
+        wxCmdLineParser parser(cmdLineDesc, argc, wxArgv);
+        switch ( parser.Parse() )
+        {
+            case -1:
+                wxLogMessage(wxT("Help was given, terminating."));
+                break;
+
+            case 0:
+                // everything is ok; proceed
+                break;
+
+            default:
+                wxLogMessage(wxT("Syntax error detected, aborting."));
+                break;
+        }
+
+        // do something useful here
+
+        return 0;
+    }
+*/
+
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -19,15 +70,16 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_GUI
-    #error "This sample can't be compiled in GUI mode."
-#endif // wxUSE_GUI
-

 #include <stdio.h>
 
 #include "wx/string.h"
 #include "wx/file.h"
 #include <stdio.h>
 
 #include "wx/string.h"
 #include "wx/file.h"

+#include "wx/filename.h"

 #include "wx/app.h"
 #include "wx/app.h"

+#include "wx/log.h"
+#include "wx/apptrait.h"
+#include "wx/platinfo.h"
+#include "wx/wxchar.h"

 
 // without this pragma, the stupid compiler precompiles #defines below so that
 // changing them doesn't "take place" later!
 
 // without this pragma, the stupid compiler precompiles #defines below so that
 // changing them doesn't "take place" later!


@@ -41,95 +93,63 @@
 
 /*
    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.
  */
 

-// 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
+// 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 1
+
+
+#if TEST_ALL

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

-    #define TEST_DLLLOADER
+    #define TEST_DYNLIB

     #define TEST_ENVIRON
     #define TEST_ENVIRON

-    #define TEST_EXECUTE

     #define TEST_FILE
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME
     #define TEST_FTP
     #define TEST_FILE
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME
     #define TEST_FTP

-    #define TEST_HASH
-    #define TEST_HASHMAP

     #define TEST_INFO_FUNCTIONS
     #define TEST_INFO_FUNCTIONS

-    #define TEST_LIST

     #define TEST_LOCALE
     #define TEST_LOG
     #define TEST_LOCALE
     #define TEST_LOG

-    #define TEST_LONGLONG

     #define TEST_MIME
     #define TEST_MIME

+    #define TEST_MODULE

     #define TEST_PATHLIST
     #define TEST_PATHLIST

-    #define TEST_ODBC
+    #define TEST_PRINTF

     #define TEST_REGCONF
     #define TEST_REGEX
     #define TEST_REGISTRY
     #define TEST_REGCONF
     #define TEST_REGEX
     #define TEST_REGISTRY

+    #define TEST_SCOPEGUARD

     #define TEST_SNGLINST
     #define TEST_SNGLINST

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

     #define TEST_STREAMS
     #define TEST_STREAMS

-    #define TEST_STRINGS
+    #define TEST_TEXTSTREAM

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

-    // #define TEST_VCARD            -- don't enable this (VZ)
+//    #define TEST_VOLUME   --FIXME! (RN)

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

-    #define TEST_ZLIB
-
-    #undef TEST_ALL
-    static const bool TEST_ALL = TRUE;
-#else
-    #define TEST_FILETIME
-
-    static const bool TEST_ALL = FALSE;
+#else // #if TEST_ALL
+    #define TEST_FTP

 #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
 
 #endif
 

-// ----------------------------------------------------------------------------
-// test class for container objects
-// ----------------------------------------------------------------------------
-
-#if defined(TEST_ARRAYS) || defined(TEST_LIST)
-
-class Bar // Foo is already taken in the hash test
-{
-public:
-    Bar(const wxString& name) : m_name(name) { ms_bars++; }
-   ~Bar() { ms_bars--; }
-
-   static size_t GetNumber() { return ms_bars; }
-
-   const char *GetName() const { return m_name; }
-
-private:
-   wxString m_name;
-
-   static size_t ms_bars;
-};
-
-size_t Bar::ms_bars = 0;
-
-#endif // defined(TEST_ARRAYS) || defined(TEST_LIST)
-

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


@@ -138,61 +158,21 @@ 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)
 {
     wxString str(s);
 
 // replace TABs with \t and CRs with \n
 static wxString MakePrintable(const wxChar *s)
 {
     wxString str(s);

-    (void)str.Replace(_T("\t"), _T("\\t"));
-    (void)str.Replace(_T("\n"), _T("\\n"));
-    (void)str.Replace(_T("\r"), _T("\\r"));
+    (void)str.Replace(wxT("\t"), wxT("\\t"));
+    (void)str.Replace(wxT("\n"), wxT("\\n"));
+    (void)str.Replace(wxT("\r"), wxT("\\r"));

 
     return str;
 }
 
 #endif // MakePrintable() is used
 
 
     return str;
 }
 
 #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 = wxTheFontMapper->CharsetToEncoding(charsets[n]);
-        wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"),
-                 charsets[n],
-                 wxTheFontMapper->GetEncodingName(enc).c_str(),
-                 wxTheFontMapper->GetEncodingDescription(enc).c_str());
-    }
-}
-
-#endif // TEST_CHARSET
-

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


@@ -206,7 +186,7 @@ static void TestCharset()
 
 static void ShowCmdLine(const wxCmdLineParser& parser)
 {
 
 static void ShowCmdLine(const wxCmdLineParser& parser)
 {

-    wxString s = "Input files: ";
+    wxString s = wxT("Command line parsed successfully:\nInput files: ");

 
     size_t count = parser.GetParamCount();
     for ( size_t param = 0; param < count; param++ )
 
     size_t count = parser.GetParamCount();
     for ( size_t param = 0; param < count; param++ )


@@ -215,22 +195,25 @@ static void ShowCmdLine(const wxCmdLineParser& parser)
     }
 
     s << '\n'
     }
 
     s << '\n'

-      << "Verbose:\t" << (parser.Found("v") ? "yes" : "no") << '\n'
-      << "Quiet:\t" << (parser.Found("q") ? "yes" : "no") << '\n';
+      << wxT("Verbose:\t") << (parser.Found(wxT("v")) ? wxT("yes") : wxT("no")) << '\n'
+      << wxT("Quiet:\t") << (parser.Found(wxT("q")) ? wxT("yes") : wxT("no")) << '\n';

 
     wxString strVal;
     long lVal;
 
     wxString strVal;
     long lVal;

+    double dVal;

     wxDateTime dt;
     wxDateTime dt;

-    if ( parser.Found("o", &strVal) )
-        s << "Output file:\t" << strVal << '\n';
-    if ( parser.Found("i", &strVal) )
-        s << "Input dir:\t" << strVal << '\n';
-    if ( parser.Found("s", &lVal) )
-        s << "Size:\t" << lVal << '\n';
-    if ( parser.Found("d", &dt) )
-        s << "Date:\t" << dt.FormatISODate() << '\n';
-    if ( parser.Found("project_name", &strVal) )
-        s << "Project:\t" << strVal << '\n';
+    if ( parser.Found(wxT("o"), &strVal) )
+        s << wxT("Output file:\t") << strVal << '\n';
+    if ( parser.Found(wxT("i"), &strVal) )
+        s << wxT("Input dir:\t") << strVal << '\n';
+    if ( parser.Found(wxT("s"), &lVal) )
+        s << wxT("Size:\t") << lVal << '\n';
+    if ( parser.Found(wxT("f"), &dVal) )
+        s << wxT("Double:\t") << dVal << '\n';
+    if ( parser.Found(wxT("d"), &dt) )
+        s << wxT("Date:\t") << dt.FormatISODate() << '\n';
+    if ( parser.Found(wxT("project_name"), &strVal) )
+        s << wxT("Project:\t") << strVal << '\n';

 
     wxLogMessage(s);
 }
 
     wxLogMessage(s);
 }


@@ -239,24 +222,24 @@ static void ShowCmdLine(const wxCmdLineParser& parser)
 
 static void TestCmdLineConvert()
 {
 
 static void TestCmdLineConvert()
 {

-    static const char *cmdlines[] =
+    static const wxChar *cmdlines[] =

     {
     {

-        "arg1 arg2",
-        "-a \"-bstring 1\" -c\"string 2\" \"string 3\"",
-        "literal \\\" and \"\"",
+        wxT("arg1 arg2"),
+        wxT("-a \"-bstring 1\" -c\"string 2\" \"string 3\""),
+        wxT("literal \\\" and \"\""),

     };
 
     for ( size_t n = 0; n < WXSIZEOF(cmdlines); n++ )
     {
     };
 
     for ( size_t n = 0; n < WXSIZEOF(cmdlines); n++ )
     {

-        const char *cmdline = cmdlines[n];
-        printf("Parsing: %s\n", cmdline);
+        const wxChar *cmdline = cmdlines[n];
+        wxPrintf(wxT("Parsing: %s\n"), cmdline);

         wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdline);
 
         size_t count = args.GetCount();
         wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdline);
 
         size_t count = args.GetCount();

-        printf("\targc = %u\n", count);
+        wxPrintf(wxT("\targc = %u\n"), count);

         for ( size_t arg = 0; arg < count; arg++ )
         {
         for ( size_t arg = 0; arg < count; arg++ )
         {

-            printf("\targv[%u] = %s\n", arg, args[arg].c_str());
+            wxPrintf(wxT("\targv[%u] = %s\n"), arg, args[arg].c_str());

         }
     }
 }
         }
     }
 }


@@ -272,11 +255,11 @@ static void TestCmdLineConvert()
 #include "wx/dir.h"
 
 #ifdef __UNIX__
 #include "wx/dir.h"
 
 #ifdef __UNIX__

-    static const wxChar *ROOTDIR = _T("/");
-    static const wxChar *TESTDIR = _T("/usr");
-#elif defined(__WXMSW__)
-    static const wxChar *ROOTDIR = _T("c:\\");
-    static const wxChar *TESTDIR = _T("d:\\");
+    static const wxChar *ROOTDIR = wxT("/");
+    static const wxChar *TESTDIR = wxT("/usr/local/share");
+#elif defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__)
+    static const wxChar *ROOTDIR = wxT("c:\\");
+    static const wxChar *TESTDIR = wxT("d:\\");

 #else
     #error "don't know where the root directory is"
 #endif
 #else
     #error "don't know where the root directory is"
 #endif


@@ -293,61 +276,77 @@ static void TestDirEnumHelper(wxDir& dir,
     bool cont = dir.GetFirst(&filename, filespec, flags);
     while ( cont )
     {
     bool cont = dir.GetFirst(&filename, filespec, flags);
     while ( cont )
     {

-        printf("\t%s\n", filename.c_str());
+        wxPrintf(wxT("\t%s\n"), filename.c_str());

 
         cont = dir.GetNext(&filename);
     }
 
 
         cont = dir.GetNext(&filename);
     }
 

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

 }
 
 }
 

+#if TEST_ALL
+

 static void TestDirEnum()
 {
 static void TestDirEnum()
 {

-    puts("*** Testing wxDir::GetFirst/GetNext ***");
+    wxPuts(wxT("*** Testing wxDir::GetFirst/GetNext ***"));

 
 

-    wxDir dir(wxGetCwd());
+    wxString cwd = wxGetCwd();
+    if ( !wxDir::Exists(cwd) )
+    {
+        wxPrintf(wxT("ERROR: current directory '%s' doesn't exist?\n"), cwd.c_str());
+        return;
+    }
+
+    wxDir dir(cwd);
+    if ( !dir.IsOpened() )
+    {
+        wxPrintf(wxT("ERROR: failed to open current directory '%s'.\n"), cwd.c_str());
+        return;
+    }

 
 

-    puts("Enumerating everything in current directory:");
+    wxPuts(wxT("Enumerating everything in current directory:"));

     TestDirEnumHelper(dir);
 
     TestDirEnumHelper(dir);
 

-    puts("Enumerating really everything in current directory:");
+    wxPuts(wxT("Enumerating really everything in current directory:"));

     TestDirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT);
 
     TestDirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT);
 

-    puts("Enumerating object files in current directory:");
-    TestDirEnumHelper(dir, wxDIR_DEFAULT, "*.o");
+    wxPuts(wxT("Enumerating object files in current directory:"));
+    TestDirEnumHelper(dir, wxDIR_DEFAULT, wxT("*.o*"));

 
 

-    puts("Enumerating directories in current directory:");
+    wxPuts(wxT("Enumerating directories in current directory:"));

     TestDirEnumHelper(dir, wxDIR_DIRS);
 
     TestDirEnumHelper(dir, wxDIR_DIRS);
 

-    puts("Enumerating files in current directory:");
+    wxPuts(wxT("Enumerating files in current directory:"));

     TestDirEnumHelper(dir, wxDIR_FILES);
 
     TestDirEnumHelper(dir, wxDIR_FILES);
 

-    puts("Enumerating files including hidden in current directory:");
+    wxPuts(wxT("Enumerating files including hidden in current directory:"));

     TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
 
     dir.Open(ROOTDIR);
 
     TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
 
     dir.Open(ROOTDIR);
 

-    puts("Enumerating everything in root directory:");
+    wxPuts(wxT("Enumerating everything in root directory:"));

     TestDirEnumHelper(dir, wxDIR_DEFAULT);
 
     TestDirEnumHelper(dir, wxDIR_DEFAULT);
 

-    puts("Enumerating directories in root directory:");
+    wxPuts(wxT("Enumerating directories in root directory:"));

     TestDirEnumHelper(dir, wxDIR_DIRS);
 
     TestDirEnumHelper(dir, wxDIR_DIRS);
 

-    puts("Enumerating files in root directory:");
+    wxPuts(wxT("Enumerating files in root directory:"));

     TestDirEnumHelper(dir, wxDIR_FILES);
 
     TestDirEnumHelper(dir, wxDIR_FILES);
 

-    puts("Enumerating files including hidden in root directory:");
+    wxPuts(wxT("Enumerating files including hidden in root directory:"));

     TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
 
     TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
 

-    puts("Enumerating files in non existing directory:");
-    wxDir dirNo("nosuchdir");
+    wxPuts(wxT("Enumerating files in non existing directory:"));
+    wxDir dirNo(wxT("nosuchdir"));

     TestDirEnumHelper(dirNo);
 }
 
     TestDirEnumHelper(dirNo);
 }
 

+#endif // TEST_ALL
+

 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;
     }


@@ -355,19 +354,19 @@ public:
     virtual wxDirTraverseResult OnDir(const wxString& dirname)
     {
         wxString path, name, ext;
     virtual wxDirTraverseResult OnDir(const wxString& dirname)
     {
         wxString path, name, ext;

-        wxSplitPath(dirname, &path, &name, &ext);
+        wxFileName::SplitPath(dirname, &path, &name, &ext);

 
         if ( !ext.empty() )
 
         if ( !ext.empty() )

-            name << _T('.') << ext;
+            name << wxT('.') << ext;

 
         wxString indent;
         for ( const wxChar *p = path.c_str(); *p; p++ )
         {
             if ( wxIsPathSeparator(*p) )
 
         wxString indent;
         for ( const wxChar *p = path.c_str(); *p; p++ )
         {
             if ( wxIsPathSeparator(*p) )

-                indent += _T("    ");
+                indent += wxT("    ");

         }
 
         }
 

-        printf("%s%s\n", indent.c_str(), name.c_str());
+        wxPrintf(wxT("%s%s\n"), indent.c_str(), name.c_str());

 
         return wxDIR_CONTINUE;
     }
 
         return wxDIR_CONTINUE;
     }


@@ -375,80 +374,167 @@ public:
 
 static void TestDirTraverse()
 {
 
 static void TestDirTraverse()
 {

-    puts("*** Testing wxDir::Traverse() ***");
+    wxPuts(wxT("*** Testing wxDir::Traverse() ***"));

 
     // enum all files
     wxArrayString files;
     size_t n = wxDir::GetAllFiles(TESTDIR, &files);
 
     // enum all files
     wxArrayString files;
     size_t n = wxDir::GetAllFiles(TESTDIR, &files);

-    printf("There are %u files under '%s'\n", n, TESTDIR);
+    wxPrintf(wxT("There are %u files under '%s'\n"), n, TESTDIR);

     if ( n > 1 )
     {
     if ( n > 1 )
     {

-        printf("First one is '%s'\n", files[0u].c_str());
-        printf(" last one is '%s'\n", files[n - 1].c_str());
+        wxPrintf(wxT("First one is '%s'\n"), files[0u].c_str());
+        wxPrintf(wxT(" last one is '%s'\n"), files[n - 1].c_str());

     }
 
     // enum again with custom traverser
     }
 
     // enum again with custom traverser

+    wxPuts(wxT("Now enumerating directories:"));

     wxDir dir(TESTDIR);
     DirPrintTraverser traverser;
     wxDir dir(TESTDIR);
     DirPrintTraverser traverser;

-    dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
+    dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN);
+}
+
+#if TEST_ALL
+
+static void TestDirExists()
+{
+    wxPuts(wxT("*** Testing wxDir::Exists() ***"));
+
+    static const wxChar *dirnames[] =
+    {
+        wxT("."),
+#if defined(__WXMSW__)
+        wxT("c:"),
+        wxT("c:\\"),
+        wxT("\\\\share\\file"),
+        wxT("c:\\dos"),
+        wxT("c:\\dos\\"),
+        wxT("c:\\dos\\\\"),
+        wxT("c:\\autoexec.bat"),
+#elif defined(__UNIX__)
+        wxT("/"),
+        wxT("//"),
+        wxT("/usr/bin"),
+        wxT("/usr//bin"),
+        wxT("/usr///bin"),
+#endif
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(dirnames); n++ )
+    {
+        wxPrintf(wxT("%-40s: %s\n"),
+                 dirnames[n],
+                 wxDir::Exists(dirnames[n]) ? wxT("exists")
+                                            : wxT("doesn't exist"));
+    }

 }
 
 }
 

+#endif // TEST_ALL
+

 #endif // TEST_DIR
 
 // ----------------------------------------------------------------------------
 // wxDllLoader
 // ----------------------------------------------------------------------------
 
 #endif // TEST_DIR
 
 // ----------------------------------------------------------------------------
 // wxDllLoader
 // ----------------------------------------------------------------------------
 

-#ifdef TEST_DLLLOADER
+#ifdef TEST_DYNLIB

 
 #include "wx/dynlib.h"
 
 static void TestDllLoad()
 {
 #if defined(__WXMSW__)
 
 #include "wx/dynlib.h"
 
 static void TestDllLoad()
 {
 #if defined(__WXMSW__)

-    static const wxChar *LIB_NAME = _T("kernel32.dll");
-    static const wxChar *FUNC_NAME = _T("lstrlenA");
+    static const wxChar *LIB_NAME = wxT("kernel32.dll");
+    static const wxChar *FUNC_NAME = wxT("lstrlenA");

 #elif defined(__UNIX__)
     // weird: using just libc.so does *not* work!
 #elif defined(__UNIX__)
     // weird: using just libc.so does *not* work!

-    static const wxChar *LIB_NAME = _T("/lib/libc-2.0.7.so");
-    static const wxChar *FUNC_NAME = _T("strlen");
+    static const wxChar *LIB_NAME = wxT("/lib/libc.so.6");
+    static const wxChar *FUNC_NAME = wxT("strlen");

 #else
     #error "don't know how to test wxDllLoader on this platform"
 #endif
 
 #else
     #error "don't know how to test wxDllLoader on this platform"
 #endif
 

-    puts("*** testing wxDllLoader ***\n");
+    wxPuts(wxT("*** testing basic wxDynamicLibrary functions ***\n"));

 
 

-    wxDllType dllHandle = wxDllLoader::LoadLibrary(LIB_NAME);
-    if ( !dllHandle )
+    wxDynamicLibrary lib(LIB_NAME);
+    if ( !lib.IsLoaded() )

     {
     {

-        wxPrintf(_T("ERROR: failed to load '%s'.\n"), LIB_NAME);
+        wxPrintf(wxT("ERROR: failed to load '%s'.\n"), LIB_NAME);

     }
     else
     {
     }
     else
     {

-        typedef int (*strlenType)(const char *);
-        strlenType pfnStrlen = (strlenType)wxDllLoader::GetSymbol(dllHandle, FUNC_NAME);
+        typedef int (wxSTDCALL *wxStrlenType)(const char *);
+        wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME);

         if ( !pfnStrlen )
         {
         if ( !pfnStrlen )
         {

-            wxPrintf(_T("ERROR: function '%s' wasn't found in '%s'.\n"),
+            wxPrintf(wxT("ERROR: function '%s' wasn't found in '%s'.\n"),

                      FUNC_NAME, LIB_NAME);
         }
         else
         {
                      FUNC_NAME, LIB_NAME);
         }
         else
         {

+            wxPrintf(wxT("Calling %s dynamically loaded from %s "),
+                     FUNC_NAME, LIB_NAME);
+

             if ( pfnStrlen("foo") != 3 )
             {
             if ( pfnStrlen("foo") != 3 )
             {

-                wxPrintf(_T("ERROR: loaded function is not strlen()!\n"));
+                wxPrintf(wxT("ERROR: loaded function is not wxStrlen()!\n"));

             }
             else
             {
             }
             else
             {

-                puts("... ok");
+                wxPuts(wxT("... ok"));
+            }
+        }
+
+#ifdef __WXMSW__
+        static const wxChar *FUNC_NAME_AW = wxT("lstrlen");
+
+        typedef int (wxSTDCALL *wxStrlenTypeAorW)(const wxChar *);
+        wxStrlenTypeAorW
+            pfnStrlenAorW = (wxStrlenTypeAorW)lib.GetSymbolAorW(FUNC_NAME_AW);
+        if ( !pfnStrlenAorW )
+        {
+            wxPrintf(wxT("ERROR: function '%s' wasn't found in '%s'.\n"),
+                     FUNC_NAME_AW, LIB_NAME);
+        }
+        else
+        {
+            if ( pfnStrlenAorW(wxT("foobar")) != 6 )
+            {
+                wxPrintf(wxT("ERROR: loaded function is not wxStrlen()!\n"));

             }
         }
             }
         }

+#endif // __WXMSW__
+    }
+}
+
+#if defined(__WXMSW__) || defined(__UNIX__)
+
+static void TestDllListLoaded()
+{
+    wxPuts(wxT("*** testing wxDynamicLibrary::ListLoaded() ***\n"));
+
+    puts("\nLoaded modules:");
+    wxDynamicLibraryDetailsArray dlls = wxDynamicLibrary::ListLoaded();
+    const size_t count = dlls.GetCount();
+    for ( size_t n = 0; n < count; ++n )
+    {
+        const wxDynamicLibraryDetails& details = dlls[n];
+        printf("%-45s", (const char *)details.GetPath().mb_str());
+
+        void *addr wxDUMMY_INITIALIZE(NULL);
+        size_t len wxDUMMY_INITIALIZE(0);
+        if ( details.GetAddress(&addr, &len) )
+        {
+            printf(" %08lx:%08lx",
+                   (unsigned long)addr, (unsigned long)((char *)addr + len));
+        }

 
 

-        wxDllLoader::UnloadLibrary(dllHandle);
+        printf(" %s\n", (const char *)details.GetVersion().mb_str());

     }
 }
 
     }
 }
 

-#endif // TEST_DLLLOADER
+#endif
+
+#endif // TEST_DYNLIB

 
 // ----------------------------------------------------------------------------
 // wxGet/SetEnv
 
 // ----------------------------------------------------------------------------
 // wxGet/SetEnv


@@ -462,98 +548,31 @@ static wxString MyGetEnv(const wxString& var)
 {
     wxString val;
     if ( !wxGetEnv(var, &val) )
 {
     wxString val;
     if ( !wxGetEnv(var, &val) )

-        val = _T("<empty>");
+        val = wxT("<empty>");

     else
     else

-        val = wxString(_T('\'')) + val + _T('\'');
+        val = wxString(wxT('\'')) + val + wxT('\'');

 
     return val;
 }
 
 static void TestEnvironment()
 {
 
     return val;
 }
 
 static void TestEnvironment()
 {

-    const wxChar *var = _T("wxTestVar");
+    const wxChar *var = wxT("wxTestVar");

 
 

-    puts("*** testing environment access functions ***");
+    wxPuts(wxT("*** testing environment access functions ***"));

 
 

-    printf("Initially getenv(%s) = %s\n", var, MyGetEnv(var).c_str());
-    wxSetEnv(var, _T("value for wxTestVar"));
-    printf("After wxSetEnv: getenv(%s) = %s\n",  var, MyGetEnv(var).c_str());
-    wxSetEnv(var, _T("another value"));
-    printf("After 2nd wxSetEnv: getenv(%s) = %s\n",  var, MyGetEnv(var).c_str());
+    wxPrintf(wxT("Initially getenv(%s) = %s\n"), var, MyGetEnv(var).c_str());
+    wxSetEnv(var, wxT("value for wxTestVar"));
+    wxPrintf(wxT("After wxSetEnv: getenv(%s) = %s\n"),  var, MyGetEnv(var).c_str());
+    wxSetEnv(var, wxT("another value"));
+    wxPrintf(wxT("After 2nd wxSetEnv: getenv(%s) = %s\n"),  var, MyGetEnv(var).c_str());

     wxUnsetEnv(var);
     wxUnsetEnv(var);

-    printf("After wxUnsetEnv: getenv(%s) = %s\n",  var, MyGetEnv(var).c_str());
-    printf("PATH = %s\n",  MyGetEnv(_T("PATH")).c_str());
+    wxPrintf(wxT("After wxUnsetEnv: getenv(%s) = %s\n"),  var, MyGetEnv(var).c_str());
+    wxPrintf(wxT("PATH = %s\n"),  MyGetEnv(wxT("PATH")).c_str());

 }
 
 #endif // TEST_ENVIRON
 
 }
 
 #endif // TEST_ENVIRON
 

-// ----------------------------------------------------------------------------
-// wxExecute
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_EXECUTE
-
-#include "wx/utils.h"
-
-static void TestExecute()
-{
-    puts("*** testing wxExecute ***");
-
-#ifdef __UNIX__
-    #define COMMAND "cat -n ../../Makefile" // "echo hi"
-    #define SHELL_COMMAND "echo hi from shell"
-    #define REDIRECT_COMMAND COMMAND // "date"
-#elif defined(__WXMSW__)
-    #define COMMAND "command.com -c 'echo hi'"
-    #define SHELL_COMMAND "echo hi"
-    #define REDIRECT_COMMAND COMMAND
-#else
-    #error "no command to exec"
-#endif // OS
-
-    printf("Testing wxShell: ");
-    fflush(stdout);
-    if ( wxShell(SHELL_COMMAND) )
-        puts("Ok.");
-    else
-        puts("ERROR.");
-
-    printf("Testing wxExecute: ");
-    fflush(stdout);
-    if ( wxExecute(COMMAND, TRUE /* sync */) == 0 )
-        puts("Ok.");
-    else
-        puts("ERROR.");
-
-#if 0 // no, it doesn't work (yet?)
-    printf("Testing async wxExecute: ");
-    fflush(stdout);
-    if ( wxExecute(COMMAND) != 0 )
-        puts("Ok (command launched).");
-    else
-        puts("ERROR.");
-#endif // 0
-
-    printf("Testing wxExecute with redirection:\n");
-    wxArrayString output;
-    if ( wxExecute(REDIRECT_COMMAND, output) != 0 )
-    {
-        puts("ERROR.");
-    }
-    else
-    {
-        size_t count = output.GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            printf("\t%s\n", output[n].c_str());
-        }
-
-        puts("Ok.");
-    }
-}
-
-#endif // TEST_EXECUTE
-

 // ----------------------------------------------------------------------------
 // file
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // file
 // ----------------------------------------------------------------------------


@@ -566,23 +585,23 @@ static void TestExecute()
 
 static void TestFileRead()
 {
 
 static void TestFileRead()
 {

-    puts("*** wxFile read test ***");
+    wxPuts(wxT("*** wxFile read test ***"));

 
 

-    wxFile file(_T("testdata.fc"));
+    wxFile file(wxT("testdata.fc"));

     if ( file.IsOpened() )
     {
     if ( file.IsOpened() )
     {

-        printf("File length: %lu\n", file.Length());
+        wxPrintf(wxT("File length: %lu\n"), file.Length());

 
 

-        puts("File dump:\n----------");
+        wxPuts(wxT("File dump:\n----------"));

 
 

-        static const off_t len = 1024;
-        char buf[len];
+        static const size_t len = 1024;
+        wxChar buf[len];

         for ( ;; )
         {
         for ( ;; )
         {

-            off_t nRead = file.Read(buf, len);
-            if ( nRead == wxInvalidOffset )
+            size_t nRead = file.Read(buf, len);
+            if ( nRead == (size_t)wxInvalidOffset )

             {
             {

-                printf("Failed to read the file.");
+                wxPrintf(wxT("Failed to read the file."));

                 break;
             }
 
                 break;
             }
 


@@ -592,88 +611,88 @@ static void TestFileRead()
                 break;
         }
 
                 break;
         }
 

-        puts("----------");
+        wxPuts(wxT("----------"));

     }
     else
     {
     }
     else
     {

-        printf("ERROR: can't open test file.\n");
+        wxPrintf(wxT("ERROR: can't open test file.\n"));

     }
 
     }
 

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

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

-    puts("*** wxTextFile read test ***");
+    wxPuts(wxT("*** wxTextFile read test ***"));

 
 

-    wxTextFile file(_T("testdata.fc"));
+    wxTextFile file(wxT("testdata.fc"));

     if ( file.Open() )
     {
     if ( file.Open() )
     {

-        printf("Number of lines: %u\n", file.GetLineCount());
-        printf("Last line: '%s'\n", file.GetLastLine().c_str());
+        wxPrintf(wxT("Number of lines: %u\n"), file.GetLineCount());
+        wxPrintf(wxT("Last line: '%s'\n"), file.GetLastLine().c_str());

 
         wxString s;
 
 
         wxString s;
 

-        puts("\nDumping the entire file:");
+        wxPuts(wxT("\nDumping the entire file:"));

         for ( s = file.GetFirstLine(); !file.Eof(); s = file.GetNextLine() )
         {
         for ( s = file.GetFirstLine(); !file.Eof(); s = file.GetNextLine() )
         {

-            printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+            wxPrintf(wxT("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());

         }
         }

-        printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+        wxPrintf(wxT("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());

 
 

-        puts("\nAnd now backwards:");
+        wxPuts(wxT("\nAnd now backwards:"));

         for ( s = file.GetLastLine();
               file.GetCurrentLine() != 0;
               s = file.GetPrevLine() )
         {
         for ( s = file.GetLastLine();
               file.GetCurrentLine() != 0;
               s = file.GetPrevLine() )
         {

-            printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+            wxPrintf(wxT("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());

         }
         }

-        printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+        wxPrintf(wxT("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());

     }
     else
     {
     }
     else
     {

-        printf("ERROR: can't open '%s'\n", file.GetName());
+        wxPrintf(wxT("ERROR: can't open '%s'\n"), file.GetName());

     }
 
     }
 

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

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

-    puts("*** Testing wxCopyFile ***");
+    wxPuts(wxT("*** Testing wxCopyFile ***"));

 
 

-    static const wxChar *filename1 = _T("testdata.fc");
-    static const wxChar *filename2 = _T("test2");
+    static const wxChar *filename1 = wxT("testdata.fc");
+    static const wxChar *filename2 = wxT("test2");

     if ( !wxCopyFile(filename1, filename2) )
     {
     if ( !wxCopyFile(filename1, filename2) )
     {

-        puts("ERROR: failed to copy file");
+        wxPuts(wxT("ERROR: failed to copy file"));

     }
     else
     {
     }
     else
     {

-        wxFFile f1(filename1, "rb"),
-                f2(filename2, "rb");
+        wxFFile f1(filename1, wxT("rb")),
+                f2(filename2, wxT("rb"));

 
         if ( !f1.IsOpened() || !f2.IsOpened() )
         {
 
         if ( !f1.IsOpened() || !f2.IsOpened() )
         {

-            puts("ERROR: failed to open file(s)");
+            wxPuts(wxT("ERROR: failed to open file(s)"));

         }
         else
         {
             wxString s1, s2;
             if ( !f1.ReadAll(&s1) || !f2.ReadAll(&s2) )
             {
         }
         else
         {
             wxString s1, s2;
             if ( !f1.ReadAll(&s1) || !f2.ReadAll(&s2) )
             {

-                puts("ERROR: failed to read file(s)");
+                wxPuts(wxT("ERROR: failed to read file(s)"));

             }
             else
             {
                 if ( (s1.length() != s2.length()) ||
                      (memcmp(s1.c_str(), s2.c_str(), s1.length()) != 0) )
                 {
             }
             else
             {
                 if ( (s1.length() != s2.length()) ||
                      (memcmp(s1.c_str(), s2.c_str(), s1.length()) != 0) )
                 {

-                    puts("ERROR: copy error!");
+                    wxPuts(wxT("ERROR: copy error!"));

                 }
                 else
                 {
                 }
                 else
                 {

-                    puts("File was copied ok.");
+                    wxPuts(wxT("File was copied ok."));

                 }
             }
         }
                 }
             }
         }


@@ -681,10 +700,28 @@ static void TestFileCopy()
 
     if ( !wxRemoveFile(filename2) )
     {
 
     if ( !wxRemoveFile(filename2) )
     {

-        puts("ERROR: failed to remove the file");
+        wxPuts(wxT("ERROR: failed to remove the file"));
+    }
+
+    wxPuts(wxEmptyString);
+}
+
+static void TestTempFile()
+{
+    wxPuts(wxT("*** wxTempFile test ***"));
+
+    wxTempFile tmpFile;
+    if ( tmpFile.Open(wxT("test2")) && tmpFile.Write(wxT("the answer is 42")) )
+    {
+        if ( tmpFile.Commit() )
+            wxPuts(wxT("File committed."));
+        else
+            wxPuts(wxT("ERROR: could't commit temp file."));
+
+        wxRemoveFile(wxT("test2"));

     }
 
     }
 

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

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


@@ -704,50 +741,56 @@ static const struct FileConfTestData
     const wxChar *value;     // the value from the file
 } fcTestData[] =
 {
     const wxChar *value;     // the value from the file
 } fcTestData[] =
 {

-    { _T("value1"),                       _T("one") },
-    { _T("value2"),                       _T("two") },
-    { _T("novalue"),                      _T("default") },
+    { wxT("value1"),                       wxT("one") },
+    { wxT("value2"),                       wxT("two") },
+    { wxT("novalue"),                      wxT("default") },

 };
 
 static void TestFileConfRead()
 {
 };
 
 static void TestFileConfRead()
 {

-    puts("*** testing wxFileConfig loading/reading ***");
+    wxPuts(wxT("*** testing wxFileConfig loading/reading ***"));

 
 

-    wxFileConfig fileconf(_T("test"), wxEmptyString,
-                          _T("testdata.fc"), wxEmptyString,
+    wxFileConfig fileconf(wxT("test"), wxEmptyString,
+                          wxT("testdata.fc"), wxEmptyString,

                           wxCONFIG_USE_RELATIVE_PATH);
 
     // test simple reading
                           wxCONFIG_USE_RELATIVE_PATH);
 
     // test simple reading

-    puts("\nReading config file:");
-    wxString defValue(_T("default")), value;
+    wxPuts(wxT("\nReading config file:"));
+    wxString defValue(wxT("default")), value;

     for ( size_t n = 0; n < WXSIZEOF(fcTestData); n++ )
     {
         const FileConfTestData& data = fcTestData[n];
         value = fileconf.Read(data.name, defValue);
     for ( size_t n = 0; n < WXSIZEOF(fcTestData); n++ )
     {
         const FileConfTestData& data = fcTestData[n];
         value = fileconf.Read(data.name, defValue);

-        printf("\t%s = %s ", data.name, value.c_str());
+        wxPrintf(wxT("\t%s = %s "), data.name, value.c_str());

         if ( value == data.value )
         {
         if ( value == data.value )
         {

-            puts("(ok)");
+            wxPuts(wxT("(ok)"));

         }
         else
         {
         }
         else
         {

-            printf("(ERROR: should be %s)\n", data.value);
+            wxPrintf(wxT("(ERROR: should be %s)\n"), data.value);

         }
     }
 
     // test enumerating the entries
         }
     }
 
     // test enumerating the entries

-    puts("\nEnumerating all root entries:");
+    wxPuts(wxT("\nEnumerating all root entries:"));

     long dummy;
     wxString name;
     bool cont = fileconf.GetFirstEntry(name, dummy);
     while ( cont )
     {
     long dummy;
     wxString name;
     bool cont = fileconf.GetFirstEntry(name, dummy);
     while ( cont )
     {

-        printf("\t%s = %s\n",
+        wxPrintf(wxT("\t%s = %s\n"),

                name.c_str(),
                name.c_str(),

-               fileconf.Read(name.c_str(), _T("ERROR")).c_str());
+               fileconf.Read(name.c_str(), wxT("ERROR")).c_str());

 
         cont = fileconf.GetNextEntry(name, dummy);
     }
 
         cont = fileconf.GetNextEntry(name, dummy);
     }

+
+    static const wxChar *testEntry = wxT("TestEntry");
+    wxPrintf(wxT("\nTesting deletion of newly created \"Test\" entry: "));
+    fileconf.Write(testEntry, wxT("A value"));
+    fileconf.DeleteEntry(testEntry);
+    wxPrintf(fileconf.HasEntry(testEntry) ? wxT("ERROR\n") : wxT("ok\n"));

 }
 
 #endif // TEST_FILECONF
 }
 
 #endif // TEST_FILECONF


@@ -760,196 +803,82 @@ static void TestFileConfRead()
 
 #include "wx/filename.h"
 
 
 #include "wx/filename.h"
 

-static void DumpFileName(const wxFileName& fn)
+#if 0
+static void DumpFileName(const wxChar *desc, const wxFileName& fn)

 {
 {

+    wxPuts(desc);
+

     wxString full = fn.GetFullPath();
 
     wxString vol, path, name, ext;
     wxFileName::SplitPath(full, &vol, &path, &name, &ext);
 
     wxString full = fn.GetFullPath();
 
     wxString vol, path, name, ext;
     wxFileName::SplitPath(full, &vol, &path, &name, &ext);
 

-    wxPrintf(_T("Filename '%s' -> vol '%s', path '%s', name '%s', ext '%s'\n"),
+    wxPrintf(wxT("'%s'-> vol '%s', path '%s', name '%s', ext '%s'\n"),

              full.c_str(), vol.c_str(), path.c_str(), name.c_str(), ext.c_str());
              full.c_str(), vol.c_str(), path.c_str(), name.c_str(), ext.c_str());

-}
-
-static struct FileNameInfo
-{
-    const wxChar *fullname;
-    const wxChar *volume;
-    const wxChar *path;
-    const wxChar *name;
-    const wxChar *ext;
-    bool isAbsolute;
-    wxPathFormat format;
-} filenames[] =
-{
-    // Unix file names
-    { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), TRUE, wxPATH_UNIX },
-    { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), TRUE, wxPATH_UNIX },
-    { _T("~/.zshrc"), _T(""), _T("~"), _T(".zshrc"), _T(""), TRUE, wxPATH_UNIX },
-    { _T("../../foo"), _T(""), _T("../.."), _T("foo"), _T(""), FALSE, wxPATH_UNIX },
-    { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_UNIX },
-    { _T("~/foo.bar"), _T(""), _T("~"), _T("foo"), _T("bar"), TRUE, wxPATH_UNIX },
-    { _T("/foo"), _T(""), _T("/"), _T("foo"), _T(""), TRUE, wxPATH_UNIX },
-    { _T("Mahogany-0.60/foo.bar"), _T(""), _T("Mahogany-0.60"), _T("foo"), _T("bar"), FALSE, wxPATH_UNIX },
-    { _T("/tmp/wxwin.tar.bz"), _T(""), _T("/tmp"), _T("wxwin.tar"), _T("bz"), TRUE, wxPATH_UNIX },
-
-    // Windows file names
-    { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
-    { _T("\\foo.bar"), _T(""), _T("\\"), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
-    { _T("c:foo.bar"), _T("c"), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
-    { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
-    { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), TRUE, wxPATH_DOS },
-    { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
-
-    // Mac file names
-    { _T("Volume:Dir:File"), _T("Volume"), _T("Dir"), _T("File"), _T(""), TRUE, wxPATH_MAC },
-    { _T("Volume:Dir:Subdir:File"), _T("Volume"), _T("Dir:Subdir"), _T("File"), _T(""), TRUE, wxPATH_MAC },
-    { _T("Volume:"), _T("Volume"), _T(""), _T(""), _T(""), TRUE, wxPATH_MAC },
-    { _T(":Dir:File"), _T(""), _T("Dir"), _T("File"), _T(""), FALSE, wxPATH_MAC },
-    { _T(":File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), FALSE, wxPATH_MAC },
-    { _T("File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), FALSE, wxPATH_MAC },
-
-    // VMS file names
-    { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), TRUE, wxPATH_VMS },
-    { _T("file.txt"), _T(""), _T(""), _T("file"), _T("txt"), FALSE, wxPATH_VMS },
-};

 
 

-static void TestFileNameConstruction()
-{
-    puts("*** testing wxFileName construction ***");
-
-    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
-    {
-        const FileNameInfo& fni = filenames[n];
-
-        wxFileName fn(fni.fullname, fni.format);
-
-        wxString fullname = fn.GetFullPath(fni.format);
-        if ( fullname != fni.fullname )
-        {
-            printf("ERROR: fullname should be '%s'\n", fni.fullname);
-        }
-
-        bool isAbsolute = fn.IsAbsolute();
-        printf("'%s' is %s (%s)\n\t",
-               fullname.c_str(),
-               isAbsolute ? "absolute" : "relative",
-               isAbsolute == fni.isAbsolute ? "ok" : "ERROR");
-
-        if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) )
-        {
-            puts("ERROR (couldn't be normalized)");
-        }
-        else
-        {
-            printf("normalized: '%s'\n", fn.GetFullPath(fni.format).c_str());
-        }
-    }
-
-    puts("");
-}
-
-static void TestFileNameSplit()
-{
-    puts("*** testing wxFileName splitting ***");
-
-    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+    wxFileName::SplitPath(full, &path, &name, &ext);
+    wxPrintf(wxT("or\t\t-> path '%s', name '%s', ext '%s'\n"),
+             path.c_str(), name.c_str(), ext.c_str());
+
+    wxPrintf(wxT("path is also:\t'%s'\n"), fn.GetPath().c_str());
+    wxPrintf(wxT("with volume: \t'%s'\n"),
+             fn.GetPath(wxPATH_GET_VOLUME).c_str());
+    wxPrintf(wxT("with separator:\t'%s'\n"),
+             fn.GetPath(wxPATH_GET_SEPARATOR).c_str());
+    wxPrintf(wxT("with both:   \t'%s'\n"),
+             fn.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).c_str());
+
+    wxPuts(wxT("The directories in the path are:"));
+    wxArrayString dirs = fn.GetDirs();
+    size_t count = dirs.GetCount();
+    for ( size_t n = 0; n < count; n++ )

     {
     {

-        const FileNameInfo& fni = filenames[n];
-        wxString volume, path, name, ext;
-        wxFileName::SplitPath(fni.fullname,
-                              &volume, &path, &name, &ext, fni.format);
-
-        printf("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'",
-               fni.fullname,
-               volume.c_str(), path.c_str(), name.c_str(), ext.c_str());
-
-        if ( volume != fni.volume )
-            printf(" (ERROR: volume = '%s')", fni.volume);
-        if ( path != fni.path )
-            printf(" (ERROR: path = '%s')", fni.path);
-        if ( name != fni.name )
-            printf(" (ERROR: name = '%s')", fni.name);
-        if ( ext != fni.ext )
-            printf(" (ERROR: ext = '%s')", fni.ext);
-
-        puts("");
+        wxPrintf(wxT("\t%u: %s\n"), n, dirs[n].c_str());

     }
 }
     }
 }

+#endif

 
 static void TestFileNameTemp()
 {
 
 static void TestFileNameTemp()
 {

-    puts("*** testing wxFileName temp file creation ***");
+    wxPuts(wxT("*** testing wxFileName temp file creation ***"));

 
 

-    static const char *tmpprefixes[] =
+    static const wxChar *tmpprefixes[] =

     {
     {

-        "foo",
-        "/tmp/foo",
-        "..",
-        "../bar",
-        "/tmp/foo/bar", // this one must be an error
+        wxT(""),
+        wxT("foo"),
+        wxT(".."),
+        wxT("../bar"),
+#ifdef __UNIX__
+        wxT("/tmp/foo"),
+        wxT("/tmp/foo/bar"), // this one must be an error
+#endif // __UNIX__

     };
 
     for ( size_t n = 0; n < WXSIZEOF(tmpprefixes); n++ )
     {
         wxString path = wxFileName::CreateTempFileName(tmpprefixes[n]);
     };
 
     for ( size_t n = 0; n < WXSIZEOF(tmpprefixes); n++ )
     {
         wxString path = wxFileName::CreateTempFileName(tmpprefixes[n]);

-        if ( !path.empty() )
+        if ( path.empty() )
+        {
+            // "error" is not in upper case because it may be ok
+            wxPrintf(wxT("Prefix '%s'\t-> error\n"), tmpprefixes[n]);
+        }
+        else

         {
         {

-            printf("Prefix '%s'\t-> temp file '%s'\n",
+            wxPrintf(wxT("Prefix '%s'\t-> temp file '%s'\n"),

                    tmpprefixes[n], path.c_str());
 
             if ( !wxRemoveFile(path) )
             {
                    tmpprefixes[n], path.c_str());
 
             if ( !wxRemoveFile(path) )
             {

-                wxLogWarning("Failed to remove temp file '%s'", path.c_str());
+                wxLogWarning(wxT("Failed to remove temp file '%s'"),
+                             path.c_str());

             }
         }
     }
 }
 
             }
         }
     }
 }
 

-static void TestFileNameMakeRelative()
+static void TestFileNameDirManip()

 {
 {

-    puts("*** testing wxFileName::MakeRelativeTo() ***");
-
-    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
-    {
-        const FileNameInfo& fni = filenames[n];
-
-        wxFileName fn(fni.fullname, fni.format);
-
-        // choose the base dir of the same format
-        wxString base;
-        switch ( fni.format )
-        {
-            case wxPATH_UNIX:
-                base = "/usr/bin/";
-                break;
-
-            case wxPATH_DOS:
-                base = "c:\\";
-                break;
-
-            case wxPATH_MAC:
-            case wxPATH_VMS:
-                // TODO: I don't know how this is supposed to work there
-                continue;
-
-            case wxPATH_NATIVE: // make gcc happy
-            default:
-                wxFAIL_MSG( "unexpected path format" );
-        }
-
-        printf("'%s' relative to '%s': ",
-               fn.GetFullPath(fni.format).c_str(), base.c_str());
-
-        if ( !fn.MakeRelativeTo(base, fni.format) )
-        {
-            puts("unchanged");
-        }
-        else
-        {
-            printf("'%s'\n", fn.GetFullPath(fni.format).c_str());
-        }
-    }
+    // TODO: test AppendDir(), RemoveDir(), ...

 }
 
 static void TestFileNameComparison()
 }
 
 static void TestFileNameComparison()


@@ -975,623 +904,360 @@ static void TestFileNameCwd()
 
 #ifdef TEST_FILETIME
 
 
 #ifdef TEST_FILETIME
 

-#include <wx/filename.h>
-#include <wx/datetime.h>
+#include "wx/filename.h"
+#include "wx/datetime.h"

 
 static void TestFileGetTimes()
 {
 
 static void TestFileGetTimes()
 {

-    wxFileName fn(_T("testdata.fc"));
+    wxFileName fn(wxT("testdata.fc"));

 
     wxDateTime dtAccess, dtMod, dtCreate;
     if ( !fn.GetTimes(&dtAccess, &dtMod, &dtCreate) )
     {
 
     wxDateTime dtAccess, dtMod, dtCreate;
     if ( !fn.GetTimes(&dtAccess, &dtMod, &dtCreate) )
     {

-        wxPrintf(_T("ERROR: GetTimes() failed.\n"));
+        wxPrintf(wxT("ERROR: GetTimes() failed.\n"));

     }
     else
     {
     }
     else
     {

-        static const wxChar *fmt = _T("%Y-%b-%d %H:%M:%S");
+        static const wxChar *fmt = wxT("%Y-%b-%d %H:%M:%S");

 
 

-        wxPrintf(_T("File times for '%s':\n"), fn.GetFullPath().c_str());
-        wxPrintf(_T("Creation:    \t%s\n"), dtCreate.Format(fmt).c_str());
-        wxPrintf(_T("Last read:   \t%s\n"), dtAccess.Format(fmt).c_str());
-        wxPrintf(_T("Last write:  \t%s\n"), dtMod.Format(fmt).c_str());
+        wxPrintf(wxT("File times for '%s':\n"), fn.GetFullPath().c_str());
+        wxPrintf(wxT("Creation:    \t%s\n"), dtCreate.Format(fmt).c_str());
+        wxPrintf(wxT("Last read:   \t%s\n"), dtAccess.Format(fmt).c_str());
+        wxPrintf(wxT("Last write:  \t%s\n"), dtMod.Format(fmt).c_str());

     }
 }
 
     }
 }
 

+#if 0

 static void TestFileSetTimes()
 {
 static void TestFileSetTimes()
 {

-    wxFileName fn(_T("testdata.fc"));
+    wxFileName fn(wxT("testdata.fc"));

 
     if ( !fn.Touch() )
     {
 
     if ( !fn.Touch() )
     {

-        wxPrintf(_T("ERROR: Touch() failed.\n"));
+        wxPrintf(wxT("ERROR: Touch() failed.\n"));

     }
 }
     }
 }

+#endif

 
 #endif // TEST_FILETIME
 
 // ----------------------------------------------------------------------------
 
 #endif // TEST_FILETIME
 
 // ----------------------------------------------------------------------------

-// wxHashTable
+// wxLocale

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

-#ifdef TEST_HASH
-
-#include "wx/hash.h"
+#ifdef TEST_LOCALE

 
 

-struct Foo
-{
-    Foo(int n_) { n = n_; count++; }
-    ~Foo() { count--; }
+#include "wx/intl.h"
+#include "wx/utils.h"   // for wxSetEnv

 
 

-    int n;
+static wxLocale gs_localeDefault;
+    // NOTE: don't init it here as it needs a wxAppTraits object
+    //       and thus must be init-ed after creation of the wxInitializer
+    //       class in the main()

 
 

-    static size_t count;
-};
+// find the name of the language from its value
+static const wxChar *GetLangName(int lang)
+{
+    static const wxChar *languageNames[] =
+    {
+        wxT("DEFAULT"),
+        wxT("UNKNOWN"),
+        wxT("ABKHAZIAN"),
+        wxT("AFAR"),
+        wxT("AFRIKAANS"),
+        wxT("ALBANIAN"),
+        wxT("AMHARIC"),
+        wxT("ARABIC"),
+        wxT("ARABIC_ALGERIA"),
+        wxT("ARABIC_BAHRAIN"),
+        wxT("ARABIC_EGYPT"),
+        wxT("ARABIC_IRAQ"),
+        wxT("ARABIC_JORDAN"),
+        wxT("ARABIC_KUWAIT"),
+        wxT("ARABIC_LEBANON"),
+        wxT("ARABIC_LIBYA"),
+        wxT("ARABIC_MOROCCO"),
+        wxT("ARABIC_OMAN"),
+        wxT("ARABIC_QATAR"),
+        wxT("ARABIC_SAUDI_ARABIA"),
+        wxT("ARABIC_SUDAN"),
+        wxT("ARABIC_SYRIA"),
+        wxT("ARABIC_TUNISIA"),
+        wxT("ARABIC_UAE"),
+        wxT("ARABIC_YEMEN"),
+        wxT("ARMENIAN"),
+        wxT("ASSAMESE"),
+        wxT("AYMARA"),
+        wxT("AZERI"),
+        wxT("AZERI_CYRILLIC"),
+        wxT("AZERI_LATIN"),
+        wxT("BASHKIR"),
+        wxT("BASQUE"),
+        wxT("BELARUSIAN"),
+        wxT("BENGALI"),
+        wxT("BHUTANI"),
+        wxT("BIHARI"),
+        wxT("BISLAMA"),
+        wxT("BRETON"),
+        wxT("BULGARIAN"),
+        wxT("BURMESE"),
+        wxT("CAMBODIAN"),
+        wxT("CATALAN"),
+        wxT("CHINESE"),
+        wxT("CHINESE_SIMPLIFIED"),
+        wxT("CHINESE_TRADITIONAL"),
+        wxT("CHINESE_HONGKONG"),
+        wxT("CHINESE_MACAU"),
+        wxT("CHINESE_SINGAPORE"),
+        wxT("CHINESE_TAIWAN"),
+        wxT("CORSICAN"),
+        wxT("CROATIAN"),
+        wxT("CZECH"),
+        wxT("DANISH"),
+        wxT("DUTCH"),
+        wxT("DUTCH_BELGIAN"),
+        wxT("ENGLISH"),
+        wxT("ENGLISH_UK"),
+        wxT("ENGLISH_US"),
+        wxT("ENGLISH_AUSTRALIA"),
+        wxT("ENGLISH_BELIZE"),
+        wxT("ENGLISH_BOTSWANA"),
+        wxT("ENGLISH_CANADA"),
+        wxT("ENGLISH_CARIBBEAN"),
+        wxT("ENGLISH_DENMARK"),
+        wxT("ENGLISH_EIRE"),
+        wxT("ENGLISH_JAMAICA"),
+        wxT("ENGLISH_NEW_ZEALAND"),
+        wxT("ENGLISH_PHILIPPINES"),
+        wxT("ENGLISH_SOUTH_AFRICA"),
+        wxT("ENGLISH_TRINIDAD"),
+        wxT("ENGLISH_ZIMBABWE"),
+        wxT("ESPERANTO"),
+        wxT("ESTONIAN"),
+        wxT("FAEROESE"),
+        wxT("FARSI"),
+        wxT("FIJI"),
+        wxT("FINNISH"),
+        wxT("FRENCH"),
+        wxT("FRENCH_BELGIAN"),
+        wxT("FRENCH_CANADIAN"),
+        wxT("FRENCH_LUXEMBOURG"),
+        wxT("FRENCH_MONACO"),
+        wxT("FRENCH_SWISS"),
+        wxT("FRISIAN"),
+        wxT("GALICIAN"),
+        wxT("GEORGIAN"),
+        wxT("GERMAN"),
+        wxT("GERMAN_AUSTRIAN"),
+        wxT("GERMAN_BELGIUM"),
+        wxT("GERMAN_LIECHTENSTEIN"),
+        wxT("GERMAN_LUXEMBOURG"),
+        wxT("GERMAN_SWISS"),
+        wxT("GREEK"),
+        wxT("GREENLANDIC"),
+        wxT("GUARANI"),
+        wxT("GUJARATI"),
+        wxT("HAUSA"),
+        wxT("HEBREW"),
+        wxT("HINDI"),
+        wxT("HUNGARIAN"),
+        wxT("ICELANDIC"),
+        wxT("INDONESIAN"),
+        wxT("INTERLINGUA"),
+        wxT("INTERLINGUE"),
+        wxT("INUKTITUT"),
+        wxT("INUPIAK"),
+        wxT("IRISH"),
+        wxT("ITALIAN"),
+        wxT("ITALIAN_SWISS"),
+        wxT("JAPANESE"),
+        wxT("JAVANESE"),
+        wxT("KANNADA"),
+        wxT("KASHMIRI"),
+        wxT("KASHMIRI_INDIA"),
+        wxT("KAZAKH"),
+        wxT("KERNEWEK"),
+        wxT("KINYARWANDA"),
+        wxT("KIRGHIZ"),
+        wxT("KIRUNDI"),
+        wxT("KONKANI"),
+        wxT("KOREAN"),
+        wxT("KURDISH"),
+        wxT("LAOTHIAN"),
+        wxT("LATIN"),
+        wxT("LATVIAN"),
+        wxT("LINGALA"),
+        wxT("LITHUANIAN"),
+        wxT("MACEDONIAN"),
+        wxT("MALAGASY"),
+        wxT("MALAY"),
+        wxT("MALAYALAM"),
+        wxT("MALAY_BRUNEI_DARUSSALAM"),
+        wxT("MALAY_MALAYSIA"),
+        wxT("MALTESE"),
+        wxT("MANIPURI"),
+        wxT("MAORI"),
+        wxT("MARATHI"),
+        wxT("MOLDAVIAN"),
+        wxT("MONGOLIAN"),
+        wxT("NAURU"),
+        wxT("NEPALI"),
+        wxT("NEPALI_INDIA"),
+        wxT("NORWEGIAN_BOKMAL"),
+        wxT("NORWEGIAN_NYNORSK"),
+        wxT("OCCITAN"),
+        wxT("ORIYA"),
+        wxT("OROMO"),
+        wxT("PASHTO"),
+        wxT("POLISH"),
+        wxT("PORTUGUESE"),
+        wxT("PORTUGUESE_BRAZILIAN"),
+        wxT("PUNJABI"),
+        wxT("QUECHUA"),
+        wxT("RHAETO_ROMANCE"),
+        wxT("ROMANIAN"),
+        wxT("RUSSIAN"),
+        wxT("RUSSIAN_UKRAINE"),
+        wxT("SAMOAN"),
+        wxT("SANGHO"),
+        wxT("SANSKRIT"),
+        wxT("SCOTS_GAELIC"),
+        wxT("SERBIAN"),
+        wxT("SERBIAN_CYRILLIC"),
+        wxT("SERBIAN_LATIN"),
+        wxT("SERBO_CROATIAN"),
+        wxT("SESOTHO"),
+        wxT("SETSWANA"),
+        wxT("SHONA"),
+        wxT("SINDHI"),
+        wxT("SINHALESE"),
+        wxT("SISWATI"),
+        wxT("SLOVAK"),
+        wxT("SLOVENIAN"),
+        wxT("SOMALI"),
+        wxT("SPANISH"),
+        wxT("SPANISH_ARGENTINA"),
+        wxT("SPANISH_BOLIVIA"),
+        wxT("SPANISH_CHILE"),
+        wxT("SPANISH_COLOMBIA"),
+        wxT("SPANISH_COSTA_RICA"),
+        wxT("SPANISH_DOMINICAN_REPUBLIC"),
+        wxT("SPANISH_ECUADOR"),
+        wxT("SPANISH_EL_SALVADOR"),
+        wxT("SPANISH_GUATEMALA"),
+        wxT("SPANISH_HONDURAS"),
+        wxT("SPANISH_MEXICAN"),
+        wxT("SPANISH_MODERN"),
+        wxT("SPANISH_NICARAGUA"),
+        wxT("SPANISH_PANAMA"),
+        wxT("SPANISH_PARAGUAY"),
+        wxT("SPANISH_PERU"),
+        wxT("SPANISH_PUERTO_RICO"),
+        wxT("SPANISH_URUGUAY"),
+        wxT("SPANISH_US"),
+        wxT("SPANISH_VENEZUELA"),
+        wxT("SUNDANESE"),
+        wxT("SWAHILI"),
+        wxT("SWEDISH"),
+        wxT("SWEDISH_FINLAND"),
+        wxT("TAGALOG"),
+        wxT("TAJIK"),
+        wxT("TAMIL"),
+        wxT("TATAR"),
+        wxT("TELUGU"),
+        wxT("THAI"),
+        wxT("TIBETAN"),
+        wxT("TIGRINYA"),
+        wxT("TONGA"),
+        wxT("TSONGA"),
+        wxT("TURKISH"),
+        wxT("TURKMEN"),
+        wxT("TWI"),
+        wxT("UIGHUR"),
+        wxT("UKRAINIAN"),
+        wxT("URDU"),
+        wxT("URDU_INDIA"),
+        wxT("URDU_PAKISTAN"),
+        wxT("UZBEK"),
+        wxT("UZBEK_CYRILLIC"),
+        wxT("UZBEK_LATIN"),
+        wxT("VIETNAMESE"),
+        wxT("VOLAPUK"),
+        wxT("WELSH"),
+        wxT("WOLOF"),
+        wxT("XHOSA"),
+        wxT("YIDDISH"),
+        wxT("YORUBA"),
+        wxT("ZHUANG"),
+        wxT("ZULU"),
+    };

 
 

-size_t Foo::count = 0;
+    if ( (size_t)lang < WXSIZEOF(languageNames) )
+        return languageNames[lang];
+    else
+        return wxT("INVALID");
+}

 
 

-WX_DECLARE_LIST(Foo, wxListFoos);
-WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
+static void TestDefaultLang()
+{
+    wxPuts(wxT("*** Testing wxLocale::GetSystemLanguage ***"));

 
 

-#include "wx/listimpl.cpp"
+    gs_localeDefault.Init(wxLANGUAGE_ENGLISH);

 
 

-WX_DEFINE_LIST(wxListFoos);
+    static const wxChar *langStrings[] =
+    {
+        NULL,               // system default
+        wxT("C"),
+        wxT("fr"),
+        wxT("fr_FR"),
+        wxT("en"),
+        wxT("en_GB"),
+        wxT("en_US"),
+        wxT("de_DE.iso88591"),
+        wxT("german"),
+        wxT("?"),            // invalid lang spec
+        wxT("klingonese"),   // I bet on some systems it does exist...
+    };

 
 

-static void TestHash()
-{
-    puts("*** Testing wxHashTable ***\n");
+    wxPrintf(wxT("The default system encoding is %s (%d)\n"),
+             wxLocale::GetSystemEncodingName().c_str(),
+             wxLocale::GetSystemEncoding());

 
 

+    for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ )

     {
     {

-        wxHashFoos hash;
-        hash.DeleteContents(TRUE);
+        const wxChar *langStr = langStrings[n];
+        if ( langStr )
+        {
+            // FIXME: this doesn't do anything at all under Windows, we need
+            //        to create a new wxLocale!
+            wxSetEnv(wxT("LC_ALL"), langStr);
+        }

 
 

-        printf("Hash created: %u foos in hash, %u foos totally\n",
-               hash.GetCount(), Foo::count);
+        int lang = gs_localeDefault.GetSystemLanguage();
+        wxPrintf(wxT("Locale for '%s' is %s.\n"),
+                 langStr ? langStr : wxT("system default"), GetLangName(lang));
+    }
+}

 
 

-        static const int hashTestData[] =
-        {
-            0, 1, 17, -2, 2, 4, -4, 345, 3, 3, 2, 1,
-        };
+#endif // TEST_LOCALE

 
 

-        size_t n;
-        for ( n = 0; n < WXSIZEOF(hashTestData); n++ )
-        {
-            hash.Put(hashTestData[n], n, new Foo(n));
-        }
+// ----------------------------------------------------------------------------
+// MIME types
+// ----------------------------------------------------------------------------

 
 

-        printf("Hash filled: %u foos in hash, %u foos totally\n",
-               hash.GetCount(), Foo::count);
-
-        puts("Hash access test:");
-        for ( n = 0; n < WXSIZEOF(hashTestData); n++ )
-        {
-            printf("\tGetting element with key %d, value %d: ",
-                   hashTestData[n], n);
-            Foo *foo = hash.Get(hashTestData[n], n);
-            if ( !foo )
-            {
-                printf("ERROR, not found.\n");
-            }
-            else
-            {
-                printf("%d (%s)\n", foo->n,
-                       (size_t)foo->n == n ? "ok" : "ERROR");
-            }
-        }
-
-        printf("\nTrying to get an element not in hash: ");
-
-        if ( hash.Get(1234) || hash.Get(1, 0) )
-        {
-            puts("ERROR: found!");
-        }
-        else
-        {
-            puts("ok (not found)");
-        }
-    }
-
-    printf("Hash destroyed: %u foos left\n", Foo::count);
-}
-
-#endif // TEST_HASH
-
-// ----------------------------------------------------------------------------
-// wxHashMap
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_HASHMAP
-
-#include "wx/hashmap.h"
-
-// test compilation of basic map types
-WX_DECLARE_HASH_MAP( int*, int*, wxPointerHash, wxPointerEqual, myPtrHashMap );
-WX_DECLARE_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual, myLongHashMap );
-WX_DECLARE_HASH_MAP( unsigned long, unsigned, wxIntegerHash, wxIntegerEqual,
-                     myUnsignedHashMap );
-WX_DECLARE_HASH_MAP( unsigned int, unsigned, wxIntegerHash, wxIntegerEqual,
-                     myTestHashMap1 );
-WX_DECLARE_HASH_MAP( int, unsigned, wxIntegerHash, wxIntegerEqual,
-                     myTestHashMap2 );
-WX_DECLARE_HASH_MAP( short, unsigned, wxIntegerHash, wxIntegerEqual,
-                     myTestHashMap3 );
-WX_DECLARE_HASH_MAP( unsigned short, unsigned, wxIntegerHash, wxIntegerEqual,
-                     myTestHashMap4 );
-
-// same as:
-// WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual,
-//                      myStringHashMap );
-WX_DECLARE_STRING_HASH_MAP(wxString, myStringHashMap);
-
-typedef myStringHashMap::iterator Itor;
-
-static void TestHashMap()
-{
-    puts("*** Testing wxHashMap ***\n");
-    myStringHashMap sh(0); // as small as possible
-    wxString buf;
-    size_t i;
-    const size_t count = 10000;
-
-    // init with some data
-    for( i = 0; i < count; ++i )
-    {
-        buf.Printf(wxT("%d"), i );
-        sh[buf] = wxT("A") + buf + wxT("C");
-    }
-
-    // test that insertion worked
-    if( sh.size() != count )
-    {
-        printf("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n", sh.size(), count);
-    }
-
-    for( i = 0; i < count; ++i )
-    {
-        buf.Printf(wxT("%d"), i );
-        if( sh[buf] != wxT("A") + buf + wxT("C") )
-        {
-            printf("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n");
-            return;
-        }
-    }
-
-    // check that iterators work
-    Itor it;
-    for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i )
-    {
-        if( i == count )
-        {
-            printf("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n");
-            return;
-        }
-
-        if( it->second != sh[it->first] )
-        {
-            printf("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n");
-            return;
-        }
-    }
-
-    if( sh.size() != i )
-    {
-        printf("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n", i, count);
-    }
-
-    // test copy ctor, assignment operator
-    myStringHashMap h1( sh ), h2( 0 );
-    h2 = sh;
-
-    for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i )
-    {
-        if( h1[it->first] != it->second )
-        {
-            printf("*** ERROR: COPY CTOR BROKEN %s ***\n", it->first.c_str());
-        }
-
-        if( h2[it->first] != it->second )
-        {
-            printf("*** ERROR: OPERATOR= BROKEN %s ***\n", it->first.c_str());
-        }
-    }
-
-    // other tests
-    for( i = 0; i < count; ++i )
-    {
-        buf.Printf(wxT("%d"), i );
-        size_t sz = sh.size();
-
-        // test find() and erase(it)
-        if( i < 100 )
-        {
-            it = sh.find( buf );
-            if( it != sh.end() )
-            {
-                sh.erase( it );
-
-                if( sh.find( buf ) != sh.end() )
-                {
-                    printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
-                }
-            }
-            else
-                printf("*** ERROR: CANT FIND ELEMENT %u ***\n", i);
-        }
-        else
-        // test erase(key)
-        {
-            size_t c = sh.erase( buf );
-            if( c != 1 )
-                printf("*** ERROR: SHOULD RETURN 1 ***\n");
-
-            if( sh.find( buf ) != sh.end() )
-            {
-                printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
-            }
-        }
-
-        // count should decrease
-        if( sh.size() != sz - 1 )
-        {
-            printf("*** ERROR: COUNT DID NOT DECREASE ***\n");
-        }
-    }
-
-    printf("*** Finished testing wxHashMap ***\n");
-}
-
-#endif // TEST_HASHMAP
-
-// ----------------------------------------------------------------------------
-// wxList
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_LIST
-
-#include "wx/list.h"
-
-WX_DECLARE_LIST(Bar, wxListBars);
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListBars);
-
-static void TestListCtor()
-{
-    puts("*** Testing wxList construction ***\n");
-
-    {
-        wxListBars list1;
-        list1.Append(new Bar(_T("first")));
-        list1.Append(new Bar(_T("second")));
-
-        printf("After 1st list creation: %u objects in the list, %u objects total.\n",
-               list1.GetCount(), Bar::GetNumber());
-
-        wxListBars list2;
-        list2 = list1;
-
-        printf("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n",
-               list1.GetCount(), list2.GetCount(), Bar::GetNumber());
-
-        list1.DeleteContents(TRUE);
-    }
-
-    printf("After list destruction: %u objects left.\n", Bar::GetNumber());
-}
-
-#endif // TEST_LIST
-
-// ----------------------------------------------------------------------------
-// wxLocale
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_LOCALE
-
-#include "wx/intl.h"
-#include "wx/utils.h"   // for wxSetEnv
-
-static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH);
-
-// find the name of the language from its value
-static const char *GetLangName(int lang)
-{
-    static const char *languageNames[] =
-    {
-        "DEFAULT",
-        "UNKNOWN",
-        "ABKHAZIAN",
-        "AFAR",
-        "AFRIKAANS",
-        "ALBANIAN",
-        "AMHARIC",
-        "ARABIC",
-        "ARABIC_ALGERIA",
-        "ARABIC_BAHRAIN",
-        "ARABIC_EGYPT",
-        "ARABIC_IRAQ",
-        "ARABIC_JORDAN",
-        "ARABIC_KUWAIT",
-        "ARABIC_LEBANON",
-        "ARABIC_LIBYA",
-        "ARABIC_MOROCCO",
-        "ARABIC_OMAN",
-        "ARABIC_QATAR",
-        "ARABIC_SAUDI_ARABIA",
-        "ARABIC_SUDAN",
-        "ARABIC_SYRIA",
-        "ARABIC_TUNISIA",
-        "ARABIC_UAE",
-        "ARABIC_YEMEN",
-        "ARMENIAN",
-        "ASSAMESE",
-        "AYMARA",
-        "AZERI",
-        "AZERI_CYRILLIC",
-        "AZERI_LATIN",
-        "BASHKIR",
-        "BASQUE",
-        "BELARUSIAN",
-        "BENGALI",
-        "BHUTANI",
-        "BIHARI",
-        "BISLAMA",
-        "BRETON",
-        "BULGARIAN",
-        "BURMESE",
-        "CAMBODIAN",
-        "CATALAN",
-        "CHINESE",
-        "CHINESE_SIMPLIFIED",
-        "CHINESE_TRADITIONAL",
-        "CHINESE_HONGKONG",
-        "CHINESE_MACAU",
-        "CHINESE_SINGAPORE",
-        "CHINESE_TAIWAN",
-        "CORSICAN",
-        "CROATIAN",
-        "CZECH",
-        "DANISH",
-        "DUTCH",
-        "DUTCH_BELGIAN",
-        "ENGLISH",
-        "ENGLISH_UK",
-        "ENGLISH_US",
-        "ENGLISH_AUSTRALIA",
-        "ENGLISH_BELIZE",
-        "ENGLISH_BOTSWANA",
-        "ENGLISH_CANADA",
-        "ENGLISH_CARIBBEAN",
-        "ENGLISH_DENMARK",
-        "ENGLISH_EIRE",
-        "ENGLISH_JAMAICA",
-        "ENGLISH_NEW_ZEALAND",
-        "ENGLISH_PHILIPPINES",
-        "ENGLISH_SOUTH_AFRICA",
-        "ENGLISH_TRINIDAD",
-        "ENGLISH_ZIMBABWE",
-        "ESPERANTO",
-        "ESTONIAN",
-        "FAEROESE",
-        "FARSI",
-        "FIJI",
-        "FINNISH",
-        "FRENCH",
-        "FRENCH_BELGIAN",
-        "FRENCH_CANADIAN",
-        "FRENCH_LUXEMBOURG",
-        "FRENCH_MONACO",
-        "FRENCH_SWISS",
-        "FRISIAN",
-        "GALICIAN",
-        "GEORGIAN",
-        "GERMAN",
-        "GERMAN_AUSTRIAN",
-        "GERMAN_BELGIUM",
-        "GERMAN_LIECHTENSTEIN",
-        "GERMAN_LUXEMBOURG",
-        "GERMAN_SWISS",
-        "GREEK",
-        "GREENLANDIC",
-        "GUARANI",
-        "GUJARATI",
-        "HAUSA",
-        "HEBREW",
-        "HINDI",
-        "HUNGARIAN",
-        "ICELANDIC",
-        "INDONESIAN",
-        "INTERLINGUA",
-        "INTERLINGUE",
-        "INUKTITUT",
-        "INUPIAK",
-        "IRISH",
-        "ITALIAN",
-        "ITALIAN_SWISS",
-        "JAPANESE",
-        "JAVANESE",
-        "KANNADA",
-        "KASHMIRI",
-        "KASHMIRI_INDIA",
-        "KAZAKH",
-        "KERNEWEK",
-        "KINYARWANDA",
-        "KIRGHIZ",
-        "KIRUNDI",
-        "KONKANI",
-        "KOREAN",
-        "KURDISH",
-        "LAOTHIAN",
-        "LATIN",
-        "LATVIAN",
-        "LINGALA",
-        "LITHUANIAN",
-        "MACEDONIAN",
-        "MALAGASY",
-        "MALAY",
-        "MALAYALAM",
-        "MALAY_BRUNEI_DARUSSALAM",
-        "MALAY_MALAYSIA",
-        "MALTESE",
-        "MANIPURI",
-        "MAORI",
-        "MARATHI",
-        "MOLDAVIAN",
-        "MONGOLIAN",
-        "NAURU",
-        "NEPALI",
-        "NEPALI_INDIA",
-        "NORWEGIAN_BOKMAL",
-        "NORWEGIAN_NYNORSK",
-        "OCCITAN",
-        "ORIYA",
-        "OROMO",
-        "PASHTO",
-        "POLISH",
-        "PORTUGUESE",
-        "PORTUGUESE_BRAZILIAN",
-        "PUNJABI",
-        "QUECHUA",
-        "RHAETO_ROMANCE",
-        "ROMANIAN",
-        "RUSSIAN",
-        "RUSSIAN_UKRAINE",
-        "SAMOAN",
-        "SANGHO",
-        "SANSKRIT",
-        "SCOTS_GAELIC",
-        "SERBIAN",
-        "SERBIAN_CYRILLIC",
-        "SERBIAN_LATIN",
-        "SERBO_CROATIAN",
-        "SESOTHO",
-        "SETSWANA",
-        "SHONA",
-        "SINDHI",
-        "SINHALESE",
-        "SISWATI",
-        "SLOVAK",
-        "SLOVENIAN",
-        "SOMALI",
-        "SPANISH",
-        "SPANISH_ARGENTINA",
-        "SPANISH_BOLIVIA",
-        "SPANISH_CHILE",
-        "SPANISH_COLOMBIA",
-        "SPANISH_COSTA_RICA",
-        "SPANISH_DOMINICAN_REPUBLIC",
-        "SPANISH_ECUADOR",
-        "SPANISH_EL_SALVADOR",
-        "SPANISH_GUATEMALA",
-        "SPANISH_HONDURAS",
-        "SPANISH_MEXICAN",
-        "SPANISH_MODERN",
-        "SPANISH_NICARAGUA",
-        "SPANISH_PANAMA",
-        "SPANISH_PARAGUAY",
-        "SPANISH_PERU",
-        "SPANISH_PUERTO_RICO",
-        "SPANISH_URUGUAY",
-        "SPANISH_US",
-        "SPANISH_VENEZUELA",
-        "SUNDANESE",
-        "SWAHILI",
-        "SWEDISH",
-        "SWEDISH_FINLAND",
-        "TAGALOG",
-        "TAJIK",
-        "TAMIL",
-        "TATAR",
-        "TELUGU",
-        "THAI",
-        "TIBETAN",
-        "TIGRINYA",
-        "TONGA",
-        "TSONGA",
-        "TURKISH",
-        "TURKMEN",
-        "TWI",
-        "UIGHUR",
-        "UKRAINIAN",
-        "URDU",
-        "URDU_INDIA",
-        "URDU_PAKISTAN",
-        "UZBEK",
-        "UZBEK_CYRILLIC",
-        "UZBEK_LATIN",
-        "VIETNAMESE",
-        "VOLAPUK",
-        "WELSH",
-        "WOLOF",
-        "XHOSA",
-        "YIDDISH",
-        "YORUBA",
-        "ZHUANG",
-        "ZULU",
-    };
-
-    if ( (size_t)lang < WXSIZEOF(languageNames) )
-        return languageNames[lang];
-    else
-        return "INVALID";
-}
-
-static void TestDefaultLang()
-{
-    puts("*** Testing wxLocale::GetSystemLanguage ***");
-
-    static const wxChar *langStrings[] =
-    {
-        NULL,               // system default
-        _T("C"),
-        _T("fr"),
-        _T("fr_FR"),
-        _T("en"),
-        _T("en_GB"),
-        _T("en_US"),
-        _T("de_DE.iso88591"),
-        _T("german"),
-        _T("?"),            // invalid lang spec
-        _T("klingonese"),   // I bet on some systems it does exist...
-    };
-
-    wxPrintf(_T("The default system encoding is %s (%d)\n"),
-             wxLocale::GetSystemEncodingName().c_str(),
-             wxLocale::GetSystemEncoding());
-
-    for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ )
-    {
-        const char *langStr = langStrings[n];
-        if ( langStr )
-        {
-            // FIXME: this doesn't do anything at all under Windows, we need
-            //        to create a new wxLocale!
-            wxSetEnv(_T("LC_ALL"), langStr);
-        }
-
-        int lang = gs_localeDefault.GetSystemLanguage();
-        printf("Locale for '%s' is %s.\n",
-               langStr ? langStr : "system default", GetLangName(lang));
-    }
-}
-
-#endif // TEST_LOCALE
-
-// ----------------------------------------------------------------------------
-// MIME types
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_MIME
+#ifdef TEST_MIME

 
 #include "wx/mimetype.h"
 
 static void TestMimeEnum()
 {
 
 #include "wx/mimetype.h"
 
 static void TestMimeEnum()
 {

-    wxPuts(_T("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));
+    wxPuts(wxT("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));

 
     wxArrayString mimetypes;
 
     size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
 
 
     wxArrayString mimetypes;
 
     size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
 

-    printf("*** All %u known filetypes: ***\n", count);
+    wxPrintf(wxT("*** All %u known filetypes: ***\n"), count);

 
     wxArrayString exts;
     wxString desc;
 
     wxArrayString exts;
     wxString desc;


@@ -1602,7 +1268,7 @@ static void TestMimeEnum()
             wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
         if ( !filetype )
         {
             wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
         if ( !filetype )
         {

-            printf("nothing known about the filetype '%s'!\n",
+            wxPrintf(wxT("nothing known about the filetype '%s'!\n"),

                    mimetypes[n].c_str());
             continue;
         }
                    mimetypes[n].c_str());
             continue;
         }


@@ -1616,102 +1282,108 @@ static void TestMimeEnum()
         for ( size_t e = 0; e < exts.GetCount(); e++ )
         {
             if ( e > 0 )
         for ( size_t e = 0; e < exts.GetCount(); e++ )
         {
             if ( e > 0 )

-                extsAll << _T(", ");
+                extsAll << wxT(", ");

             extsAll += exts[e];
         }
 
             extsAll += exts[e];
         }
 

-        printf("\t%s: %s (%s)\n",
+        wxPrintf(wxT("\t%s: %s (%s)\n"),

                mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
     }
 
                mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
     }
 

-    puts("");
-}
-
-static void TestMimeOverride()
-{
-    wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n"));
-
-    static const wxChar *mailcap = _T("/tmp/mailcap");
-    static const wxChar *mimetypes = _T("/tmp/mime.types");
-
-    if ( wxFile::Exists(mailcap) )
-        wxPrintf(_T("Loading mailcap from '%s': %s\n"),
-                 mailcap,
-                 wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR"));
-    else
-        wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"),
-                 mailcap);
-
-    if ( wxFile::Exists(mimetypes) )
-        wxPrintf(_T("Loading mime.types from '%s': %s\n"),
-                 mimetypes,
-                 wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR"));
-    else
-        wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
-                 mimetypes);
-
-    puts("");
+    wxPuts(wxEmptyString);

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

-    wxPuts(_T("*** Testing MIME type from filename query ***\n"));
+    wxPuts(wxT("*** Testing MIME type from filename query ***\n"));

 
     static const wxChar *filenames[] =
     {
 
     static const wxChar *filenames[] =
     {

-        _T("readme.txt"),
-        _T("document.pdf"),
-        _T("image.gif"),
+        wxT("readme.txt"),
+        wxT("document.pdf"),
+        wxT("image.gif"),
+        wxT("picture.jpeg"),

     };
 
     for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
     {
         const wxString fname = filenames[n];
     };
 
     for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
     {
         const wxString fname = filenames[n];

-        wxString ext = fname.AfterLast(_T('.'));
+        wxString ext = fname.AfterLast(wxT('.'));

         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft )
         {
         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft )
         {

-            wxPrintf(_T("WARNING: extension '%s' is unknown.\n"), ext.c_str());
+            wxPrintf(wxT("WARNING: extension '%s' is unknown.\n"), ext.c_str());

         }
         else
         {
             wxString desc;
             if ( !ft->GetDescription(&desc) )
         }
         else
         {
             wxString desc;
             if ( !ft->GetDescription(&desc) )

-                desc = _T("<no description>");
+                desc = wxT("<no description>");

 
             wxString cmd;
             if ( !ft->GetOpenCommand(&cmd,
 
             wxString cmd;
             if ( !ft->GetOpenCommand(&cmd,

-                                     wxFileType::MessageParameters(fname, _T(""))) )
-                cmd = _T("<no command available>");
+                                     wxFileType::MessageParameters(fname, wxEmptyString)) )
+                cmd = wxT("<no command available>");
+            else
+                cmd = wxString(wxT('"')) + cmd + wxT('"');

 
 

-            wxPrintf(_T("To open %s (%s) do '%s'.\n"),
+            wxPrintf(wxT("To open %s (%s) do %s.\n"),

                      fname.c_str(), desc.c_str(), cmd.c_str());
 
             delete ft;
         }
     }
 
                      fname.c_str(), desc.c_str(), cmd.c_str());
 
             delete ft;
         }
     }
 

-    puts("");
+    wxPuts(wxEmptyString);
+}
+
+// these tests were broken by wxMimeTypesManager changes, temporarily disabling
+#if 0
+
+static void TestMimeOverride()
+{
+    wxPuts(wxT("*** Testing wxMimeTypesManager additional files loading ***\n"));
+
+    static const wxChar *mailcap = wxT("/tmp/mailcap");
+    static const wxChar *mimetypes = wxT("/tmp/mime.types");
+
+    if ( wxFile::Exists(mailcap) )
+        wxPrintf(wxT("Loading mailcap from '%s': %s\n"),
+                 mailcap,
+                 wxTheMimeTypesManager->ReadMailcap(mailcap) ? wxT("ok") : wxT("ERROR"));
+    else
+        wxPrintf(wxT("WARN: mailcap file '%s' doesn't exist, not loaded.\n"),
+                 mailcap);
+
+    if ( wxFile::Exists(mimetypes) )
+        wxPrintf(wxT("Loading mime.types from '%s': %s\n"),
+                 mimetypes,
+                 wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? wxT("ok") : wxT("ERROR"));
+    else
+        wxPrintf(wxT("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
+                 mimetypes);
+
+    wxPuts(wxEmptyString);

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

-    wxPuts(_T("*** Testing creation of filetype association ***\n"));
+    wxPuts(wxT("*** Testing creation of filetype association ***\n"));

 
     wxFileTypeInfo ftInfo(
 
     wxFileTypeInfo ftInfo(

-                            _T("application/x-xyz"),
-                            _T("xyzview '%s'"), // open cmd
-                            _T(""),             // print cmd
-                            _T("XYZ File"),     // description
-                            _T(".xyz"),         // extensions
-                            NULL                // end of extensions
+                            wxT("application/x-xyz"),
+                            wxT("xyzview '%s'"), // open cmd
+                            wxT(""),             // print cmd
+                            wxT("XYZ File"),     // description
+                            wxT(".xyz"),         // extensions
+                            wxNullPtr           // end of extensions

                          );
                          );

-    ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only
+    ftInfo.SetShortDesc(wxT("XYZFile")); // used under Win32 only

 
     wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
     if ( !ft )
     {
 
     wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
     if ( !ft )
     {

-        wxPuts(_T("ERROR: failed to create association!"));
+        wxPuts(wxT("ERROR: failed to create association!"));

     }
     else
     {
     }
     else
     {


@@ -1719,11 +1391,87 @@ static void TestMimeAssociate()
         delete ft;
     }
 
         delete ft;
     }
 

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

 }
 
 }
 

+#endif // 0
+

 #endif // TEST_MIME
 
 #endif // TEST_MIME
 

+// ----------------------------------------------------------------------------
+// module dependencies feature
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_MODULE
+
+#include "wx/module.h"
+
+class wxTestModule : public wxModule
+{
+protected:
+    virtual bool OnInit() { wxPrintf(wxT("Load module: %s\n"), GetClassInfo()->GetClassName()); return true; }
+    virtual void OnExit() { wxPrintf(wxT("Unload module: %s\n"), GetClassInfo()->GetClassName()); }
+};
+
+class wxTestModuleA : public wxTestModule
+{
+public:
+    wxTestModuleA();
+private:
+    DECLARE_DYNAMIC_CLASS(wxTestModuleA)
+};
+
+class wxTestModuleB : public wxTestModule
+{
+public:
+    wxTestModuleB();
+private:
+    DECLARE_DYNAMIC_CLASS(wxTestModuleB)
+};
+
+class wxTestModuleC : public wxTestModule
+{
+public:
+    wxTestModuleC();
+private:
+    DECLARE_DYNAMIC_CLASS(wxTestModuleC)
+};
+
+class wxTestModuleD : public wxTestModule
+{
+public:
+    wxTestModuleD();
+private:
+    DECLARE_DYNAMIC_CLASS(wxTestModuleD)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTestModuleC, wxModule)
+wxTestModuleC::wxTestModuleC()
+{
+    AddDependency(CLASSINFO(wxTestModuleD));
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxTestModuleA, wxModule)
+wxTestModuleA::wxTestModuleA()
+{
+    AddDependency(CLASSINFO(wxTestModuleB));
+    AddDependency(CLASSINFO(wxTestModuleD));
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxTestModuleD, wxModule)
+wxTestModuleD::wxTestModuleD()
+{
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxTestModuleB, wxModule)
+wxTestModuleB::wxTestModuleB()
+{
+    AddDependency(CLASSINFO(wxTestModuleD));
+    AddDependency(CLASSINFO(wxTestModuleC));
+}
+
+#endif // TEST_MODULE
+

 // ----------------------------------------------------------------------------
 // misc information functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // misc information functions
 // ----------------------------------------------------------------------------


@@ -1732,642 +1480,553 @@ static void TestMimeAssociate()
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

+#if TEST_INTERACTIVE

 static void TestDiskInfo()
 {
 static void TestDiskInfo()
 {

-    puts("*** Testing wxGetDiskSpace() ***");
+    wxPuts(wxT("*** Testing wxGetDiskSpace() ***"));

 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        char pathname[128];
-        printf("\nEnter a directory name: ");
-        if ( !fgets(pathname, WXSIZEOF(pathname), stdin) )
+        wxChar pathname[128];
+        wxPrintf(wxT("\nEnter a directory name: "));
+        if ( !wxFgets(pathname, WXSIZEOF(pathname), stdin) )

             break;
 
         // kill the last '\n'
             break;
 
         // kill the last '\n'

-        pathname[strlen(pathname) - 1] = 0;
+        pathname[wxStrlen(pathname) - 1] = 0;

 
         wxLongLong total, free;
         if ( !wxGetDiskSpace(pathname, &total, &free) )
         {
 
         wxLongLong total, free;
         if ( !wxGetDiskSpace(pathname, &total, &free) )
         {

-            wxPuts(_T("ERROR: wxGetDiskSpace failed."));
+            wxPuts(wxT("ERROR: wxGetDiskSpace failed."));

         }
         else
         {
         }
         else
         {

-            wxPrintf(_T("%sKb total, %sKb free on '%s'.\n"),
+            wxPrintf(wxT("%sKb total, %sKb free on '%s'.\n"),

                     (total / 1024).ToString().c_str(),
                     (free / 1024).ToString().c_str(),
                     pathname);
         }
     }
 }
                     (total / 1024).ToString().c_str(),
                     (free / 1024).ToString().c_str(),
                     pathname);
         }
     }
 }

+#endif // TEST_INTERACTIVE

 
 static void TestOsInfo()
 {
 
 static void TestOsInfo()
 {

-    puts("*** Testing OS info functions ***\n");
+    wxPuts(wxT("*** Testing OS info functions ***\n"));

 
     int major, minor;
     wxGetOsVersion(&major, &minor);
 
     int major, minor;
     wxGetOsVersion(&major, &minor);

-    printf("Running under: %s, version %d.%d\n",
+    wxPrintf(wxT("Running under: %s, version %d.%d\n"),

             wxGetOsDescription().c_str(), major, minor);
 
             wxGetOsDescription().c_str(), major, minor);
 

-    printf("%ld free bytes of memory left.\n", wxGetFreeMemory());
+    wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong());

 
 

-    printf("Host name is %s (%s).\n",
+    wxPrintf(wxT("Host name is %s (%s).\n"),

            wxGetHostName().c_str(), wxGetFullHostName().c_str());
 
            wxGetHostName().c_str(), wxGetFullHostName().c_str());
 

-    puts("");
+    wxPuts(wxEmptyString);
+}
+
+static void TestPlatformInfo()
+{
+    wxPuts(wxT("*** Testing wxPlatformInfo functions ***\n"));
+
+    // get this platform
+    wxPlatformInfo plat;
+
+    wxPrintf(wxT("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str());
+    wxPrintf(wxT("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str());
+    wxPrintf(wxT("Port ID name is: %s\n"), plat.GetPortIdName().c_str());
+    wxPrintf(wxT("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str());
+    wxPrintf(wxT("Architecture is: %s\n"), plat.GetArchName().c_str());
+    wxPrintf(wxT("Endianness is: %s\n"), plat.GetEndiannessName().c_str());
+
+    wxPuts(wxEmptyString);

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

-    puts("*** Testing user info functions ***\n");
+    wxPuts(wxT("*** Testing user info functions ***\n"));

 
 

-    printf("User id is:\t%s\n", wxGetUserId().c_str());
-    printf("User name is:\t%s\n", wxGetUserName().c_str());
-    printf("Home dir is:\t%s\n", wxGetHomeDir().c_str());
-    printf("Email address:\t%s\n", wxGetEmailAddress().c_str());
+    wxPrintf(wxT("User id is:\t%s\n"), wxGetUserId().c_str());
+    wxPrintf(wxT("User name is:\t%s\n"), wxGetUserName().c_str());
+    wxPrintf(wxT("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
+    wxPrintf(wxT("Email address:\t%s\n"), wxGetEmailAddress().c_str());

 
 

-    puts("");
+    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 wxT("ls")
+#else
+    #define CMD_IN_PATH wxT("command.com")
+#endif

 
 

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

 {
 {

-    static const long max = 100000000;
-    long n;
+    wxPuts(wxT("*** Testing wxPathList ***\n"));

 
 

+    wxPathList pathlist;
+    pathlist.AddEnvList(wxT("PATH"));
+    wxString path = pathlist.FindValidPath(CMD_IN_PATH);
+    if ( path.empty() )

     {
     {

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

     }
     }

-
-#if wxUSE_LONGLONG_NATIVE
-    {
-        wxStopWatch sw;
-
-        wxLongLong_t l = 0;
-        for ( n = 0; n < max; n++ )
-        {
-            l += n;
-        }
-
-        printf("Summing wxLongLong_t took %ld milliseconds.\n", sw.Time());
-    }
-#endif // wxUSE_LONGLONG_NATIVE
-
+    else

     {
     {

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

     }
 }
 
     }
 }
 

-static void TestLongLongConversion()
-{
-    puts("*** 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, "conversions failure" );
-#else
-        puts("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++;
-    }
+#if defined TEST_REGEX && TEST_INTERACTIVE

 
 

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

 
 

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

 {
 {

-    puts("*** Testing wxLongLong multiplication ***\n");
+    wxPuts(wxT("*** 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, "multiplication failure" );
-#else // !wxUSE_LONGLONG_NATIVE
-        puts("Can't do it without native long long type, test skipped.");
+        wxChar pattern[128];
+        wxPrintf(wxT("\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++;
-    }
-
-    puts(" done!");
-}
-
-static void TestDivision()
-{
-    puts("*** 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(wxT("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(wxT("No match.\n"));
+            }
+            else
+            {
+                wxPrintf(wxT("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());

 
 

-        wxLongLongNative p = m / l, s = m % l;
-        wxASSERT_MSG( q == p && r == s, "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(wxT("Subexpr %u matched '%s'\n"),
+                             n, wxString(text + start, len).c_str());
+                }
+            }

         }
         }

-
-        nTested++;

     }
     }

-
-    puts(" done!");

 }
 
 }
 

-static void TestAddition()
-{
-    puts("*** 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;
-
-#if wxUSE_LONGLONG_NATIVE
-        wxASSERT_MSG( c == wxLongLongNative(a.GetHi(), a.GetLo()) +
-                           wxLongLongNative(b.GetHi(), b.GetLo()),
-                      "addition failure" );
-#else // !wxUSE_LONGLONG_NATIVE
-        wxASSERT_MSG( c - b == a, "addition failure" );
-#endif // wxUSE_LONGLONG_NATIVE
-
-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
-        }
+#endif // TEST_REGEX

 
 

-        nTested++;
-    }
+// ----------------------------------------------------------------------------
+// printf() tests
+// ----------------------------------------------------------------------------

 
 

-    puts(" done!");
-}
+/*
+   NB: this stuff was taken from the glibc test suite and modified to build
+       in wxWidgets: if I read the copyright below properly, this shouldn't
+       be a problem
+ */

 
 

-static void TestBitOperations()
-{
-    puts("*** Testing wxLongLong bit operation ***\n");
+#ifdef TEST_PRINTF

 
 

-    wxLongLong ll;
-    size_t nTested = 0;
-    for ( size_t n = 0; n < 100000; n++ )
-    {
-        ll = RAND_LL();
+#ifdef wxTEST_PRINTF
+    // use our functions from wxchar.cpp
+    #undef wxPrintf
+    #undef wxSprintf

 
 

-#if wxUSE_LONGLONG_NATIVE
-        for ( size_t n = 0; n < 33; n++ )
-        {
-        }
-#else // !wxUSE_LONGLONG_NATIVE
-        puts("Can't do it without native long long type, test skipped.");
+    // NB: do _not_ use WX_ATTRIBUTE_PRINTF here, we have some invalid formats
+    //     in the tests below
+    int wxPrintf( const wxChar *format, ... );
+    int wxSprintf( wxChar *str, const wxChar *format, ... );
+#endif

 
 

-        return;
-#endif // wxUSE_LONGLONG_NATIVE
+#include "wx/longlong.h"

 
 

-        if ( !(nTested % 1000) )
-        {
-            putchar('.');
-            fflush(stdout);
-        }
+#include <float.h>

 
 

-        nTested++;
-    }
+static void rfg1 (void);
+static void rfg2 (void);

 
 

-    puts(" done!");
-}

 
 

-static void TestLongLongComparison()
+static void
+fmtchk (const wxChar *fmt)

 {
 {

-#if wxUSE_LONGLONG_WX
-    puts("*** 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];
-            printf("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];
-            printf("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];
-            printf("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
+  (void) wxPrintf(wxT("%s:\t`"), fmt);
+  (void) wxPrintf(fmt, 0x12);
+  (void) wxPrintf(wxT("'\n"));

 }
 
 }
 

-static void TestLongLongPrint()
+static void
+fmtst1chk (const wxChar *fmt)

 {
 {

-    wxPuts(_T("*** Testing wxLongLong printing ***\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());
+  (void) wxPrintf(wxT("%s:\t`"), fmt);
+  (void) wxPrintf(fmt, 4, 0x12);
+  (void) wxPrintf(wxT("'\n"));

 }
 
 }
 

-#undef MAKE_LL
-#undef RAND_LL
-
-#endif // TEST_LONGLONG
-
-// ----------------------------------------------------------------------------
-// path list
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_PATHLIST
-
-static void TestPathList()
+static void
+fmtst2chk (const wxChar *fmt)

 {
 {

-    puts("*** Testing wxPathList ***\n");
-
-    wxPathList pathlist;
-    pathlist.AddEnvList("PATH");
-    wxString path = pathlist.FindValidPath("ls");
-    if ( path.empty() )
-    {
-        printf("ERROR: command not found in the path.\n");
-    }
-    else
-    {
-        printf("Command found in the path as '%s'.\n", path.c_str());
-    }
+  (void) wxPrintf(wxT("%s:\t`"), fmt);
+  (void) wxPrintf(fmt, 4, 4, 0x12);
+  (void) wxPrintf(wxT("'\n"));

 }
 
 }
 

-#endif // TEST_PATHLIST
-
-// ----------------------------------------------------------------------------
-// regular expressions
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_REGEX
+/* This page is covered by the following copyright: */

 
 

-#include "wx/regex.h"
+/* (C) Copyright C E Chew
+ *
+ * Feel free to copy, use and distribute this software provided:
+ *
+ *        1. you do not pretend that you wrote it
+ *        2. you leave this copyright notice intact.
+ */

 
 

-static void TestRegExCompile()
-{
-    wxPuts(_T("*** Testing RE compilation ***\n"));
+/*
+ * Extracted from exercise.c for glibc-1.05 bug report by Bruce Evans.
+ */

 
 

-    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 },
-    };
+#define DEC -123
+#define INT 255
+#define UNS (~0)

 
 

-    wxRegEx re;
-    for ( size_t n = 0; n < WXSIZEOF(regExCompTestData); n++ )
-    {
-        const RegExCompTestData& data = regExCompTestData[n];
-        bool ok = re.Compile(data.pattern);
+/* Formatted Output Test
+ *
+ * This exercises the output formatting code.
+ */

 
 

-        wxPrintf(_T("'%s' is %sa valid RE (%s)\n"),
-                 data.pattern,
-                 ok ? _T("") : _T("not "),
-                 ok == data.correct ? _T("ok") : _T("ERROR"));
-    }
+wxChar *PointerNull = NULL;
+
+static void
+fp_test (void)
+{
+  int i, j, k, l;
+  wxChar buf[7];
+  wxChar *prefix = buf;
+  wxChar tp[20];
+
+  wxPuts(wxT("\nFormatted output test"));
+  wxPrintf(wxT("prefix  6d      6o      6x      6X      6u\n"));
+  wxStrcpy(prefix, wxT("%"));
+  for (i = 0; i < 2; i++) {
+    for (j = 0; j < 2; j++) {
+      for (k = 0; k < 2; k++) {
+        for (l = 0; l < 2; l++) {
+          wxStrcpy(prefix, wxT("%"));
+          if (i == 0) wxStrcat(prefix, wxT("-"));
+          if (j == 0) wxStrcat(prefix, wxT("+"));
+          if (k == 0) wxStrcat(prefix, wxT("#"));
+          if (l == 0) wxStrcat(prefix, wxT("0"));
+          wxPrintf(wxT("%5s |"), prefix);
+          wxStrcpy(tp, prefix);
+          wxStrcat(tp, wxT("6d |"));
+          wxPrintf(tp, DEC);
+          wxStrcpy(tp, prefix);
+          wxStrcat(tp, wxT("6o |"));
+          wxPrintf(tp, INT);
+          wxStrcpy(tp, prefix);
+          wxStrcat(tp, wxT("6x |"));
+          wxPrintf(tp, INT);
+          wxStrcpy(tp, prefix);
+          wxStrcat(tp, wxT("6X |"));
+          wxPrintf(tp, INT);
+          wxStrcpy(tp, prefix);
+          wxStrcat(tp, wxT("6u |"));
+          wxPrintf(tp, UNS);
+          wxPrintf(wxT("\n"));
+        }
+      }
+    }
+  }
+  wxPrintf(wxT("%10s\n"), PointerNull);
+  wxPrintf(wxT("%-10s\n"), PointerNull);

 }
 
 }
 

-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];
+static void TestPrintf()
+{
+  static wxChar shortstr[] = wxT("Hi, Z.");
+  static wxChar longstr[] = wxT("Good morning, Doctor Chandra.  This is Hal.  \
+I am ready for my first lesson today.");
+  int result = 0;
+  wxString test_format;
+
+  fmtchk(wxT("%.4x"));
+  fmtchk(wxT("%04x"));
+  fmtchk(wxT("%4.4x"));
+  fmtchk(wxT("%04.4x"));
+  fmtchk(wxT("%4.3x"));
+  fmtchk(wxT("%04.3x"));
+
+  fmtst1chk(wxT("%.*x"));
+  fmtst1chk(wxT("%0*x"));
+  fmtst2chk(wxT("%*.*x"));
+  fmtst2chk(wxT("%0*.*x"));
+
+  wxString bad_format = wxT("bad format:\t\"%b\"\n");
+  wxPrintf(bad_format.c_str());
+  wxPrintf(wxT("nil pointer (padded):\t\"%10p\"\n"), (void *) NULL);
+
+  wxPrintf(wxT("decimal negative:\t\"%d\"\n"), -2345);
+  wxPrintf(wxT("octal negative:\t\"%o\"\n"), -2345);
+  wxPrintf(wxT("hex negative:\t\"%x\"\n"), -2345);
+  wxPrintf(wxT("long decimal number:\t\"%ld\"\n"), -123456L);
+  wxPrintf(wxT("long octal negative:\t\"%lo\"\n"), -2345L);
+  wxPrintf(wxT("long unsigned decimal number:\t\"%lu\"\n"), -123456L);
+  wxPrintf(wxT("zero-padded LDN:\t\"%010ld\"\n"), -123456L);
+  test_format = wxT("left-adjusted ZLDN:\t\"%-010ld\"\n");
+  wxPrintf(test_format.c_str(), -123456);
+  wxPrintf(wxT("space-padded LDN:\t\"%10ld\"\n"), -123456L);
+  wxPrintf(wxT("left-adjusted SLDN:\t\"%-10ld\"\n"), -123456L);
+
+  test_format = wxT("zero-padded string:\t\"%010s\"\n");
+  wxPrintf(test_format.c_str(), shortstr);
+  test_format = wxT("left-adjusted Z string:\t\"%-010s\"\n");
+  wxPrintf(test_format.c_str(), shortstr);
+  wxPrintf(wxT("space-padded string:\t\"%10s\"\n"), shortstr);
+  wxPrintf(wxT("left-adjusted S string:\t\"%-10s\"\n"), shortstr);
+  wxPrintf(wxT("null string:\t\"%s\"\n"), PointerNull);
+  wxPrintf(wxT("limited string:\t\"%.22s\"\n"), longstr);
+
+  wxPrintf(wxT("e-style >= 1:\t\"%e\"\n"), 12.34);
+  wxPrintf(wxT("e-style >= .1:\t\"%e\"\n"), 0.1234);
+  wxPrintf(wxT("e-style < .1:\t\"%e\"\n"), 0.001234);
+  wxPrintf(wxT("e-style big:\t\"%.60e\"\n"), 1e20);
+  wxPrintf(wxT("e-style == .1:\t\"%e\"\n"), 0.1);
+  wxPrintf(wxT("f-style >= 1:\t\"%f\"\n"), 12.34);
+  wxPrintf(wxT("f-style >= .1:\t\"%f\"\n"), 0.1234);
+  wxPrintf(wxT("f-style < .1:\t\"%f\"\n"), 0.001234);
+  wxPrintf(wxT("g-style >= 1:\t\"%g\"\n"), 12.34);
+  wxPrintf(wxT("g-style >= .1:\t\"%g\"\n"), 0.1234);
+  wxPrintf(wxT("g-style < .1:\t\"%g\"\n"), 0.001234);
+  wxPrintf(wxT("g-style big:\t\"%.60g\"\n"), 1e20);
+
+  wxPrintf (wxT(" %6.5f\n"), .099999999860301614);
+  wxPrintf (wxT(" %6.5f\n"), .1);
+  wxPrintf (wxT("x%5.4fx\n"), .5);
+
+  wxPrintf (wxT("%#03x\n"), 1);
+
+  //wxPrintf (wxT("something really insane: %.10000f\n"), 1.0);
+
+  {
+    double d = FLT_MIN;
+    int niter = 17;
+
+    while (niter-- != 0)
+      wxPrintf (wxT("%.17e\n"), d / 2);
+    fflush (stdout);
+  }
+
+#ifndef __WATCOMC__
+  // Open Watcom cause compiler error here
+  // Error! E173: col(24) floating-point constant too small to represent
+  wxPrintf (wxT("%15.5e\n"), 4.9406564584124654e-324);
+#endif

 
 

-        wxRegEx re(data.pattern);
-        bool ok = re.Matches(data.text);
+#define FORMAT wxT("|%12.4f|%12.4e|%12.4g|\n")
+  wxPrintf (FORMAT, 0.0, 0.0, 0.0);
+  wxPrintf (FORMAT, 1.0, 1.0, 1.0);
+  wxPrintf (FORMAT, -1.0, -1.0, -1.0);
+  wxPrintf (FORMAT, 100.0, 100.0, 100.0);
+  wxPrintf (FORMAT, 1000.0, 1000.0, 1000.0);
+  wxPrintf (FORMAT, 10000.0, 10000.0, 10000.0);
+  wxPrintf (FORMAT, 12345.0, 12345.0, 12345.0);
+  wxPrintf (FORMAT, 100000.0, 100000.0, 100000.0);
+  wxPrintf (FORMAT, 123456.0, 123456.0, 123456.0);
+#undef        FORMAT
+
+  {
+    wxChar buf[20];
+    int rc = wxSnprintf (buf, WXSIZEOF(buf), wxT("%30s"), wxT("foo"));
+
+    wxPrintf(wxT("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n"),
+             rc, WXSIZEOF(buf), buf);
+#if 0
+    wxChar buf2[512];
+    wxPrintf ("snprintf (\"%%.999999u\", 10)\n",
+            wxSnprintf(buf2, WXSIZEOFbuf2), "%.999999u", 10));
+#endif
+  }

 
 

-        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"));
-    }
-}
+  fp_test ();

 
 

-static void TestRegExSubmatch()
-{
-    wxPuts(_T("*** Testing RE subexpressions ***\n"));
+  wxPrintf (wxT("%e should be 1.234568e+06\n"), 1234567.8);
+  wxPrintf (wxT("%f should be 1234567.800000\n"), 1234567.8);
+  wxPrintf (wxT("%g should be 1.23457e+06\n"), 1234567.8);
+  wxPrintf (wxT("%g should be 123.456\n"), 123.456);
+  wxPrintf (wxT("%g should be 1e+06\n"), 1000000.0);
+  wxPrintf (wxT("%g should be 10\n"), 10.0);
+  wxPrintf (wxT("%g should be 0.02\n"), 0.02);

 
 

-    wxRegEx re(_T("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).*([[:digit:]]+)$"));
-    if ( !re.IsValid() )
-    {
-        wxPuts(_T("ERROR: compilation failed."));
-        return;
-    }
+  {
+    double x=1.0;
+    wxPrintf(wxT("%.17f\n"),(1.0/x/10.0+1.0)*x-x);
+  }

 
 

-    wxString text = _T("Fri Jul 13 18:37:52 CEST 2001");
+  {
+    wxChar buf[200];

 
 

-    if ( !re.Matches(text) )
-    {
-        wxPuts(_T("ERROR: match expected."));
-    }
-    else
-    {
-        wxPrintf(_T("Entire match: %s\n"), re.GetMatch(text).c_str());
+    wxSprintf(buf,wxT("%*s%*s%*s"),-1,wxT("one"),-20,wxT("two"),-30,wxT("three"));

 
 

-        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());
-    }
-}
+    result |= wxStrcmp (buf,
+                      wxT("onetwo                 three                         "));

 
 

-static void TestRegExReplacement()
-{
-    wxPuts(_T("*** Testing RE replacement ***"));
+    wxPuts (result != 0 ? wxT("Test failed!") : wxT("Test ok."));
+  }

 
 

-    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 },
-    };
+#ifdef wxLongLong_t
+  {
+      wxChar buf[200];

 
 

-    const wxChar *pattern = _T("([a-z]+)[^0-9]*([0-9]+)");
-    wxRegEx re(pattern);
+      wxSprintf(buf, wxT("%07") wxLongLongFmtSpec wxT("o"), wxLL(040000000000));
+      #if 0
+        // for some reason below line fails under Borland
+      wxPrintf (wxT("sprintf (buf, \"%%07Lo\", 040000000000ll) = %s"), buf);
+      #endif

 
 

-    wxPrintf(_T("Using pattern '%s' for replacement.\n"), pattern);
+      if (wxStrcmp (buf, wxT("40000000000")) != 0)
+      {
+          result = 1;
+          wxPuts (wxT("\tFAILED"));
+      }
+      wxUnusedVar(result);
+      wxPuts (wxEmptyString);
+  }
+#endif // wxLongLong_t

 
 

-    for ( size_t n = 0; n < WXSIZEOF(regExReplTestData); n++ )
-    {
-        const RegExReplTestData& data = regExReplTestData[n];
+  wxPrintf (wxT("printf (\"%%hhu\", %u) = %hhu\n"), UCHAR_MAX + 2, UCHAR_MAX + 2);
+  wxPrintf (wxT("printf (\"%%hu\", %u) = %hu\n"), USHRT_MAX + 2, USHRT_MAX + 2);

 
 

-        wxString text = data.text;
-        size_t nRepl = re.Replace(&text, data.repl);
+  wxPuts (wxT("--- Should be no further output. ---"));
+  rfg1 ();
+  rfg2 ();

 
 

-        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);
-        }
-    }
+#if 0
+  {
+    wxChar bytes[7];
+    wxChar buf[20];
+
+    memset (bytes, '\xff', sizeof bytes);
+    wxSprintf (buf, wxT("foo%hhn\n"), &bytes[3]);
+    if (bytes[0] != '\xff' || bytes[1] != '\xff' || bytes[2] != '\xff'
+        || bytes[4] != '\xff' || bytes[5] != '\xff' || bytes[6] != '\xff')
+      {
+        wxPuts (wxT("%hhn overwrite more bytes"));
+        result = 1;
+      }
+    if (bytes[3] != 3)
+      {
+        wxPuts (wxT("%hhn wrote incorrect value"));
+        result = 1;
+      }
+  }
+#endif

 }
 
 }
 

-static void TestRegExInteractive()
-{
-    wxPuts(_T("*** Testing RE interactively ***"));
-
-    for ( ;; )
-    {
-        char pattern[128];
-        printf("\nEnter a pattern: ");
-        if ( !fgets(pattern, WXSIZEOF(pattern), stdin) )
-            break;
-
-        // kill the last '\n'
-        pattern[strlen(pattern) - 1] = 0;
-
-        wxRegEx re;
-        if ( !re.Compile(pattern) )
-        {
-            continue;
-        }
-
-        char text[128];
-        for ( ;; )
-        {
-            printf("Enter text to match: ");
-            if ( !fgets(text, WXSIZEOF(text), stdin) )
-                break;
-
-            // kill the last '\n'
-            text[strlen(text) - 1] = 0;
-
-            if ( !re.Matches(text) )
-            {
-                printf("No match.\n");
-            }
-            else
-            {
-                printf("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;
-                    }
-
-                    printf("Subexpr %u matched '%s'\n",
-                           n, wxString(text + start, len).c_str());
-                }
-            }
-        }
-    }
+static void
+rfg1 (void)
+{
+  wxChar buf[100];
+
+  wxSprintf (buf, wxT("%5.s"), wxT("xyz"));
+  if (wxStrcmp (buf, wxT("     ")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("     "));
+  wxSprintf (buf, wxT("%5.f"), 33.3);
+  if (wxStrcmp (buf, wxT("   33")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("   33"));
+  wxSprintf (buf, wxT("%8.e"), 33.3e7);
+  if (wxStrcmp (buf, wxT("   3e+08")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("   3e+08"));
+  wxSprintf (buf, wxT("%8.E"), 33.3e7);
+  if (wxStrcmp (buf, wxT("   3E+08")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("   3E+08"));
+  wxSprintf (buf, wxT("%.g"), 33.3);
+  if (wxStrcmp (buf, wxT("3e+01")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("3e+01"));
+  wxSprintf (buf, wxT("%.G"), 33.3);
+  if (wxStrcmp (buf, wxT("3E+01")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("3E+01"));

 }
 
 }
 

-#endif // TEST_REGEX
-
-// ----------------------------------------------------------------------------
-// database
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_ODBC
-
-#include <wx/db.h>
-
-static void TestDbOpen()
-{
-    HENV henv;
-    wxDb db(henv);
+static void
+rfg2 (void)
+{
+  int prec;
+  wxChar buf[100];
+  wxString test_format;
+
+  prec = 0;
+  wxSprintf (buf, wxT("%.*g"), prec, 3.3);
+  if (wxStrcmp (buf, wxT("3")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("3"));
+  prec = 0;
+  wxSprintf (buf, wxT("%.*G"), prec, 3.3);
+  if (wxStrcmp (buf, wxT("3")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("3"));
+  prec = 0;
+  wxSprintf (buf, wxT("%7.*G"), prec, 3.33);
+  if (wxStrcmp (buf, wxT("      3")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("      3"));
+  prec = 3;
+  test_format = wxT("%04.*o");
+  wxSprintf (buf, test_format.c_str(), prec, 33);
+  if (wxStrcmp (buf, wxT(" 041")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT(" 041"));
+  prec = 7;
+  test_format = wxT("%09.*u");
+  wxSprintf (buf, test_format.c_str(), prec, 33);
+  if (wxStrcmp (buf, wxT("  0000033")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT("  0000033"));
+  prec = 3;
+  test_format = wxT("%04.*x");
+  wxSprintf (buf, test_format.c_str(), prec, 33);
+  if (wxStrcmp (buf, wxT(" 021")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT(" 021"));
+  prec = 3;
+  test_format = wxT("%04.*X");
+  wxSprintf (buf, test_format.c_str(), prec, 33);
+  if (wxStrcmp (buf, wxT(" 021")) != 0)
+    wxPrintf (wxT("got: '%s', expected: '%s'\n"), buf, wxT(" 021"));

 }
 
 }
 

-#endif // TEST_ODBC
+#endif // TEST_PRINTF

 
 // ----------------------------------------------------------------------------
 // registry and related stuff
 
 // ----------------------------------------------------------------------------
 // registry and related stuff


@@ -2384,10 +2043,31 @@ static void TestDbOpen()
 #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()
 {

-    wxRegConfig regconf(_T("console"), _T("wxwindows"));
-    regconf.Write(_T("Hello"), wxString(_T("world")));
+    wxConfig *config = new wxConfig(wxT("myapp"));
+    config->SetPath(wxT("/group1"));
+    config->Write(wxT("entry1"), wxT("foo"));
+    config->SetPath(wxT("/group2"));
+    config->Write(wxT("entry1"), wxT("bar"));
+}
+#endif
+
+static void TestRegConfRead()
+{
+    wxRegConfig *config = new wxRegConfig(wxT("myapp"));
+
+    wxString str;
+    long dummy;
+    config->SetPath(wxT("/"));
+    wxPuts(wxT("Enumerating / subgroups:"));
+    bool bCont = config->GetFirstGroup(str, dummy);
+    while(bCont)
+    {
+        wxPuts(str);
+        bCont = config->GetNextGroup(str, dummy);
+    }

 }
 
 #endif // TEST_REGCONF
 }
 
 #endif // TEST_REGCONF


@@ -2399,17 +2079,17 @@ static void TestRegConfWrite()
 // I chose this one because I liked its name, but it probably only exists under
 // NT
 static const wxChar *TESTKEY =
 // I chose this one because I liked its name, but it probably only exists under
 // NT
 static const wxChar *TESTKEY =

-    _T("HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Control\\CrashControl");
+    wxT("HKEY_LOCAL_MACHINE\\SYSTEM\\ControlSet001\\Control\\CrashControl");

 
 static void TestRegistryRead()
 {
 
 static void TestRegistryRead()
 {

-    puts("*** testing registry reading ***");
+    wxPuts(wxT("*** testing registry reading ***"));

 
     wxRegKey key(TESTKEY);
 
     wxRegKey key(TESTKEY);

-    printf("The test key name is '%s'.\n", key.GetName().c_str());
+    wxPrintf(wxT("The test key name is '%s'.\n"), key.GetName().c_str());

     if ( !key.Open() )
     {
     if ( !key.Open() )
     {

-        puts("ERROR: test key can't be opened, aborting test.");
+        wxPuts(wxT("ERROR: test key can't be opened, aborting test."));

 
         return;
     }
 
         return;
     }


@@ -2417,46 +2097,46 @@ static void TestRegistryRead()
     size_t nSubKeys, nValues;
     if ( key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) )
     {
     size_t nSubKeys, nValues;
     if ( key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) )
     {

-        printf("It has %u subkeys and %u values.\n", nSubKeys, nValues);
+        wxPrintf(wxT("It has %u subkeys and %u values.\n"), nSubKeys, nValues);

     }
 
     }
 

-    printf("Enumerating values:\n");
+    wxPrintf(wxT("Enumerating values:\n"));

 
     long dummy;
     wxString value;
     bool cont = key.GetFirstValue(value, dummy);
     while ( cont )
     {
 
     long dummy;
     wxString value;
     bool cont = key.GetFirstValue(value, dummy);
     while ( cont )
     {

-        printf("Value '%s': type ", value.c_str());
+        wxPrintf(wxT("Value '%s': type "), value.c_str());

         switch ( key.GetValueType(value) )
         {
         switch ( key.GetValueType(value) )
         {

-            case wxRegKey::Type_None:   printf("ERROR (none)"); break;
-            case wxRegKey::Type_String: printf("SZ"); break;
-            case wxRegKey::Type_Expand_String: printf("EXPAND_SZ"); break;
-            case wxRegKey::Type_Binary: printf("BINARY"); break;
-            case wxRegKey::Type_Dword: printf("DWORD"); break;
-            case wxRegKey::Type_Multi_String: printf("MULTI_SZ"); break;
-            default: printf("other (unknown)"); break;
+            case wxRegKey::Type_None:   wxPrintf(wxT("ERROR (none)")); break;
+            case wxRegKey::Type_String: wxPrintf(wxT("SZ")); break;
+            case wxRegKey::Type_Expand_String: wxPrintf(wxT("EXPAND_SZ")); break;
+            case wxRegKey::Type_Binary: wxPrintf(wxT("BINARY")); break;
+            case wxRegKey::Type_Dword: wxPrintf(wxT("DWORD")); break;
+            case wxRegKey::Type_Multi_String: wxPrintf(wxT("MULTI_SZ")); break;
+            default: wxPrintf(wxT("other (unknown)")); break;

         }
 
         }
 

-        printf(", value = ");
+        wxPrintf(wxT(", value = "));

         if ( key.IsNumericValue(value) )
         {
             long val;
             key.QueryValue(value, &val);
         if ( key.IsNumericValue(value) )
         {
             long val;
             key.QueryValue(value, &val);

-            printf("%ld", val);
+            wxPrintf(wxT("%ld"), val);

         }
         else // string
         {
             wxString val;
             key.QueryValue(value, val);
         }
         else // string
         {
             wxString val;
             key.QueryValue(value, val);

-            printf("'%s'", val.c_str());
+            wxPrintf(wxT("'%s'"), val.c_str());

 
             key.QueryRawValue(value, val);
 
             key.QueryRawValue(value, val);

-            printf(" (raw value '%s')", val.c_str());
+            wxPrintf(wxT(" (raw value '%s')"), val.c_str());

         }
 
         }
 

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

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


@@ -2472,31 +2152,67 @@ static void TestRegistryAssociation()
 
     wxRegKey key;
 
 
     wxRegKey key;
 

-    key.SetName("HKEY_CLASSES_ROOT\\.ddf" );
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\.ddf") );

     key.Create();
     key.Create();

-    key = "ddxf_auto_file" ;
-    key.SetName("HKEY_CLASSES_ROOT\\.flo" );
+    key = wxT("ddxf_auto_file") ;
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\.flo") );

     key.Create();
     key.Create();

-    key = "ddxf_auto_file" ;
-    key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon");
+    key = wxT("ddxf_auto_file") ;
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"));

     key.Create();
     key.Create();

-    key = "program,0" ;
-    key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command");
+    key = wxT("program,0") ;
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"));

     key.Create();
     key.Create();

-    key = "program \"%1\"" ;
+    key = wxT("program \"%1\"") ;

 
 

-    key.SetName("HKEY_CLASSES_ROOT\\.ddf" );
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\.ddf") );

     key.DeleteSelf();
     key.DeleteSelf();

-    key.SetName("HKEY_CLASSES_ROOT\\.flo" );
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\.flo") );

     key.DeleteSelf();
     key.DeleteSelf();

-    key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon");
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"));

     key.DeleteSelf();
     key.DeleteSelf();

-    key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command");
+    key.SetName(wxT("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"));

     key.DeleteSelf();
 }
 
 #endif // TEST_REGISTRY
 
     key.DeleteSelf();
 }
 
 #endif // TEST_REGISTRY
 

+// ----------------------------------------------------------------------------
+// scope guard
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_SCOPEGUARD
+
+#include "wx/scopeguard.h"
+
+static void function0() { puts("function0()"); }
+static void function1(int n) { printf("function1(%d)\n", n); }
+static void function2(double x, char c) { printf("function2(%g, %c)\n", x, c); }
+
+struct Object
+{
+    void method0() { printf("method0()\n"); }
+    void method1(int n) { printf("method1(%d)\n", n); }
+    void method2(double x, char c) { printf("method2(%g, %c)\n", x, c); }
+};
+
+static void TestScopeGuard()
+{
+    wxON_BLOCK_EXIT0(function0);
+    wxON_BLOCK_EXIT1(function1, 17);
+    wxON_BLOCK_EXIT2(function2, 3.14, 'p');
+
+    Object obj;
+    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();
+}
+
+#endif
+

 // ----------------------------------------------------------------------------
 // sockets
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // sockets
 // ----------------------------------------------------------------------------


@@ -2509,7 +2225,7 @@ static void TestRegistryAssociation()
 
 static void TestSocketServer()
 {
 
 static void TestSocketServer()
 {

-    puts("*** Testing wxSocketServer ***\n");
+    wxPuts(wxT("*** Testing wxSocketServer ***\n"));

 
     static const int PORT = 3000;
 
 
     static const int PORT = 3000;
 


@@ -2519,30 +2235,32 @@ static void TestSocketServer()
     wxSocketServer *server = new wxSocketServer(addr);
     if ( !server->Ok() )
     {
     wxSocketServer *server = new wxSocketServer(addr);
     if ( !server->Ok() )
     {

-        puts("ERROR: failed to bind");
+        wxPuts(wxT("ERROR: failed to bind"));

 
         return;
     }
 
 
         return;
     }
 

-    for ( ;; )
+    bool quit = false;
+    while ( !quit )

     {
     {

-        printf("Server: waiting for connection on port %d...\n", PORT);
+        wxPrintf(wxT("Server: waiting for connection on port %d...\n"), PORT);

 
         wxSocketBase *socket = server->Accept();
         if ( !socket )
         {
 
         wxSocketBase *socket = server->Accept();
         if ( !socket )
         {

-            puts("ERROR: wxSocketServer::Accept() failed.");
+            wxPuts(wxT("ERROR: wxSocketServer::Accept() failed."));

             break;
         }
 
             break;
         }
 

-        puts("Server: got a client.");
+        wxPuts(wxT("Server: got a client."));

 
         server->SetTimeout(60); // 1 min
 
 
         server->SetTimeout(60); // 1 min
 

-        while ( socket->IsConnected() )
+        bool close = false;
+        while ( !close && socket->IsConnected() )

         {
             wxString s;
         {
             wxString s;

-            char ch = '\0';
+            wxChar ch = wxT('\0');

             for ( ;; )
             {
                 if ( socket->Read(&ch, sizeof(ch)).Error() )
             for ( ;; )
             {
                 if ( socket->Read(&ch, sizeof(ch)).Error() )


@@ -2550,7 +2268,7 @@ static void TestSocketServer()
                     // don't log error if the client just close the connection
                     if ( socket->IsConnected() )
                     {
                     // don't log error if the client just close the connection
                     if ( socket->IsConnected() )
                     {

-                        puts("ERROR: in wxSocket::Read.");
+                        wxPuts(wxT("ERROR: in wxSocket::Read."));

                     }
 
                     break;
                     }
 
                     break;


@@ -2570,20 +2288,32 @@ static void TestSocketServer()
                 break;
             }
 
                 break;
             }
 

-            printf("Server: got '%s'.\n", s.c_str());
-            if ( s == _T("bye") )
+            wxPrintf(wxT("Server: got '%s'.\n"), s.c_str());
+            if ( s == wxT("close") )

             {
             {

-                delete socket;
+                wxPuts(wxT("Closing connection"));

 
 

-                break;
+                close = true;

             }
             }

+            else if ( s == wxT("quit") )
+            {
+                close =
+                quit = true;

 
 

-            socket->Write(s.MakeUpper().c_str(), s.length());
-            socket->Write("\r\n", 2);
-            printf("Server: wrote '%s'.\n", s.c_str());
-        }
-
-        puts("Server: lost a client.");
+                wxPuts(wxT("Shutting down the server"));
+            }
+            else // not a special command
+            {
+                socket->Write(s.MakeUpper().c_str(), s.length());
+                socket->Write("\r\n", 2);
+                wxPrintf(wxT("Server: wrote '%s'.\n"), s.c_str());
+            }
+        }
+
+        if ( !close )
+        {
+            wxPuts(wxT("Server: lost a client unexpectedly."));
+        }

 
         socket->Destroy();
     }
 
         socket->Destroy();
     }


@@ -2594,36 +2324,36 @@ static void TestSocketServer()
 
 static void TestSocketClient()
 {
 
 static void TestSocketClient()
 {

-    puts("*** Testing wxSocketClient ***\n");
+    wxPuts(wxT("*** Testing wxSocketClient ***\n"));

 
 

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

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

-    printf("--- Attempting to connect to %s:80...\n", hostname);
+    wxPrintf(wxT("--- Attempting to connect to %s:80...\n"), hostname);

 
     wxSocketClient client;
     if ( !client.Connect(addr) )
     {
 
     wxSocketClient client;
     if ( !client.Connect(addr) )
     {

-        printf("ERROR: failed to connect to %s\n", hostname);
+        wxPrintf(wxT("ERROR: failed to connect to %s\n"), hostname);

     }
     else
     {
     }
     else
     {

-        printf("--- Connected to %s:%u...\n",
+        wxPrintf(wxT("--- Connected to %s:%u...\n"),

                addr.Hostname().c_str(), addr.Service());
 
                addr.Hostname().c_str(), addr.Service());
 

-        char buf[8192];
+        wxChar buf[8192];

 
         // could use simply "GET" here I suppose
         wxString cmdGet =
 
         // could use simply "GET" here I suppose
         wxString cmdGet =

-            wxString::Format("GET http://%s/\r\n", hostname);
+            wxString::Format(wxT("GET http://%s/\r\n"), hostname);

         client.Write(cmdGet, cmdGet.length());
         client.Write(cmdGet, cmdGet.length());

-        printf("--- Sent command '%s' to the server\n",
+        wxPrintf(wxT("--- Sent command '%s' to the server\n"),

                MakePrintable(cmdGet).c_str());
         client.Read(buf, WXSIZEOF(buf));
                MakePrintable(cmdGet).c_str());
         client.Read(buf, WXSIZEOF(buf));

-        printf("--- Server replied:\n%s", buf);
+        wxPrintf(wxT("--- Server replied:\n%s"), buf);

     }
 }
 
     }
 }
 


@@ -2636,173 +2366,137 @@ static void TestSocketClient()
 #ifdef TEST_FTP
 
 #include "wx/protocol/ftp.h"
 #ifdef TEST_FTP
 
 #include "wx/protocol/ftp.h"

-
-static wxFTP ftp;
+#include "wx/protocol/log.h"

 
 #define FTP_ANONYMOUS
 
 
 #define FTP_ANONYMOUS
 

+static wxFTP *ftp;
+

 #ifdef FTP_ANONYMOUS
 #ifdef FTP_ANONYMOUS

-    static const char *directory = "/pub";
-    static const char *filename = "welcome.msg";
+    static const wxChar *directory = wxT("/pub");
+    static const wxChar *filename = wxT("welcome.msg");

 #else
 #else

-    static const char *directory = "/etc";
-    static const char *filename = "issue";
+    static const wxChar *directory = wxT("/etc");
+    static const wxChar *filename = wxT("issue");

 #endif
 
 static bool TestFtpConnect()
 {
 #endif
 
 static bool TestFtpConnect()
 {

-    puts("*** Testing FTP connect ***");
+    wxPuts(wxT("*** Testing FTP connect ***"));

 
 #ifdef FTP_ANONYMOUS
 
 #ifdef FTP_ANONYMOUS

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

 
 

-    printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);
+    wxPrintf(wxT("--- Attempting to connect to %s:21 anonymously...\n"), hostname);

 #else // !FTP_ANONYMOUS
 #else // !FTP_ANONYMOUS

-    static const char *hostname = "localhost";
+    static const wxChar *hostname = "localhost";

 
 

-    char user[256];
-    fgets(user, WXSIZEOF(user), stdin);
-    user[strlen(user) - 1] = '\0'; // chop off '\n'
-    ftp.SetUser(user);
+    wxChar user[256];
+    wxFgets(user, WXSIZEOF(user), stdin);
+    user[wxStrlen(user) - 1] = '\0'; // chop off '\n'
+    ftp->SetUser(user);

 
 

-    char password[256];
-    printf("Password for %s: ", password);
-    fgets(password, WXSIZEOF(password), stdin);
-    password[strlen(password) - 1] = '\0'; // chop off '\n'
-    ftp.SetPassword(password);
+    wxChar password[256];
+    wxPrintf(wxT("Password for %s: "), password);
+    wxFgets(password, WXSIZEOF(password), stdin);
+    password[wxStrlen(password) - 1] = '\0'; // chop off '\n'
+    ftp->SetPassword(password);

 
 

-    printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user);
+    wxPrintf(wxT("--- Attempting to connect to %s:21 as %s...\n"), hostname, user);

 #endif // FTP_ANONYMOUS/!FTP_ANONYMOUS
 
 #endif // FTP_ANONYMOUS/!FTP_ANONYMOUS
 

-    if ( !ftp.Connect(hostname) )
+    if ( !ftp->Connect(hostname) )

     {
     {

-        printf("ERROR: failed to connect to %s\n", hostname);
+        wxPrintf(wxT("ERROR: failed to connect to %s\n"), hostname);

 
 

-        return FALSE;
+        return false;

     }
     else
     {
     }
     else
     {

-        printf("--- Connected to %s, current directory is '%s'\n",
-               hostname, ftp.Pwd().c_str());
-    }
-
-    return TRUE;
-}
-
-// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0?
-static void TestFtpWuFtpd()
-{
-    wxFTP ftp;
-    static const char *hostname = "ftp.eudora.com";
-    if ( !ftp.Connect(hostname) )
-    {
-        printf("ERROR: failed to connect to %s\n", hostname);
+        wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"),
+                 hostname, ftp->Pwd().c_str());
+        ftp->Close();

     }
     }

-    else
-    {
-        static const char *filename = "eudora/pubs/draft-gellens-submit-09.txt";
-        wxInputStream *in = ftp.GetInputStream(filename);
-        if ( !in )
-        {
-            printf("ERROR: couldn't get input stream for %s\n", filename);
-        }
-        else
-        {
-            size_t size = in->StreamSize();
-            printf("Reading file %s (%u bytes)...", filename, size);

 
 

-            char *data = new char[size];
-            if ( !in->Read(data, size) )
-            {
-                puts("ERROR: read error");
-            }
-            else
-            {
-                printf("Successfully retrieved the file.\n");
-            }
-
-            delete [] data;
-            delete in;
-        }
-    }
+    return true;

 }
 
 static void TestFtpList()
 {
 }
 
 static void TestFtpList()
 {

-    puts("*** Testing wxFTP file listing ***\n");
+    wxPuts(wxT("*** Testing wxFTP file listing ***\n"));

 
     // test CWD
 
     // test CWD

-    if ( !ftp.ChDir(directory) )
+    if ( !ftp->ChDir(directory) )

     {
     {

-        printf("ERROR: failed to cd to %s\n", directory);
+        wxPrintf(wxT("ERROR: failed to cd to %s\n"), directory);

     }
 
     }
 

-    printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+    wxPrintf(wxT("Current directory is '%s'\n"), ftp->Pwd().c_str());

 
     // test NLIST and LIST
     wxArrayString files;
 
     // test NLIST and LIST
     wxArrayString files;

-    if ( !ftp.GetFilesList(files) )
+    if ( !ftp->GetFilesList(files) )

     {
     {

-        puts("ERROR: failed to get NLIST of files");
+        wxPuts(wxT("ERROR: failed to get NLIST of files"));

     }
     else
     {
     }
     else
     {

-        printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
+        wxPrintf(wxT("Brief list of files under '%s':\n"), ftp->Pwd().c_str());

         size_t count = files.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = files.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            printf("\t%s\n", files[n].c_str());
+            wxPrintf(wxT("\t%s\n"), files[n].c_str());

         }
         }

-        puts("End of the file list");
+        wxPuts(wxT("End of the file list"));

     }
 
     }
 

-    if ( !ftp.GetDirList(files) )
+    if ( !ftp->GetDirList(files) )

     {
     {

-        puts("ERROR: failed to get LIST of files");
+        wxPuts(wxT("ERROR: failed to get LIST of files"));

     }
     else
     {
     }
     else
     {

-        printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
+        wxPrintf(wxT("Detailed list of files under '%s':\n"), ftp->Pwd().c_str());

         size_t count = files.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = files.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            printf("\t%s\n", files[n].c_str());
+            wxPrintf(wxT("\t%s\n"), files[n].c_str());

         }
         }

-        puts("End of the file list");
+        wxPuts(wxT("End of the file list"));

     }
 
     }
 

-    if ( !ftp.ChDir(_T("..")) )
+    if ( !ftp->ChDir(wxT("..")) )

     {
     {

-        puts("ERROR: failed to cd to ..");
+        wxPuts(wxT("ERROR: failed to cd to .."));

     }
 
     }
 

-    printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+    wxPrintf(wxT("Current directory is '%s'\n"), ftp->Pwd().c_str());

 }
 
 static void TestFtpDownload()
 {
 }
 
 static void TestFtpDownload()
 {

-    puts("*** Testing wxFTP download ***\n");
+    wxPuts(wxT("*** Testing wxFTP download ***\n"));

 
     // test RETR
 
     // test RETR

-    wxInputStream *in = ftp.GetInputStream(filename);
+    wxInputStream *in = ftp->GetInputStream(filename);

     if ( !in )
     {
     if ( !in )
     {

-        printf("ERROR: couldn't get input stream for %s\n", filename);
+        wxPrintf(wxT("ERROR: couldn't get input stream for %s\n"), filename);

     }
     else
     {
     }
     else
     {

-        size_t size = in->StreamSize();
-        printf("Reading file %s (%u bytes)...", filename, size);
+        size_t size = in->GetSize();
+        wxPrintf(wxT("Reading file %s (%u bytes)..."), filename, size);

         fflush(stdout);
 
         fflush(stdout);
 

-        char *data = new char[size];
+        wxChar *data = new wxChar[size];

         if ( !in->Read(data, size) )
         {
         if ( !in->Read(data, size) )
         {

-            puts("ERROR: read error");
+            wxPuts(wxT("ERROR: read error"));

         }
         else
         {
         }
         else
         {

-            printf("\nContents of %s:\n%s\n", filename, data);
+            wxPrintf(wxT("\nContents of %s:\n%s\n"), filename, data);

         }
 
         delete [] data;
         }
 
         delete [] data;


@@ -2812,140 +2506,144 @@ static void TestFtpDownload()
 
 static void TestFtpFileSize()
 {
 
 static void TestFtpFileSize()
 {

-    puts("*** Testing FTP SIZE command ***");
+    wxPuts(wxT("*** Testing FTP SIZE command ***"));

 
 

-    if ( !ftp.ChDir(directory) )
+    if ( !ftp->ChDir(directory) )

     {
     {

-        printf("ERROR: failed to cd to %s\n", directory);
+        wxPrintf(wxT("ERROR: failed to cd to %s\n"), directory);

     }
 
     }
 

-    printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+    wxPrintf(wxT("Current directory is '%s'\n"), ftp->Pwd().c_str());

 
 

-    if ( ftp.FileExists(filename) )
+    if ( ftp->FileExists(filename) )

     {
     {

-        int size = ftp.GetFileSize(filename);
+        int size = ftp->GetFileSize(filename);

         if ( size == -1 )
         if ( size == -1 )

-            printf("ERROR: couldn't get size of '%s'\n", filename);
+            wxPrintf(wxT("ERROR: couldn't get size of '%s'\n"), filename);

         else
         else

-            printf("Size of '%s' is %d bytes.\n", filename, size);
+            wxPrintf(wxT("Size of '%s' is %d bytes.\n"), filename, size);

     }
     else
     {
     }
     else
     {

-        printf("ERROR: '%s' doesn't exist\n", filename);
+        wxPrintf(wxT("ERROR: '%s' doesn't exist\n"), filename);

     }
 }
 
 static void TestFtpMisc()
 {
     }
 }
 
 static void TestFtpMisc()
 {

-    puts("*** Testing miscellaneous wxFTP functions ***");
+    wxPuts(wxT("*** Testing miscellaneous wxFTP functions ***"));

 
 

-    if ( ftp.SendCommand("STAT") != '2' )
+    if ( ftp->SendCommand(wxT("STAT")) != '2' )

     {
     {

-        puts("ERROR: STAT failed");
+        wxPuts(wxT("ERROR: STAT failed"));

     }
     else
     {
     }
     else
     {

-        printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
+        wxPrintf(wxT("STAT returned:\n\n%s\n"), ftp->GetLastResult().c_str());

     }
 
     }
 

-    if ( ftp.SendCommand("HELP SITE") != '2' )
+    if ( ftp->SendCommand(wxT("HELP SITE")) != '2' )

     {
     {

-        puts("ERROR: HELP SITE failed");
+        wxPuts(wxT("ERROR: HELP SITE failed"));

     }
     else
     {
     }
     else
     {

-        printf("The list of site-specific commands:\n\n%s\n",
-               ftp.GetLastResult().c_str());
+        wxPrintf(wxT("The list of site-specific commands:\n\n%s\n"),
+               ftp->GetLastResult().c_str());

     }
 }
 
     }
 }
 

+#if TEST_INTERACTIVE
+

 static void TestFtpInteractive()
 {
 static void TestFtpInteractive()
 {

-    puts("\n*** Interactive wxFTP test ***");
+    wxPuts(wxT("\n*** Interactive wxFTP test ***"));

 
 

-    char buf[128];
+    wxChar buf[128];

 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        printf("Enter FTP command: ");
-        if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+        wxPrintf(wxT("Enter FTP command: "));
+        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )

             break;
 
         // kill the last '\n'
             break;
 
         // kill the last '\n'

-        buf[strlen(buf) - 1] = 0;
+        buf[wxStrlen(buf) - 1] = 0;

 
         // special handling of LIST and NLST as they require data connection
         wxString start(buf, 4);
         start.MakeUpper();
 
         // special handling of LIST and NLST as they require data connection
         wxString start(buf, 4);
         start.MakeUpper();

-        if ( start == "LIST" || start == "NLST" )
+        if ( start == wxT("LIST") || start == wxT("NLST") )

         {
             wxString wildcard;
         {
             wxString wildcard;

-            if ( strlen(buf) > 4 )
+            if ( wxStrlen(buf) > 4 )

                 wildcard = buf + 5;
 
             wxArrayString files;
                 wildcard = buf + 5;
 
             wxArrayString files;

-            if ( !ftp.GetList(files, wildcard, start == "LIST") )
+            if ( !ftp->GetList(files, wildcard, start == wxT("LIST")) )

             {
             {

-                printf("ERROR: failed to get %s of files\n", start.c_str());
+                wxPrintf(wxT("ERROR: failed to get %s of files\n"), start.c_str());

             }
             else
             {
             }
             else
             {

-                printf("--- %s of '%s' under '%s':\n",
-                       start.c_str(), wildcard.c_str(), ftp.Pwd().c_str());
+                wxPrintf(wxT("--- %s of '%s' under '%s':\n"),
+                       start.c_str(), wildcard.c_str(), ftp->Pwd().c_str());

                 size_t count = files.GetCount();
                 for ( size_t n = 0; n < count; n++ )
                 {
                 size_t count = files.GetCount();
                 for ( size_t n = 0; n < count; n++ )
                 {

-                    printf("\t%s\n", files[n].c_str());
+                    wxPrintf(wxT("\t%s\n"), files[n].c_str());

                 }
                 }

-                puts("--- End of the file list");
+                wxPuts(wxT("--- End of the file list"));

             }
         }
         else // !list
         {
             }
         }
         else // !list
         {

-            char ch = ftp.SendCommand(buf);
-            printf("Command %s", ch ? "succeeded" : "failed");
+            wxChar ch = ftp->SendCommand(buf);
+            wxPrintf(wxT("Command %s"), ch ? wxT("succeeded") : wxT("failed"));

             if ( ch )
             {
             if ( ch )
             {

-                printf(" (return code %c)", ch);
+                wxPrintf(wxT(" (return code %c)"), ch);

             }
 
             }
 

-            printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str());
+            wxPrintf(wxT(", server reply:\n%s\n\n"), ftp->GetLastResult().c_str());

         }
     }
 
         }
     }
 

-    puts("\n*** done ***");
+    wxPuts(wxT("\n*** done ***"));

 }
 
 }
 

+#endif // TEST_INTERACTIVE
+

 static void TestFtpUpload()
 {
 static void TestFtpUpload()
 {

-    puts("*** Testing wxFTP uploading ***\n");
+    wxPuts(wxT("*** Testing wxFTP uploading ***\n"));

 
     // upload a file
 
     // upload a file

-    static const char *file1 = "test1";
-    static const char *file2 = "test2";
-    wxOutputStream *out = ftp.GetOutputStream(file1);
+    static const wxChar *file1 = wxT("test1");
+    static const wxChar *file2 = wxT("test2");
+    wxOutputStream *out = ftp->GetOutputStream(file1);

     if ( out )
     {
     if ( out )
     {

-        printf("--- Uploading to %s ---\n", file1);
+        wxPrintf(wxT("--- Uploading to %s ---\n"), file1);

         out->Write("First hello", 11);
         delete out;
     }
 
     // send a command to check the remote file
         out->Write("First hello", 11);
         delete out;
     }
 
     // send a command to check the remote file

-    if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' )
+    if ( ftp->SendCommand(wxString(wxT("STAT ")) + file1) != '2' )

     {
     {

-        printf("ERROR: STAT %s failed\n", file1);
+        wxPrintf(wxT("ERROR: STAT %s failed\n"), file1);

     }
     else
     {
     }
     else
     {

-        printf("STAT %s returned:\n\n%s\n",
-               file1, ftp.GetLastResult().c_str());
+        wxPrintf(wxT("STAT %s returned:\n\n%s\n"),
+               file1, ftp->GetLastResult().c_str());

     }
 
     }
 

-    out = ftp.GetOutputStream(file2);
+    out = ftp->GetOutputStream(file2);

     if ( out )
     {
     if ( out )
     {

-        printf("--- Uploading to %s ---\n", file1);
+        wxPrintf(wxT("--- Uploading to %s ---\n"), file1);

         out->Write("Second hello", 12);
         delete out;
     }
         out->Write("Second hello", 12);
         delete out;
     }


@@ -2954,1503 +2652,730 @@ static void TestFtpUpload()
 #endif // TEST_FTP
 
 // ----------------------------------------------------------------------------
 #endif // TEST_FTP
 
 // ----------------------------------------------------------------------------

-// streams
+// stack backtrace

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

-#ifdef TEST_STREAMS
+#ifdef TEST_STACKWALKER

 
 

-#include "wx/wfstream.h"
-#include "wx/mstream.h"
+#if wxUSE_STACKWALKER

 
 

-static void TestFileStream()
-{
-    puts("*** Testing wxFileInputStream ***");
+#include "wx/stackwalk.h"

 
 

-    static const wxChar *filename = _T("testdata.fs");
-    {
-        wxFileOutputStream fsOut(filename);
-        fsOut.Write("foo", 3);
-    }
-
-    wxFileInputStream fsIn(filename);
-    printf("File stream size: %u\n", fsIn.GetSize());
-    while ( !fsIn.Eof() )
-    {
-        putchar(fsIn.GetC());
-    }
-
-    if ( !wxRemoveFile(filename) )
-    {
-        printf("ERROR: failed to remove the file '%s'.\n", filename);
-    }
-
-    puts("\n*** wxFileInputStream test done ***");
-}
-
-static void TestMemoryStream()
+class StackDump : public wxStackWalker

 {
 {

-    puts("*** Testing wxMemoryInputStream ***");
-
-    wxChar buf[1024];
-    wxStrncpy(buf, _T("Hello, stream!"), WXSIZEOF(buf));
-
-    wxMemoryInputStream memInpStream(buf, wxStrlen(buf));
-    printf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
-    while ( !memInpStream.Eof() )
+public:
+    StackDump(const char *argv0)
+        : wxStackWalker(argv0)

     {
     {

-        putchar(memInpStream.GetC());

     }
 
     }
 

-    puts("\n*** wxMemoryInputStream test done ***");
-}
-
-#endif // TEST_STREAMS
-
-// ----------------------------------------------------------------------------
-// timers
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_TIMER
-
-#include "wx/timer.h"
-#include "wx/utils.h"
-
-static void TestStopWatch()
-{
-    puts("*** Testing wxStopWatch ***\n");
-
-    wxStopWatch sw;
-    printf("Sleeping 3 seconds...");
-    wxSleep(3);
-    printf("\telapsed time: %ldms\n", sw.Time());
-
-    sw.Pause();
-    printf("Sleeping 2 more seconds...");
-    wxSleep(2);
-    printf("\telapsed time: %ldms\n", sw.Time());
-
-    sw.Resume();
-    printf("And 3 more seconds...");
-    wxSleep(3);
-    printf("\telapsed time: %ldms\n", sw.Time());
-
-    wxStopWatch sw2;
-    puts("\nChecking for 'backwards clock' bug...");
-    for ( size_t n = 0; n < 70; n++ )
+    virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)

     {
     {

-        sw2.Start();
-
-        for ( size_t m = 0; m < 100000; m++ )
-        {
-            if ( sw.Time() < 0 || sw2.Time() < 0 )
-            {
-                puts("\ntime is negative - ERROR!");
-            }
-        }
+        wxPuts(wxT("Stack dump:"));

 
 

-        putchar('.');
+        wxStackWalker::Walk(skip, maxdepth);

     }
 
     }
 

-    puts(", ok.");
-}
-
-#endif // TEST_TIMER
-
-// ----------------------------------------------------------------------------
-// vCard support
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_VCARD
-
-#include "wx/vcard.h"
-
-static void DumpVObject(size_t level, const wxVCardObject& vcard)
-{
-    void *cookie;
-    wxVCardObject *vcObj = vcard.GetFirstProp(&cookie);
-    while ( vcObj )
+protected:
+    virtual void OnStackFrame(const wxStackFrame& frame)

     {
     {

-        printf("%s%s",
-               wxString(_T('\t'), level).c_str(),
-               vcObj->GetName().c_str());
-
-        wxString value;
-        switch ( vcObj->GetType() )
-        {
-            case wxVCardObject::String:
-            case wxVCardObject::UString:
-                {
-                    wxString val;
-                    vcObj->GetValue(&val);
-                    value << _T('"') << val << _T('"');
-                }
-                break;
-
-            case wxVCardObject::Int:
-                {
-                    unsigned int i;
-                    vcObj->GetValue(&i);
-                    value.Printf(_T("%u"), i);
-                }
-                break;
-
-            case wxVCardObject::Long:
-                {
-                    unsigned long l;
-                    vcObj->GetValue(&l);
-                    value.Printf(_T("%lu"), l);
-                }
-                break;
-
-            case wxVCardObject::None:
-                break;
+        printf("[%2d] ", (int) frame.GetLevel());

 
 

-            case wxVCardObject::Object:
-                value = _T("<node>");
-                break;
-
-            default:
-                value = _T("<unknown value type>");
-        }
-
-        if ( !!value )
-            printf(" = %s", value.c_str());
-        putchar('\n');
-
-        DumpVObject(level + 1, *vcObj);
-
-        delete vcObj;
-        vcObj = vcard.GetNextProp(&cookie);
-    }
-}
-
-static void DumpVCardAddresses(const wxVCard& vcard)
-{
-    puts("\nShowing all addresses from vCard:\n");
-
-    size_t nAdr = 0;
-    void *cookie;
-    wxVCardAddress *addr = vcard.GetFirstAddress(&cookie);
-    while ( addr )
-    {
-        wxString flagsStr;
-        int flags = addr->GetFlags();
-        if ( flags & wxVCardAddress::Domestic )
-        {
-            flagsStr << _T("domestic ");
-        }
-        if ( flags & wxVCardAddress::Intl )
+        wxString name = frame.GetName();
+        if ( !name.empty() )

         {
         {

-            flagsStr << _T("international ");
+            printf("%-20.40s", (const char*)name.mb_str());

         }
         }

-        if ( flags & wxVCardAddress::Postal )
-        {
-            flagsStr << _T("postal ");
-        }
-        if ( flags & wxVCardAddress::Parcel )
-        {
-            flagsStr << _T("parcel ");
-        }
-        if ( flags & wxVCardAddress::Home )
+        else

         {
         {

-            flagsStr << _T("home ");
+            printf("0x%08lx", (unsigned long)frame.GetAddress());

         }
         }

-        if ( flags & wxVCardAddress::Work )
+
+        if ( frame.HasSourceLocation() )

         {
         {

-            flagsStr << _T("work ");
+            printf("\t%s:%d",
+                   (const char*)frame.GetFileName().mb_str(),
+                   (int)frame.GetLine());

         }
 
         }
 

-        printf("Address %u:\n"
-               "\tflags = %s\n"
-               "\tvalue = %s;%s;%s;%s;%s;%s;%s\n",
-               ++nAdr,
-               flagsStr.c_str(),
-               addr->GetPostOffice().c_str(),
-               addr->GetExtAddress().c_str(),
-               addr->GetStreet().c_str(),
-               addr->GetLocality().c_str(),
-               addr->GetRegion().c_str(),
-               addr->GetPostalCode().c_str(),
-               addr->GetCountry().c_str()
-               );
-
-        delete addr;
-        addr = vcard.GetNextAddress(&cookie);
-    }
-}
-
-static void DumpVCardPhoneNumbers(const wxVCard& vcard)
-{
-    puts("\nShowing all phone numbers from vCard:\n");
+        puts("");

 
 

-    size_t nPhone = 0;
-    void *cookie;
-    wxVCardPhoneNumber *phone = vcard.GetFirstPhoneNumber(&cookie);
-    while ( phone )
-    {
-        wxString flagsStr;
-        int flags = phone->GetFlags();
-        if ( flags & wxVCardPhoneNumber::Voice )
+        wxString type, val;
+        for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )

         {
         {

-            flagsStr << _T("voice ");
+            printf("\t%s %s = %s\n", (const char*)type.mb_str(),
+                                     (const char*)name.mb_str(),
+                                     (const char*)val.mb_str());

         }
         }

-        if ( flags & wxVCardPhoneNumber::Fax )
-        {
-            flagsStr << _T("fax ");
-        }
-        if ( flags & wxVCardPhoneNumber::Cellular )
-        {
-            flagsStr << _T("cellular ");
-        }
-        if ( flags & wxVCardPhoneNumber::Modem )
-        {
-            flagsStr << _T("modem ");
-        }
-        if ( flags & wxVCardPhoneNumber::Home )
-        {
-            flagsStr << _T("home ");
-        }
-        if ( flags & wxVCardPhoneNumber::Work )
-        {
-            flagsStr << _T("work ");
-        }
-
-        printf("Phone number %u:\n"
-               "\tflags = %s\n"
-               "\tvalue = %s\n",
-               ++nPhone,
-               flagsStr.c_str(),
-               phone->GetNumber().c_str()
-               );
-
-        delete phone;
-        phone = vcard.GetNextPhoneNumber(&cookie);

     }
     }

-}
+};

 
 

-static void TestVCardRead()
+static void TestStackWalk(const char *argv0)

 {
 {

-    puts("*** Testing wxVCard reading ***\n");
+    wxPuts(wxT("*** Testing wxStackWalker ***\n"));

 
 

-    wxVCard vcard(_T("vcard.vcf"));
-    if ( !vcard.IsOk() )
-    {
-        puts("ERROR: couldn't load vCard.");
-    }
-    else
-    {
-        // read individual vCard properties
-        wxVCardObject *vcObj = vcard.GetProperty("FN");
-        wxString value;
-        if ( vcObj )
-        {
-            vcObj->GetValue(&value);
-            delete vcObj;
-        }
-        else
-        {
-            value = _T("<none>");
-        }
-
-        printf("Full name retrieved directly: %s\n", value.c_str());
-
-
-        if ( !vcard.GetFullName(&value) )
-        {
-            value = _T("<none>");
-        }
-
-        printf("Full name from wxVCard API: %s\n", value.c_str());
+    StackDump dump(argv0);
+    dump.Walk();
+}

 
 

-        // now show how to deal with multiply occuring properties
-        DumpVCardAddresses(vcard);
-        DumpVCardPhoneNumbers(vcard);
+#endif // wxUSE_STACKWALKER

 
 

-        // and finally show all
-        puts("\nNow dumping the entire vCard:\n"
-             "-----------------------------\n");
+#endif // TEST_STACKWALKER

 
 

-        DumpVObject(0, vcard);
-    }
-}
-
-static void TestVCardWrite()
-{
-    puts("*** Testing wxVCard writing ***\n");
+// ----------------------------------------------------------------------------
+// standard paths
+// ----------------------------------------------------------------------------

 
 

-    wxVCard vcard;
-    if ( !vcard.IsOk() )
-    {
-        puts("ERROR: couldn't create vCard.");
-    }
-    else
-    {
-        // set some fields
-        vcard.SetName("Zeitlin", "Vadim");
-        vcard.SetFullName("Vadim Zeitlin");
-        vcard.SetOrganization("wxWindows", "R&D");
-
-        // just dump the vCard back
-        puts("Entire vCard follows:\n");
-        puts(vcard.Write());
-    }
+#ifdef TEST_STDPATHS
+
+#include "wx/stdpaths.h"
+#include "wx/wxchar.h"      // wxPrintf
+
+static void TestStandardPaths()
+{
+    wxPuts(wxT("*** Testing wxStandardPaths ***\n"));
+
+    wxTheApp->SetAppName(wxT("console"));
+
+    wxStandardPathsBase& stdp = wxStandardPaths::Get();
+    wxPrintf(wxT("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
+    wxPrintf(wxT("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
+    wxPrintf(wxT("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
+    wxPrintf(wxT("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
+    wxPrintf(wxT("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
+    wxPrintf(wxT("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());
+    wxPrintf(wxT("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str());
+    wxPrintf(wxT("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str());
+    wxPrintf(wxT("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());
+    wxPrintf(wxT("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str());
+    wxPrintf(wxT("Localized res. dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir(wxT("fr")).c_str());
+    wxPrintf(wxT("Message catalogs dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir
+                  (
+                    wxT("fr"),
+                    wxStandardPaths::ResourceCat_Messages
+                  ).c_str());

 }
 
 }
 

-#endif // TEST_VCARD
+#endif // TEST_STDPATHS

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

-// wide char (Unicode) support
+// streams

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

-#ifdef TEST_WCHAR
-
-#include "wx/strconv.h"
-#include "wx/fontenc.h"
-#include "wx/encconv.h"
-#include "wx/buffer.h"
+#ifdef TEST_STREAMS

 
 

-static const char textInUtf8[] =
-{
-    208, 157, 208, 181, 209, 129, 208, 186, 208, 176, 208, 183, 208, 176,
-    208, 189, 208, 189, 208, 190, 32, 208, 191, 208, 190, 209, 128, 208,
-    176, 208, 180, 208, 190, 208, 178, 208, 176, 208, 187, 32, 208, 188,
-    208, 181, 208, 189, 209, 143, 32, 209, 129, 208, 178, 208, 190, 208,
-    181, 208, 185, 32, 208, 186, 209, 128, 209, 131, 209, 130, 208, 181,
-    208, 185, 209, 136, 208, 181, 208, 185, 32, 208, 189, 208, 190, 208,
-    178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0
-};
+#include "wx/wfstream.h"
+#include "wx/mstream.h"

 
 

-static void TestUtf8()
+static void TestFileStream()

 {
 {

-    puts("*** Testing UTF8 support ***\n");
+    wxPuts(wxT("*** Testing wxFileInputStream ***"));

 
 

-    char buf[1024];
-    wchar_t wbuf[1024];
-    if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
+    static const wxString filename = wxT("testdata.fs");

     {
     {

-        puts("ERROR: UTF-8 decoding failed.");
+        wxFileOutputStream fsOut(filename);
+        fsOut.Write("foo", 3);

     }
     }

-    else
+

     {
     {

-        wxCSConv conv(_T("koi8-r"));
-        if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 )
+        wxFileInputStream fsIn(filename);
+        wxPrintf(wxT("File stream size: %u\n"), fsIn.GetSize());
+        int c;
+        while ( (c=fsIn.GetC()) != wxEOF  )

         {
         {

-            puts("ERROR: conversion to KOI8-R failed.");
-        }
-        else
-        {
-            printf("The resulting string (in KOI8-R): %s\n", buf);
+            wxPutchar(c);

         }
     }
 
         }
     }
 

-    if ( wxConvUTF8.WC2MB(buf, L"à la", WXSIZEOF(buf)) <= 0 )
-    {
-        puts("ERROR: conversion to UTF-8 failed.");
-    }
-    else
+    if ( !wxRemoveFile(filename) )

     {
     {

-        printf("The string in UTF-8: %s\n", buf);
+        wxPrintf(wxT("ERROR: failed to remove the file '%s'.\n"), filename.c_str());

     }
 
     }
 

-    puts("");
+    wxPuts(wxT("\n*** wxFileInputStream test done ***"));

 }
 
 }
 

-static void TestEncodingConverter()
-{
-    wxPuts(_T("*** Testing wxEncodingConverter ***\n"));
-
-    // using wxEncodingConverter should give the same result as above
-    char buf[1024];
-    wchar_t wbuf[1024];
-    if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
-    {
-        puts("ERROR: UTF-8 decoding failed.");
-    }
-    else
-    {
-        wxEncodingConverter ec;
-        ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8);
-        ec.Convert(wbuf, buf);
-        printf("The same string obtained using wxEC: %s\n", buf);
-    }
-
-    puts("");
-}
-
-#endif // TEST_WCHAR
-
-// ----------------------------------------------------------------------------
-// ZIP stream
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_ZIP
-
-#include "wx/filesys.h"
-#include "wx/fs_zip.h"
-#include "wx/zipstrm.h"
-
-static const wxChar *TESTFILE_ZIP = _T("testdata.zip");
-
-static void TestZipStreamRead()
+static void TestMemoryStream()

 {
 {

-    puts("*** Testing ZIP reading ***\n");
+    wxPuts(wxT("*** Testing wxMemoryOutputStream ***"));

 
 

-    static const wxChar *filename = _T("foo");
-    wxZipInputStream istr(TESTFILE_ZIP, filename);
-    printf("Archive size: %u\n", istr.GetSize());
+    wxMemoryOutputStream memOutStream;
+    wxPrintf(wxT("Initially out stream offset: %lu\n"),
+             (unsigned long)memOutStream.TellO());

 
 

-    printf("Dumping the file '%s':\n", filename);
-    while ( !istr.Eof() )
+    for ( const wxChar *p = wxT("Hello, stream!"); *p; p++ )

     {
     {

-        putchar(istr.GetC());
-        fflush(stdout);
+        memOutStream.PutC(*p);

     }
 
     }
 

-    puts("\n----- done ------");
-}
+    wxPrintf(wxT("Final out stream offset: %lu\n"),
+             (unsigned long)memOutStream.TellO());

 
 

-static void DumpZipDirectory(wxFileSystem& fs,
-                             const wxString& dir,
-                             const wxString& indent)
-{
-    wxString prefix = wxString::Format(_T("%s#zip:%s"),
-                                         TESTFILE_ZIP, dir.c_str());
-    wxString wildcard = prefix + _T("/*");
+    wxPuts(wxT("*** Testing wxMemoryInputStream ***"));

 
 

-    wxString dirname = fs.FindFirst(wildcard, wxDIR);
-    while ( !dirname.empty() )
-    {
-        if ( !dirname.StartsWith(prefix + _T('/'), &dirname) )
-        {
-            wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n"));
-
-            break;
-        }
-
-        wxPrintf(_T("%s%s\n"), indent.c_str(), dirname.c_str());
-
-        DumpZipDirectory(fs, dirname,
-                         indent + wxString(_T(' '), 4));
-
-        dirname = fs.FindNext();
-    }
+    wxChar buf[1024];
+    size_t len = memOutStream.CopyTo(buf, WXSIZEOF(buf));

 
 

-    wxString filename = fs.FindFirst(wildcard, wxFILE);
-    while ( !filename.empty() )
+    wxMemoryInputStream memInpStream(buf, len);
+    wxPrintf(wxT("Memory stream size: %u\n"), memInpStream.GetSize());
+    int c;
+    while ( (c=memInpStream.GetC()) != wxEOF )

     {
     {

-        if ( !filename.StartsWith(prefix, &filename) )
-        {
-            wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n"));
-
-            break;
-        }
-
-        wxPrintf(_T("%s%s\n"), indent.c_str(), filename.c_str());
-
-        filename = fs.FindNext();
+        wxPutchar(c);

     }
     }

-}
-
-static void TestZipFileSystem()
-{
-    puts("*** Testing ZIP file system ***\n");

 
 

-    wxFileSystem::AddHandler(new wxZipFSHandler);
-    wxFileSystem fs;
-    wxPrintf(_T("Dumping all files in the archive %s:\n"), TESTFILE_ZIP);
-
-    DumpZipDirectory(fs, _T(""), wxString(_T(' '), 4));
+    wxPuts(wxT("\n*** wxMemoryInputStream test done ***"));

 }
 
 }
 

-#endif // TEST_ZIP
+#endif // TEST_STREAMS

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

-// ZLIB stream
+// timers

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

-#ifdef TEST_ZLIB
-
-#include "wx/zstream.h"
-#include "wx/wfstream.h"
+#ifdef TEST_TIMER

 
 

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

 
 

-static void TestZlibStreamWrite()
+static void TestStopWatch()

 {
 {

-    puts("*** Testing Zlib stream reading ***\n");
+    wxPuts(wxT("*** Testing wxStopWatch ***\n"));

 
 

-    wxFileOutputStream fileOutStream(FILENAME_GZ);
-    wxZlibOutputStream ostr(fileOutStream, 0);
-    printf("Compressing the test string... ");
-    ostr.Write(TEST_DATA, sizeof(TEST_DATA));
-    if ( !ostr )
-    {
-        puts("(ERROR: failed)");
-    }
-    else
-    {
-        puts("(ok)");
-    }
+    wxStopWatch sw;
+    sw.Pause();
+    wxPrintf(wxT("Initially paused, after 2 seconds time is..."));
+    fflush(stdout);
+    wxSleep(2);
+    wxPrintf(wxT("\t%ldms\n"), sw.Time());

 
 

-    puts("\n----- done ------");
-}
+    wxPrintf(wxT("Resuming stopwatch and sleeping 3 seconds..."));
+    fflush(stdout);
+    sw.Resume();
+    wxSleep(3);
+    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());

 
 

-static void TestZlibStreamRead()
-{
-    puts("*** Testing Zlib stream reading ***\n");
+    sw.Pause();
+    wxPrintf(wxT("Pausing agan and sleeping 2 more seconds..."));
+    fflush(stdout);
+    wxSleep(2);
+    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());

 
 

-    wxFileInputStream fileInStream(FILENAME_GZ);
-    wxZlibInputStream istr(fileInStream);
-    printf("Archive size: %u\n", istr.GetSize());
+    sw.Resume();
+    wxPrintf(wxT("Finally resuming and sleeping 2 more seconds..."));
+    fflush(stdout);
+    wxSleep(2);
+    wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());

 
 

-    puts("Dumping the file:");
-    while ( !istr.Eof() )
+    wxStopWatch sw2;
+    wxPuts(wxT("\nChecking for 'backwards clock' bug..."));
+    for ( size_t n = 0; n < 70; n++ )

     {
     {

-        putchar(istr.GetC());
+        sw2.Start();
+
+        for ( size_t m = 0; m < 100000; m++ )
+        {
+            if ( sw.Time() < 0 || sw2.Time() < 0 )
+            {
+                wxPuts(wxT("\ntime is negative - ERROR!"));
+            }
+        }
+
+        wxPutchar('.');

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

-    puts("\n----- done ------");
+    wxPuts(wxT(", ok."));

 }
 
 }
 

-#endif // TEST_ZLIB
-
-// ----------------------------------------------------------------------------
-// date time
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_DATETIME
-
-#include <math.h>
-
-#include "wx/date.h"
-#include "wx/datetime.h"
+#include "wx/timer.h"
+#include "wx/evtloop.h"

 
 

-// the test data
-struct Date
+void TestTimer()

 {
 {

-    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;
-    }
+    wxPuts(wxT("*** Testing wxTimer ***\n"));

 
 

-    wxString Format() const
+    class MyTimer : public wxTimer

     {
     {

-        wxString s;
-        s.Printf("%02d:%02d:%02d %10s %02d, %4d%s",
-                 hour, min, sec,
-                 wxDateTime::GetMonthName(month).c_str(),
-                 day,
-                 abs(wxDateTime::ConvertYearToBC(year)),
-                 year > 0 ? "AD" : "BC");
-        return s;
-    }
-
-    wxString FormatDate() const
-    {
-        wxString s;
-        s.Printf("%02d-%s-%4d%s",
-                 day,
-                 wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
-                 abs(wxDateTime::ConvertYearToBC(year)),
-                 year > 0 ? "AD" : "BC");
-        return s;
-    }
-};
+    public:
+        MyTimer() : wxTimer() { m_num = 0; }

 
 

-static const Date testDates[] =
-{
-    {  1, wxDateTime::Jan,  1970, 00, 00, 00, 2440587.5, wxDateTime::Thu,         0,     -3600 },
-    { 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()
-{
-    puts("\n*** wxDateTime static methods test ***");
+        virtual void Notify()
+        {
+            wxPrintf(wxT("%d"), m_num++);
+            fflush(stdout);

 
 

-    // some info about the current date
-    int year = wxDateTime::GetCurrentYear();
-    printf("Current year %d is %sa leap one and has %d days.\n",
-           year,
-           wxDateTime::IsLeapYear(year) ? "" : "not ",
-           wxDateTime::GetNumberOfDays(year));
+            if ( m_num == 10 )
+            {
+                wxPrintf(wxT("... exiting the event loop"));
+                Stop();

 
 

-    wxDateTime::Month month = wxDateTime::GetCurrentMonth();
-    printf("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));
+                wxEventLoop::GetActive()->Exit(0);
+                wxPuts(wxT(", ok."));
+            }

 
 

-    // 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, },
+            fflush(stdout);
+        }

 
 

-        // second line: TRUE if leap, FALSE otherwise
-        { FALSE, TRUE, TRUE, FALSE, TRUE }
+    private:
+        int m_num;

     };
 
     };
 

-    for ( size_t n = 0; n < nYears; n++ )
-    {
-        int year = years[0][n];
-        bool should = years[1][n] != 0,
-             is = wxDateTime::IsLeapYear(year);
+    wxEventLoop loop;

 
 

-        printf("Year %d is %sa leap year (%s)\n",
-               year,
-               is ? "" : "not ",
-               should == is ? "ok" : "ERROR");
+    wxTimer timer1;
+    timer1.Start(100, true /* one shot */);
+    timer1.Stop();
+    timer1.Start(100, true /* one shot */);

 
 

-        wxASSERT( should == wxDateTime::IsLeapYear(year) );
-    }
+    MyTimer timer;
+    timer.Start(500);
+
+    loop.Run();

 }
 
 }
 

-// test constructing wxDateTime objects
-static void TestTimeSet()
-{
-    puts("\n*** wxDateTime construction test ***");
+#endif // TEST_TIMER

 
 

-    for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
-    {
-        const Date& d1 = testDates[n];
-        wxDateTime dt = d1.DT();
+// ----------------------------------------------------------------------------
+// wxVolume tests
+// ----------------------------------------------------------------------------

 
 

-        Date d2;
-        d2.Init(dt.GetTm());
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME
+    #undef TEST_VOLUME
+#endif

 
 

-        wxString s1 = d1.Format(),
-                 s2 = d2.Format();
+#ifdef TEST_VOLUME

 
 

-        printf("Date: %s == %s (%s)\n",
-               s1.c_str(), s2.c_str(),
-               s1 == s2 ? "ok" : "ERROR");
-    }
-}
+#include "wx/volume.h"

 
 

-// test time zones stuff
-static void TestTimeZones()
+static const wxChar *volumeKinds[] =

 {
 {

-    puts("\n*** wxDateTime timezone test ***");
-
-    wxDateTime now = wxDateTime::Now();
-
-    printf("Current GMT time:\t%s\n", now.Format("%c", wxDateTime::GMT0).c_str());
-    printf("Unix epoch (GMT):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::GMT0).c_str());
-    printf("Unix epoch (EST):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::EST).c_str());
-    printf("Current time in Paris:\t%s\n", now.Format("%c", wxDateTime::CET).c_str());
-    printf("               Moscow:\t%s\n", now.Format("%c", wxDateTime::MSK).c_str());
-    printf("             New York:\t%s\n", now.Format("%c", wxDateTime::EST).c_str());
-
-    wxDateTime::Tm tm = now.GetTm();
-    if ( wxDateTime(tm) != now )
-    {
-        printf("ERROR: got %s instead of %s\n",
-               wxDateTime(tm).Format().c_str(), now.Format().c_str());
-    }
-}
+    wxT("floppy"),
+    wxT("hard disk"),
+    wxT("CD-ROM"),
+    wxT("DVD-ROM"),
+    wxT("network volume"),
+    wxT("other volume"),
+};

 
 

-// test some minimal support for the dates outside the standard range
-static void TestTimeRange()
+static void TestFSVolume()

 {
 {

-    puts("\n*** wxDateTime out-of-standard-range dates test ***");
-
-    static const char *fmt = "%d-%b-%Y %H:%M:%S";
-
-    printf("Unix epoch:\t%s\n",
-           wxDateTime(2440587.5).Format(fmt).c_str());
-    printf("Feb 29, 0: \t%s\n",
-            wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str());
-    printf("JDN 0:     \t%s\n",
-            wxDateTime(0.0).Format(fmt).c_str());
-    printf("Jan 1, 1AD:\t%s\n",
-            wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str());
-    printf("May 29, 2099:\t%s\n",
-            wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
-}
+    wxPuts(wxT("*** Testing wxFSVolume class ***"));

 
 

-static void TestTimeTicks()
-{
-    puts("\n*** wxDateTime ticks test ***");
+    wxArrayString volumes = wxFSVolume::GetVolumes();
+    size_t count = volumes.GetCount();

 
 

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

     {
     {

-        const Date& d = testDates[n];
-        if ( d.ticks == -1 )
-            continue;
-
-        wxDateTime dt = d.DT();
-        long ticks = (dt.GetValue() / 1000).ToLong();
-        printf("Ticks of %s:\t% 10ld", d.Format().c_str(), ticks);
-        if ( ticks == d.ticks )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %ld, delta = %ld)\n",
-                   d.ticks, ticks - d.ticks);
-        }
-
-        dt = d.DT().ToTimezone(wxDateTime::GMT0);
-        ticks = (dt.GetValue() / 1000).ToLong();
-        printf("GMtks of %s:\t% 10ld", d.Format().c_str(), ticks);
-        if ( ticks == d.gmticks )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %ld, delta = %ld)\n",
-                   d.gmticks, ticks - d.gmticks);
-        }
+        wxPuts(wxT("ERROR: no mounted volumes?"));
+        return;

     }
 
     }
 

-    puts("");
-}
-
-// test conversions to JDN &c
-static void TestTimeJDN()
-{
-    puts("\n*** wxDateTime to JDN test ***");
+    wxPrintf(wxT("%u mounted volumes found:\n"), count);

 
 

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

     {
     {

-        const Date& d = testDates[n];
-        wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
-        double jdn = dt.GetJulianDayNumber();
-
-        printf("JDN of %s is:\t% 15.6f", d.Format().c_str(), jdn);
-        if ( jdn == d.jdn )
+        wxFSVolume vol(volumes[n]);
+        if ( !vol.IsOk() )

         {
         {

-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %f, delta = %f)\n",
-                   d.jdn, jdn - d.jdn);
+            wxPuts(wxT("ERROR: couldn't create volume"));
+            continue;

         }
         }

-    }
-}
-
-// test week days computation
-static void TestTimeWDays()
-{
-    puts("\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();
-        printf("%s is: %s",
-               d.Format().c_str(),
-               wxDateTime::GetWeekDayName(wday).c_str());
-        if ( wday == d.wday )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %s)\n",
-                   wxDateTime::GetWeekDayName(d.wday).c_str());
-        }
+        wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"),
+                 n + 1,
+                 vol.GetDisplayName().c_str(),
+                 vol.GetName().c_str(),
+                 volumeKinds[vol.GetKind()],
+                 vol.IsWritable() ? wxT("rw") : wxT("ro"),
+                 vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
+                                                     : wxT("fixed"));

     }
     }

+}

 
 

-    puts("");
-
-    // test SetToWeekDay()
-    struct WeekDateTestData
-    {
-        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
-        {
-            wxString s, which;
-            switch ( nWeek < -1 ? -nWeek : nWeek )
-            {
-                case 1: which = "first"; break;
-                case 2: which = "second"; break;
-                case 3: which = "third"; break;
-                case 4: which = "fourth"; break;
-                case 5: which = "fifth"; break;
-
-                case -1: which = "last"; break;
-            }
-
-            if ( nWeek < -1 )
-            {
-                which += " from end";
-            }
-
-            s.Printf("The %s %s of %s in %d",
-                     which.c_str(),
-                     wxDateTime::GetWeekDayName(wday).c_str(),
-                     wxDateTime::GetMonthName(month).c_str(),
-                     year);
-
-            return s;
-        }
-    };
+#endif // TEST_VOLUME

 
 

-    // 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' ]
+// ----------------------------------------------------------------------------
+// wide char and Unicode support
+// ----------------------------------------------------------------------------

 
 

-week = DateTimeDelta(7)
+#ifdef TEST_WCHAR

 
 

-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
+#include "wx/strconv.h"
+#include "wx/fontenc.h"
+#include "wx/encconv.h"
+#include "wx/buffer.h"

 
 

-    countFromEnd = choice([-1, 1])
-    weekNum = 0;
+static const unsigned char utf8koi8r[] =
+{
+    208, 157, 208, 181, 209, 129, 208, 186, 208, 176, 208, 183, 208, 176,
+    208, 189, 208, 189, 208, 190, 32, 208, 191, 208, 190, 209, 128, 208,
+    176, 208, 180, 208, 190, 208, 178, 208, 176, 208, 187, 32, 208, 188,
+    208, 181, 208, 189, 209, 143, 32, 209, 129, 208, 178, 208, 190, 208,
+    181, 208, 185, 32, 208, 186, 209, 128, 209, 131, 209, 130, 208, 181,
+    208, 185, 209, 136, 208, 181, 208, 185, 32, 208, 189, 208, 190, 208,
+    178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0
+};

 
 

-    while dt.month is month:
-        dt = dt - countFromEnd * week
-        weekNum = weekNum + countFromEnd
+static const unsigned char utf8iso8859_1[] =
+{
+    0x53, 0x79, 0x73, 0x74, 0xc3, 0xa8, 0x6d, 0x65, 0x73, 0x20, 0x49, 0x6e,
+    0x74, 0xc3, 0xa9, 0x67, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x20, 0x65,
+    0x6e, 0x20, 0x4d, 0xc3, 0xa9, 0x63, 0x61, 0x6e, 0x69, 0x71, 0x75, 0x65,
+    0x20, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x71, 0x75, 0x65, 0x20, 0x65,
+    0x74, 0x20, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x71, 0x75, 0x65, 0
+};

 
 

-    data = { 'day': rjust(`day`, 2), 'month': monthNames[month - 1], 'year': year, 'weekNum': rjust(`weekNum`, 2), 'wday': wdayNames[wday] }
+static const unsigned char utf8Invalid[] =
+{
+    0x3c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3e, 0x32, 0x30, 0x30,
+    0x32, 0xe5, 0xb9, 0xb4, 0x30, 0x39, 0xe6, 0x9c, 0x88, 0x32, 0x35, 0xe6,
+    0x97, 0xa5, 0x20, 0x30, 0x37, 0xe6, 0x99, 0x82, 0x33, 0x39, 0xe5, 0x88,
+    0x86, 0x35, 0x37, 0xe7, 0xa7, 0x92, 0x3c, 0x2f, 0x64, 0x69, 0x73, 0x70,
+    0x6c, 0x61, 0x79, 0
+};

 
 

-    print "{ { %(day)s, wxDateTime::%(month)s, %(year)d }, %(weekNum)d, "\
-          "wxDateTime::%(wday)s, wxDateTime::%(month)s, %(year)d }," % data
-    */
+static const struct Utf8Data
+{
+    const unsigned char *text;
+    size_t len;
+    const wxChar *charset;
+    wxFontEncoding encoding;
+} utf8data[] =
+{
+    { utf8Invalid, WXSIZEOF(utf8Invalid), wxT("iso8859-1"), wxFONTENCODING_ISO8859_1 },
+    { utf8koi8r, WXSIZEOF(utf8koi8r), wxT("koi8-r"), wxFONTENCODING_KOI8 },
+    { utf8iso8859_1, WXSIZEOF(utf8iso8859_1), wxT("iso8859-1"), wxFONTENCODING_ISO8859_1 },
+};

 
 

-    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 },
-    };
+static void TestUtf8()
+{
+    wxPuts(wxT("*** Testing UTF8 support ***\n"));

 
 

-    static const char *fmt = "%d-%b-%Y";
+    char buf[1024];
+    wchar_t wbuf[1024];

 
 

-    wxDateTime dt;
-    for ( n = 0; n < WXSIZEOF(weekDatesTestData); n++ )
+    for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ )

     {
     {

-        const WeekDateTestData& wd = weekDatesTestData[n];
-
-        dt.SetToWeekDay(wd.wday, wd.nWeek, wd.month, wd.year);
-
-        printf("%s is %s", wd.Format().c_str(), dt.Format(fmt).c_str());
-
-        const Date& d = wd.date;
-        if ( d.SameDay(dt.GetTm()) )
+        const Utf8Data& u8d = utf8data[n];
+        if ( wxConvUTF8.MB2WC(wbuf, (const char *)u8d.text,
+                              WXSIZEOF(wbuf)) == (size_t)-1 )

         {
         {

-            puts(" (ok)");
+            wxPuts(wxT("ERROR: UTF-8 decoding failed."));

         }
         else
         {
         }
         else
         {

-            dt.Set(d.day, d.month, d.year);
-
-            printf(" (ERROR: should be %s)\n", dt.Format(fmt).c_str());
+            wxCSConv conv(u8d.charset);
+            if ( conv.WC2MB(buf, wbuf, WXSIZEOF(buf)) == (size_t)-1 )
+            {
+                wxPrintf(wxT("ERROR: conversion to %s failed.\n"), u8d.charset);
+            }
+            else
+            {
+                wxPrintf(wxT("String in %s: %s\n"), u8d.charset, buf);
+            }

         }
         }

+
+        wxString s(wxConvUTF8.cMB2WC((const char *)u8d.text));
+        if ( s.empty() )
+            s = wxT("<< conversion failed >>");
+        wxPrintf(wxT("String in current cset: %s\n"), s.c_str());
+

     }
     }

+
+    wxPuts(wxEmptyString);

 }
 
 }
 

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

 {
 {

-    puts("\n*** wxDateTime week number test ***");
+    wxPuts(wxT("*** Testing wxEncodingConverter ***\n"));

 
 

-    struct WeekNumberTestData
+    // using wxEncodingConverter should give the same result as above
+    char buf[1024];
+    wchar_t wbuf[1024];
+    if ( wxConvUTF8.MB2WC(wbuf, (const char *)utf8koi8r,
+                          WXSIZEOF(utf8koi8r)) == (size_t)-1 )

     {
     {

-        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
-    };
+        wxPuts(wxT("ERROR: UTF-8 decoding failed."));
+    }
+    else
+    {
+        wxEncodingConverter ec;
+        ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8);
+        ec.Convert(wbuf, buf);
+        wxPrintf(wxT("The same KOI8-R string using wxEC: %s\n"), buf);
+    }

 
 

-    // 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
+    wxPuts(wxEmptyString);
+}

 
 

-    */
-    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 },
-    };
+#endif // TEST_WCHAR

 
 

-    for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ )
-    {
-        const WeekNumberTestData& wn = weekNumberTestDates[n];
-        const Date& d = wn.date;
+// ----------------------------------------------------------------------------
+// ZIP stream
+// ----------------------------------------------------------------------------

 
 

-        wxDateTime dt = d.DT();
+#ifdef TEST_ZIP

 
 

-        wxDateTime::wxDateTime_t
-            week = dt.GetWeekOfYear(wxDateTime::Monday_First),
-            wmon = dt.GetWeekOfMonth(wxDateTime::Monday_First),
-            wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
-            dnum = dt.GetDayOfYear();
+#include "wx/filesys.h"
+#include "wx/fs_zip.h"
+#include "wx/zipstrm.h"

 
 

-        printf("%s: the day number is %d",
-               d.FormatDate().c_str(), dnum);
-        if ( dnum == wn.dnum )
-        {
-            printf(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %d)", wn.dnum);
-        }
+static const wxChar *TESTFILE_ZIP = wxT("testdata.zip");

 
 

-        printf(", week in month is %d", wmon);
-        if ( wmon == wn.wmon )
-        {
-            printf(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %d)", wn.wmon);
-        }
+static void TestZipStreamRead()
+{
+    wxPuts(wxT("*** Testing ZIP reading ***\n"));

 
 

-        printf(" or %d", wmon2);
-        if ( wmon2 == wn.wmon2 )
-        {
-            printf(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %d)", wn.wmon2);
-        }
+    static const wxString filename = wxT("foo");
+    wxFFileInputStream in(TESTFILE_ZIP);
+    wxZipInputStream istr(in);
+    wxZipEntry entry(filename);
+    istr.OpenEntry(entry);

 
 

-        printf(", week in year is %d", week);
-        if ( week == wn.week )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %d)\n", wn.week);
-        }
+    wxPrintf(wxT("Archive size: %u\n"), istr.GetSize());
+
+    wxPrintf(wxT("Dumping the file '%s':\n"), filename.c_str());
+    int c;
+    while ( (c=istr.GetC()) != wxEOF )
+    {
+        wxPutchar(c);
+        fflush(stdout);

     }
     }

+
+    wxPuts(wxT("\n----- done ------"));

 }
 
 }
 

-// test DST calculations
-static void TestTimeDST()
+static void DumpZipDirectory(wxFileSystem& fs,
+                             const wxString& dir,
+                             const wxString& indent)

 {
 {

-    puts("\n*** wxDateTime DST test ***");
-
-    printf("DST is%s in effect now.\n\n",
-           wxDateTime::Now().IsDST() ? "" : " not");
+    wxString prefix = wxString::Format(wxT("%s#zip:%s"),
+                                         TESTFILE_ZIP, dir.c_str());
+    wxString wildcard = prefix + wxT("/*");

 
 

-    // taken from http://www.energy.ca.gov/daylightsaving.html
-    static const Date datesDST[2][2004 - 1900 + 1] =
+    wxString dirname = fs.FindFirst(wildcard, wxDIR);
+    while ( !dirname.empty() )

     {
     {

+        if ( !dirname.StartsWith(prefix + wxT('/'), &dirname) )

         {
         {

-            { 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 },
+            wxPrintf(wxT("ERROR: unexpected wxFileSystem::FindNext result\n"));
+
+            break;

         }
         }

-    };

 
 

-    int year;
-    for ( year = 1990; year < 2005; year++ )
-    {
-        wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
-                   dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
+        wxPrintf(wxT("%s%s\n"), indent.c_str(), dirname.c_str());

 
 

-        printf("DST period in the US for year %d: from %s to %s",
-               year, dtBegin.Format().c_str(), dtEnd.Format().c_str());
+        DumpZipDirectory(fs, dirname,
+                         indent + wxString(wxT(' '), 4));

 
 

-        size_t n = year - 1990;
-        const Date& dBegin = datesDST[0][n];
-        const Date& dEnd = datesDST[1][n];
+        dirname = fs.FindNext();
+    }

 
 

-        if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) )
-        {
-            puts(" (ok)");
-        }
-        else
+    wxString filename = fs.FindFirst(wildcard, wxFILE);
+    while ( !filename.empty() )
+    {
+        if ( !filename.StartsWith(prefix, &filename) )

         {
         {

-            printf(" (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);
+            wxPrintf(wxT("ERROR: unexpected wxFileSystem::FindNext result\n"));
+
+            break;

         }
         }

-    }

 
 

-    puts("");
+        wxPrintf(wxT("%s%s\n"), indent.c_str(), filename.c_str());

 
 

-    for ( year = 1990; year < 2005; year++ )
-    {
-        printf("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());
+        filename = fs.FindNext();

     }
 }
 
     }
 }
 

-// test wxDateTime -> text conversion
-static void TestTimeFormat()
+static void TestZipFileSystem()

 {
 {

-    puts("\n*** wxDateTime formatting test ***");
+    wxPuts(wxT("*** Testing ZIP file system ***\n"));

 
 

-    // 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
-    };
+    wxFileSystem::AddHandler(new wxZipFSHandler);
+    wxFileSystem fs;
+    wxPrintf(wxT("Dumping all files in the archive %s:\n"), TESTFILE_ZIP);

 
 

-    static const struct
-    {
-        CompareKind compareKind;
-        const char *format;
-    } formatTestFormats[] =
-    {
-       { CompareBoth, "---> %c" },
-       { CompareDate, "Date is %A, %d of %B, in year %Y" },
-       { CompareBoth, "Date is %x, time is %X" },
-       { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" },
-       { CompareNone, "The day of year: %j, the week of year: %W" },
-       { CompareDate, "ISO date without separators: %4Y%2m%2d" },
-    };
+    DumpZipDirectory(fs, wxT(""), wxString(wxT(' '), 4));
+}

 
 

-    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
-    };
+#endif // TEST_ZIP

 
 

-    // an extra test (as it doesn't depend on date, don't do it in the loop)
-    printf("%s\n", wxDateTime::Now().Format("Our timezone is %Z").c_str());
+// ----------------------------------------------------------------------------
+// date time
+// ----------------------------------------------------------------------------

 
 

-    for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ )
-    {
-        puts("");
+#ifdef TEST_DATETIME

 
 

-        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);
-            printf("%s", s.c_str());
+#include "wx/math.h"
+#include "wx/datetime.h"

 
 

-            // what can we recover?
-            int kind = formatTestFormats[n].compareKind;
+// this test miscellaneous static wxDateTime functions

 
 

-            // convert back
-            wxDateTime dt2;
-            const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format);
-            if ( !result )
-            {
-                // converion failed - should it have?
-                if ( kind == CompareNone )
-                    puts(" (ok)");
-                else
-                    puts(" (ERROR: conversion back failed)");
-            }
-            else if ( *result )
-            {
-                // should have parsed the entire string
-                puts(" (ERROR: conversion back stopped too soon)");
-            }
-            else
-            {
-                bool equal = FALSE; // suppress compilaer warning
-                switch ( kind )
-                {
-                    case CompareBoth:
-                        equal = dt2 == dt;
-                        break;
+#if TEST_ALL

 
 

-                    case CompareDate:
-                        equal = dt.IsSameDate(dt2);
-                        break;
+static void TestTimeStatic()
+{
+    wxPuts(wxT("\n*** wxDateTime static methods test ***"));

 
 

-                    case CompareTime:
-                        equal = dt.IsSameTime(dt2);
-                        break;
-                }
+    // some info about the current date
+    int year = wxDateTime::GetCurrentYear();
+    wxPrintf(wxT("Current year %d is %sa leap one and has %d days.\n"),
+           year,
+           wxDateTime::IsLeapYear(year) ? "" : "not ",
+           wxDateTime::GetNumberOfDays(year));

 
 

-                if ( !equal )
-                {
-                    printf(" (ERROR: got back '%s' instead of '%s')\n",
-                           dt2.Format().c_str(), dt.Format().c_str());
-                }
-                else
-                {
-                    puts(" (ok)");
-                }
-            }
-        }
-    }
+    wxDateTime::Month month = wxDateTime::GetCurrentMonth();
+    wxPrintf(wxT("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));

 }
 
 }
 

-// test text -> wxDateTime conversion
-static void TestTimeParse()
+// test time zones stuff
+static void TestTimeZones()

 {
 {

-    puts("\n*** wxDateTime parse test ***");
+    wxPuts(wxT("\n*** wxDateTime timezone test ***"));

 
 

-    struct ParseTestData
-    {
-        const char *format;
-        Date date;
-        bool good;
-    };
+    wxDateTime now = wxDateTime::Now();

 
 

-    static const ParseTestData parseTestDates[] =
-    {
-        { "Sat, 18 Dec 1999 00:46:40 +0100", { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, TRUE },
-        { "Wed, 1 Dec 1999 05:17:20 +0300",  {  1, wxDateTime::Dec, 1999, 03, 17, 20 }, TRUE },
-    };
+    wxPrintf(wxT("Current GMT time:\t%s\n"), now.Format(wxT("%c"), wxDateTime::GMT0).c_str());
+    wxPrintf(wxT("Unix epoch (GMT):\t%s\n"), wxDateTime((time_t)0).Format(wxT("%c"), wxDateTime::GMT0).c_str());
+    wxPrintf(wxT("Unix epoch (EST):\t%s\n"), wxDateTime((time_t)0).Format(wxT("%c"), wxDateTime::EST).c_str());
+    wxPrintf(wxT("Current time in Paris:\t%s\n"), now.Format(wxT("%c"), wxDateTime::CET).c_str());
+    wxPrintf(wxT("               Moscow:\t%s\n"), now.Format(wxT("%c"), wxDateTime::MSK).c_str());
+    wxPrintf(wxT("             New York:\t%s\n"), now.Format(wxT("%c"), wxDateTime::EST).c_str());
+
+    wxPrintf(wxT("%s\n"), wxDateTime::Now().Format(wxT("Our timezone is %Z")).c_str());

 
 

-    for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
+    wxDateTime::Tm tm = now.GetTm();
+    if ( wxDateTime(tm) != now )

     {
     {

-        const char *format = parseTestDates[n].format;
+        wxPrintf(wxT("ERROR: got %s instead of %s\n"),
+                 wxDateTime(tm).Format().c_str(), now.Format().c_str());
+    }
+}

 
 

-        printf("%s => ", format);
+// test some minimal support for the dates outside the standard range
+static void TestTimeRange()
+{
+    wxPuts(wxT("\n*** wxDateTime out-of-standard-range dates test ***"));

 
 

-        wxDateTime dt;
-        if ( dt.ParseRfc822Date(format) )
-        {
-            printf("%s ", dt.Format().c_str());
+    static const wxChar *fmt = wxT("%d-%b-%Y %H:%M:%S");

 
 

-            if ( parseTestDates[n].good )
-            {
-                wxDateTime dtReal = parseTestDates[n].date.DT();
-                if ( dt == dtReal )
-                {
-                    puts("(ok)");
-                }
-                else
-                {
-                    printf("(ERROR: should be %s)\n", dtReal.Format().c_str());
-                }
-            }
-            else
-            {
-                puts("(ERROR: bad format)");
-            }
-        }
-        else
-        {
-            printf("bad format (%s)\n",
-                   parseTestDates[n].good ? "ERROR" : "ok");
-        }
+    wxPrintf(wxT("Unix epoch:\t%s\n"),
+             wxDateTime(2440587.5).Format(fmt).c_str());
+    wxPrintf(wxT("Feb 29, 0: \t%s\n"),
+             wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str());
+    wxPrintf(wxT("JDN 0:     \t%s\n"),
+             wxDateTime(0.0).Format(fmt).c_str());
+    wxPrintf(wxT("Jan 1, 1AD:\t%s\n"),
+             wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str());
+    wxPrintf(wxT("May 29, 2099:\t%s\n"),
+             wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
+}
+
+// test DST calculations
+static void TestTimeDST()
+{
+    wxPuts(wxT("\n*** wxDateTime DST test ***"));
+
+    wxPrintf(wxT("DST is%s in effect now.\n\n"),
+             wxDateTime::Now().IsDST() ? wxEmptyString : wxT(" not"));
+
+    for ( int year = 1990; year < 2005; year++ )
+    {
+        wxPrintf(wxT("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());

     }
 }
 
     }
 }
 

+#endif // TEST_ALL
+
+#if TEST_INTERACTIVE
+

 static void TestDateTimeInteractive()
 {
 static void TestDateTimeInteractive()
 {

-    puts("\n*** interactive wxDateTime tests ***");
+    wxPuts(wxT("\n*** interactive wxDateTime tests ***"));

 
 

-    char buf[128];
+    wxChar buf[128];

 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        printf("Enter a date: ");
-        if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+        wxPrintf(wxT("Enter a date: "));
+        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )

             break;
 
         // kill the last '\n'
             break;
 
         // kill the last '\n'

-        buf[strlen(buf) - 1] = 0;
+        buf[wxStrlen(buf) - 1] = 0;

 
         wxDateTime dt;
 
         wxDateTime dt;

-        const char *p = dt.ParseDate(buf);
+        const wxChar *p = dt.ParseDate(buf);

         if ( !p )
         {
         if ( !p )
         {

-            printf("ERROR: failed to parse the date '%s'.\n", buf);
+            wxPrintf(wxT("ERROR: failed to parse the date '%s'.\n"), buf);

 
             continue;
         }
         else if ( *p )
         {
 
             continue;
         }
         else if ( *p )
         {

-            printf("WARNING: parsed only first %u characters.\n", p - buf);
+            wxPrintf(wxT("WARNING: parsed only first %u characters.\n"), p - buf);

         }
 
         }
 

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

     }
 
     }
 

-    puts("\n*** done ***");
+    wxPuts(wxT("\n*** done ***"));

 }
 
 }
 

+#endif // TEST_INTERACTIVE
+
+#if TEST_ALL
+

 static void TestTimeMS()
 {
 static void TestTimeMS()
 {

-    puts("*** testing millisecond-resolution support in wxDateTime ***");
+    wxPuts(wxT("*** testing millisecond-resolution support in wxDateTime ***"));

 
     wxDateTime dt1 = wxDateTime::Now(),
                dt2 = wxDateTime::UNow();
 
 
     wxDateTime dt1 = wxDateTime::Now(),
                dt2 = wxDateTime::UNow();
 

-    printf("Now = %s\n", dt1.Format("%H:%M:%S:%l").c_str());
-    printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str());
-    printf("Dummy loop: ");
+    wxPrintf(wxT("Now = %s\n"), dt1.Format(wxT("%H:%M:%S:%l")).c_str());
+    wxPrintf(wxT("UNow = %s\n"), dt2.Format(wxT("%H:%M:%S:%l")).c_str());
+    wxPrintf(wxT("Dummy loop: "));

     for ( int i = 0; i < 6000; i++ )
     {
         //for ( int j = 0; j < 10; j++ )
         {
             wxString s;
     for ( int i = 0; i < 6000; i++ )
     {
         //for ( int j = 0; j < 10; j++ )
         {
             wxString s;

-            s.Printf("%g", sqrt(i));
+            s.Printf(wxT("%g"), sqrt((float)i));

         }
 
         if ( !(i % 100) )
         }
 
         if ( !(i % 100) )

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

     }
     }

-    puts(", done");
+    wxPuts(wxT(", done"));

 
     dt1 = dt2;
     dt2 = wxDateTime::UNow();
 
     dt1 = dt2;
     dt2 = wxDateTime::UNow();

-    printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str());
-
-    printf("Loop executed in %s ms\n", (dt2 - dt1).Format("%l").c_str());
-
-    puts("\n*** done ***");
-}
-
-static void TestTimeArithmetics()
-{
-    puts("\n*** testing arithmetic operations on wxDateTime ***");
-
-    static const struct ArithmData
-    {
-        ArithmData(const wxDateSpan& sp, const char *nam)
-            : span(sp), name(nam) { }
-
-        wxDateSpan span;
-        const char *name;
-    } testArithmData[] =
-    {
-        ArithmData(wxDateSpan::Day(), "day"),
-        ArithmData(wxDateSpan::Week(), "week"),
-        ArithmData(wxDateSpan::Month(), "month"),
-        ArithmData(wxDateSpan::Year(), "year"),
-        ArithmData(wxDateSpan(1, 2, 3, 4), "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 char *name = testArithmData[n].name;
-        printf("%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());
-
-        printf("Going back: %s", (dt1 - span).FormatISODate().c_str());
-        if ( dt1 - span == dt )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str());
-        }
-
-        printf("Going forward: %s", (dt2 + span).FormatISODate().c_str());
-        if ( dt2 + span == dt )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str());
-        }
+    wxPrintf(wxT("UNow = %s\n"), dt2.Format(wxT("%H:%M:%S:%l")).c_str());

 
 

-        printf("Double increment: %s", (dt2 + 2*span).FormatISODate().c_str());
-        if ( dt2 + 2*span == dt1 )
-        {
-            puts(" (ok)");
-        }
-        else
-        {
-            printf(" (ERROR: should be %s)\n", dt2.FormatISODate().c_str());
-        }
+    wxPrintf(wxT("Loop executed in %s ms\n"), (dt2 - dt1).Format(wxT("%l")).c_str());

 
 

-        puts("");
-    }
+    wxPuts(wxT("\n*** done ***"));

 }
 
 static void TestTimeHolidays()
 {
 }
 
 static void TestTimeHolidays()
 {

-    puts("\n*** testing wxDateTimeHolidayAuthority ***\n");
+    wxPuts(wxT("\n*** testing wxDateTimeHolidayAuthority ***\n"));

 
     wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm();
     wxDateTime dtStart(1, tm.mon, tm.year),
 
     wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm();
     wxDateTime dtStart(1, tm.mon, tm.year),


@@ -4459,97 +3384,107 @@ static void TestTimeHolidays()
     wxDateTimeArray hol;
     wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);
 
     wxDateTimeArray hol;
     wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);
 

-    const wxChar *format = "%d-%b-%Y (%a)";
+    const wxChar *format = wxT("%d-%b-%Y (%a)");

 
 

-    printf("All holidays between %s and %s:\n",
+    wxPrintf(wxT("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++ )
     {
            dtStart.Format(format).c_str(), dtEnd.Format(format).c_str());
 
     size_t count = hol.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        printf("\t%s\n", hol[n].Format(format).c_str());
+        wxPrintf(wxT("\t%s\n"), hol[n].Format(format).c_str());

     }
 
     }
 

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

 }
 
 static void TestTimeZoneBug()
 {
 }
 
 static void TestTimeZoneBug()
 {

-    puts("\n*** testing for DST/timezone bug ***\n");
+    wxPuts(wxT("\n*** testing for DST/timezone bug ***\n"));

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

-        printf("Date %s: week day %s.\n",
-               date.Format(_T("%d-%m-%Y")).c_str(),
+        wxPrintf(wxT("Date %s: week day %s.\n"),
+               date.Format(wxT("%d-%m-%Y")).c_str(),

                date.GetWeekDayName(date.GetWeekDay()).c_str());
 
         date += wxDateSpan::Day();
     }
 
                date.GetWeekDayName(date.GetWeekDay()).c_str());
 
         date += wxDateSpan::Day();
     }
 

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

 }
 
 static void TestTimeSpanFormat()
 {
 }
 
 static void TestTimeSpanFormat()
 {

-    puts("\n*** wxTimeSpan tests ***");
+    wxPuts(wxT("\n*** wxTimeSpan tests ***"));

 
 

-    static const char *formats[] =
+    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"),
+        wxT("(default) %H:%M:%S"),
+        wxT("%E weeks and %D days"),
+        wxT("%l milliseconds"),
+        wxT("(with ms) %H:%M:%S:%l"),
+        wxT("100%% of minutes is %M"),       // test "%%"
+        wxT("%D days and %H hours"),
+        wxT("or also %S seconds"),

     };
 
     wxTimeSpan ts1(1, 2, 3, 4),
                 ts2(111, 222, 333);
     for ( size_t n = 0; n < WXSIZEOF(formats); n++ )
     {
     };
 
     wxTimeSpan ts1(1, 2, 3, 4),
                 ts2(111, 222, 333);
     for ( size_t n = 0; n < WXSIZEOF(formats); n++ )
     {

-        printf("ts1 = %s\tts2 = %s\n",
+        wxPrintf(wxT("ts1 = %s\tts2 = %s\n"),

                ts1.Format(formats[n]).c_str(),
                ts2.Format(formats[n]).c_str());
     }
 
                ts1.Format(formats[n]).c_str(),
                ts2.Format(formats[n]).c_str());
     }
 

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

 }
 
 }
 

-#if 0
+#endif // TEST_ALL

 
 

-// test compatibility with the old wxDate/wxTime classes
-static void TestTimeCompatibility()
-{
-    puts("\n*** wxDateTime compatibility test ***");
+#endif // TEST_DATETIME
+
+// ----------------------------------------------------------------------------
+// wxTextInput/OutputStream
+// ----------------------------------------------------------------------------

 
 

-    printf("wxDate for JDN 0: %s\n", wxDate(0l).FormatDate().c_str());
-    printf("wxDate for MJD 0: %s\n", wxDate(2400000).FormatDate().c_str());
+#ifdef TEST_TEXTSTREAM

 
 

-    double jdnNow = wxDateTime::Now().GetJDN();
-    long jdnMidnight = (long)(jdnNow - 0.5);
-    printf("wxDate for today: %s\n", wxDate(jdnMidnight).FormatDate().c_str());
+#include "wx/txtstrm.h"
+#include "wx/wfstream.h"

 
 

-    jdnMidnight = wxDate().Set().GetJulianDate();
-    printf("wxDateTime for today: %s\n",
-            wxDateTime((double)(jdnMidnight + 0.5)).Format("%c", wxDateTime::GMT0).c_str());
+static void TestTextInputStream()
+{
+    wxPuts(wxT("\n*** wxTextInputStream test ***"));

 
 

-    int flags = wxEUROPEAN;//wxFULL;
-    wxDate date;
-    date.Set();
-    printf("Today is %s\n", date.FormatDate(flags).c_str());
-    for ( int n = 0; n < 7; n++ )
+    wxString filename = wxT("testdata.fc");
+    wxFileInputStream fsIn(filename);
+    if ( !fsIn.Ok() )
+    {
+        wxPuts(wxT("ERROR: couldn't open file."));
+    }
+    else

     {
     {

-        printf("Previous %s is %s\n",
-               wxDateTime::GetWeekDayName((wxDateTime::WeekDay)n),
-               date.Previous(n + 1).FormatDate(flags).c_str());
+        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(wxT("Line %d: %s\n"), line++, s.c_str());
+        }

     }
 }
 
     }
 }
 

-#endif // 0
-
-#endif // TEST_DATETIME
+#endif // TEST_TEXTSTREAM

 
 // ----------------------------------------------------------------------------
 // threads
 
 // ----------------------------------------------------------------------------
 // threads


@@ -4561,7 +3496,7 @@ static void TestTimeCompatibility()
 
 static size_t gs_counter = (size_t)-1;
 static wxCriticalSection gs_critsect;
 
 static size_t gs_counter = (size_t)-1;
 static wxCriticalSection gs_critsect;

-static wxCondition gs_cond;
+static wxSemaphore gs_cond;

 
 class MyJoinableThread : public wxThread
 {
 
 class MyJoinableThread : public wxThread
 {


@@ -4593,11 +3528,11 @@ wxThread::ExitCode MyJoinableThread::Entry()
 class MyDetachedThread : public wxThread
 {
 public:
 class MyDetachedThread : public wxThread
 {
 public:

-    MyDetachedThread(size_t n, char ch)
+    MyDetachedThread(size_t n, wxChar ch)

     {
         m_n = n;
         m_ch = ch;
     {
         m_n = n;
         m_ch = ch;

-        m_cancelled = FALSE;
+        m_cancelled = false;

 
         Create();
     }
 
         Create();
     }


@@ -4610,9 +3545,9 @@ public:
 
 private:
     size_t m_n; // number of characters to write
 
 private:
     size_t m_n; // number of characters to write

-    char m_ch;  // character to write
+    wxChar m_ch;  // character to write

 
 

-    bool m_cancelled;   // FALSE if we exit normally
+    bool m_cancelled;   // false if we exit normally

 };
 
 wxThread::ExitCode MyDetachedThread::Entry()
 };
 
 wxThread::ExitCode MyDetachedThread::Entry()


@@ -4629,12 +3564,12 @@ wxThread::ExitCode MyDetachedThread::Entry()
     {
         if ( TestDestroy() )
         {
     {
         if ( TestDestroy() )
         {

-            m_cancelled = TRUE;
+            m_cancelled = true;

 
             break;
         }
 
 
             break;
         }
 

-        putchar(m_ch);
+        wxPutchar(m_ch);

         fflush(stdout);
 
         wxThread::Sleep(100);
         fflush(stdout);
 
         wxThread::Sleep(100);


@@ -4645,16 +3580,16 @@ wxThread::ExitCode MyDetachedThread::Entry()
 
 void MyDetachedThread::OnExit()
 {
 
 void MyDetachedThread::OnExit()
 {

-    wxLogTrace("thread", "Thread %ld is in OnExit", GetId());
+    wxLogTrace(wxT("thread"), wxT("Thread %ld is in OnExit"), GetId());

 
     wxCriticalSectionLocker lock(gs_critsect);
     if ( !--gs_counter && !m_cancelled )
 
     wxCriticalSectionLocker lock(gs_critsect);
     if ( !--gs_counter && !m_cancelled )

-        gs_cond.Signal();
+        gs_cond.Post();

 }
 
 static void TestDetachedThreads()
 {
 }
 
 static void TestDetachedThreads()
 {

-    puts("\n*** Testing detached threads ***");
+    wxPuts(wxT("\n*** Testing detached threads ***"));

 
     static const size_t nThreads = 3;
     MyDetachedThread *threads[nThreads];
 
     static const size_t nThreads = 3;
     MyDetachedThread *threads[nThreads];


@@ -4675,24 +3610,24 @@ static void TestDetachedThreads()
     // wait until all threads terminate
     gs_cond.Wait();
 
     // wait until all threads terminate
     gs_cond.Wait();
 

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

 }
 
 static void TestJoinableThreads()
 {
 }
 
 static void TestJoinableThreads()
 {

-    puts("\n*** Testing a joinable thread (a loooong calculation...) ***");
+    wxPuts(wxT("\n*** Testing a joinable thread (a loooong calculation...) ***"));

 
     // calc 10! in the background
     MyJoinableThread thread(10);
     thread.Run();
 
 
     // calc 10! in the background
     MyJoinableThread thread(10);
     thread.Run();
 

-    printf("\nThread terminated with exit code %lu.\n",
-           (unsigned long)thread.Wait());
+    wxPrintf(wxT("\nThread terminated with exit code %lu.\n"),
+             (unsigned long)thread.Wait());

 }
 
 static void TestThreadSuspend()
 {
 }
 
 static void TestThreadSuspend()
 {

-    puts("\n*** Testing thread suspend/resume functions ***");
+    wxPuts(wxT("\n*** Testing thread suspend/resume functions ***"));

 
     MyDetachedThread *thread = new MyDetachedThread(15, 'X');
 
 
     MyDetachedThread *thread = new MyDetachedThread(15, 'X');
 


@@ -4710,23 +3645,23 @@ static void TestThreadSuspend()
     {
         thread->Pause();
 
     {
         thread->Pause();
 

-        puts("\nThread suspended");
+        wxPuts(wxT("\nThread suspended"));

         if ( n > 0 )
         {
             // don't sleep but resume immediately the first time
             wxThread::Sleep(300);
         }
         if ( n > 0 )
         {
             // don't sleep but resume immediately the first time
             wxThread::Sleep(300);
         }

-        puts("Going to resume the thread");
+        wxPuts(wxT("Going to resume the thread"));

 
         thread->Resume();
     }
 
 
         thread->Resume();
     }
 

-    puts("Waiting until it terminates now");
+    wxPuts(wxT("Waiting until it terminates now"));

 
     // wait until the thread terminates
     gs_cond.Wait();
 
 
     // wait until the thread terminates
     gs_cond.Wait();
 

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

 }
 
 static void TestThreadDelete()
 }
 
 static void TestThreadDelete()


@@ -4736,13 +3671,13 @@ static void TestThreadDelete()
     // running when we delete it - deleting a detached thread which already
     // terminated will lead to a crash!
 
     // running when we delete it - deleting a detached thread which already
     // terminated will lead to a crash!
 

-    puts("\n*** Testing thread delete function ***");
+    wxPuts(wxT("\n*** Testing thread delete function ***"));

 
     MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');
 
     thread0->Delete();
 
 
     MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');
 
     thread0->Delete();
 

-    puts("\nDeleted a thread which didn't start to run yet.");
+    wxPuts(wxT("\nDeleted a thread which didn't start to run yet."));

 
     MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');
 
 
     MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');
 


@@ -4752,7 +3687,7 @@ static void TestThreadDelete()
 
     thread1->Delete();
 
 
     thread1->Delete();
 

-    puts("\nDeleted a running thread.");
+    wxPuts(wxT("\nDeleted a running thread."));

 
     MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');
 
 
     MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');
 


@@ -4764,14 +3699,14 @@ static void TestThreadDelete()
 
     thread2->Delete();
 
 
     thread2->Delete();
 

-    puts("\nDeleted a sleeping thread.");
+    wxPuts(wxT("\nDeleted a sleeping thread."));

 
     MyJoinableThread thread3(20);
     thread3.Run();
 
     thread3.Delete();
 
 
     MyJoinableThread thread3(20);
     thread3.Run();
 
     thread3.Delete();
 

-    puts("\nDeleted a joinable thread.");
+    wxPuts(wxT("\nDeleted a joinable thread."));

 
     MyJoinableThread thread4(2);
     thread4.Run();
 
     MyJoinableThread thread4(2);
     thread4.Run();


@@ -4780,16 +3715,17 @@ static void TestThreadDelete()
 
     thread4.Delete();
 
 
     thread4.Delete();
 

-    puts("\nDeleted a joinable thread which already terminated.");
+    wxPuts(wxT("\nDeleted a joinable thread which already terminated."));

 
 

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

 }
 
 class MyWaitingThread : public wxThread
 {
 public:
 }
 
 class MyWaitingThread : public wxThread
 {
 public:

-    MyWaitingThread(wxCondition *condition)
+    MyWaitingThread( wxMutex *mutex, wxCondition *condition )

     {
     {

+        m_mutex = mutex;

         m_condition = condition;
 
         Create();
         m_condition = condition;
 
         Create();


@@ -4797,34 +3733,38 @@ public:
 
     virtual ExitCode Entry()
     {
 
     virtual ExitCode Entry()
     {

-        printf("Thread %lu has started running.\n", GetId());
+        wxPrintf(wxT("Thread %lu has started running.\n"), GetId());

         fflush(stdout);
 
         fflush(stdout);
 

-        gs_cond.Signal();
+        gs_cond.Post();

 
 

-        printf("Thread %lu starts to wait...\n", GetId());
+        wxPrintf(wxT("Thread %lu starts to wait...\n"), GetId());

         fflush(stdout);
 
         fflush(stdout);
 

+        m_mutex->Lock();

         m_condition->Wait();
         m_condition->Wait();

+        m_mutex->Unlock();

 
 

-        printf("Thread %lu finished to wait, exiting.\n", GetId());
+        wxPrintf(wxT("Thread %lu finished to wait, exiting.\n"), GetId());

         fflush(stdout);
 
         return 0;
     }
 
 private:
         fflush(stdout);
 
         return 0;
     }
 
 private:

+    wxMutex *m_mutex;

     wxCondition *m_condition;
 };
 
 static void TestThreadConditions()
 {
     wxCondition *m_condition;
 };
 
 static void TestThreadConditions()
 {

-    wxCondition condition;
+    wxMutex mutex;
+    wxCondition condition(mutex);

 
     // otherwise its difficult to understand which log messages pertain to
     // which condition
 
     // otherwise its difficult to understand which log messages pertain to
     // which condition

-    wxLogTrace("thread", "Local condition var is %08x, gs_cond = %08x",
-               condition.GetId(), gs_cond.GetId());
+    //wxLogTrace(wxT("thread"), wxT("Local condition var is %08x, gs_cond = %08x"),
+    //           condition.GetId(), gs_cond.GetId());

 
     // create and launch threads
     MyWaitingThread *threads[10];
 
     // create and launch threads
     MyWaitingThread *threads[10];


@@ -4832,7 +3772,7 @@ static void TestThreadConditions()
     size_t n;
     for ( n = 0; n < WXSIZEOF(threads); n++ )
     {
     size_t n;
     for ( n = 0; n < WXSIZEOF(threads); n++ )
     {

-        threads[n] = new MyWaitingThread(&condition);
+        threads[n] = new MyWaitingThread( &mutex, &condition );

     }
 
     for ( n = 0; n < WXSIZEOF(threads); n++ )
     }
 
     for ( n = 0; n < WXSIZEOF(threads); n++ )


@@ -4841,7 +3781,7 @@ static void TestThreadConditions()
     }
 
     // wait until all threads run
     }
 
     // wait until all threads run

-    puts("Main thread is waiting for the other threads to start");
+    wxPuts(wxT("Main thread is waiting for the other threads to start"));

     fflush(stdout);
 
     size_t nRunning = 0;
     fflush(stdout);
 
     size_t nRunning = 0;


@@ -4851,18 +3791,18 @@ static void TestThreadConditions()
 
         nRunning++;
 
 
         nRunning++;
 

-        printf("Main thread: %u already running\n", nRunning);
+        wxPrintf(wxT("Main thread: %u already running\n"), nRunning);

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

-    puts("Main thread: all threads started up.");
+    wxPuts(wxT("Main thread: all threads started up."));

     fflush(stdout);
 
     wxThread::Sleep(500);
 
 #if 1
     // now wake one of them up
     fflush(stdout);
 
     wxThread::Sleep(500);
 
 #if 1
     // now wake one of them up

-    printf("Main thread: about to signal the condition.\n");
+    wxPrintf(wxT("Main thread: about to signal the condition.\n"));

     fflush(stdout);
     condition.Signal();
 #endif
     fflush(stdout);
     condition.Signal();
 #endif


@@ -4870,7 +3810,7 @@ static void TestThreadConditions()
     wxThread::Sleep(200);
 
     // wake all the (remaining) threads up, so that they can exit
     wxThread::Sleep(200);
 
     // wake all the (remaining) threads up, so that they can exit

-    printf("Main thread: about to broadcast the condition.\n");
+    wxPrintf(wxT("Main thread: about to broadcast the condition.\n"));

     fflush(stdout);
     condition.Broadcast();
 
     fflush(stdout);
     condition.Broadcast();
 


@@ -4878,589 +3818,137 @@ static void TestThreadConditions()
     wxThread::Sleep(500);
 }
 
     wxThread::Sleep(500);
 }
 

-#endif // TEST_THREADS
-
-// ----------------------------------------------------------------------------
-// arrays
-// ----------------------------------------------------------------------------
+// semaphore tests
+#include "wx/datetime.h"

 
 

-#ifdef TEST_ARRAYS
-
-#include "wx/dynarray.h"
-
-#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(Short, short);
-DefineCompare(Int, int);
-
-// test compilation of all macros
-WX_DEFINE_ARRAY(short, wxArrayShort);
-WX_DEFINE_SORTED_ARRAY(short, wxSortedArrayShortNoCmp);
-WX_DEFINE_SORTED_ARRAY_CMP(short, ShortCompareValues, wxSortedArrayShort);
-WX_DEFINE_SORTED_ARRAY_CMP(int, IntCompareValues, wxSortedArrayInt);
-
-WX_DECLARE_OBJARRAY(Bar, ArrayBars);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(ArrayBars);
-
-static void PrintArray(const char* name, const wxArrayString& array)
+class MySemaphoreThread : public wxThread

 {
 {

-    printf("Dump of the array '%s'\n", name);
-
-    size_t nCount = array.GetCount();
-    for ( size_t n = 0; n < nCount; n++ )
+public:
+    MySemaphoreThread(int i, wxSemaphore *sem)
+        : wxThread(wxTHREAD_JOINABLE),
+          m_sem(sem),
+          m_i(i)

     {
     {

-        printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str());
+        Create();

     }
     }

-}
-
-int wxCMPFUNC_CONV StringLenCompare(const wxString& first,
-                                    const wxString& second)
-{
-    return first.length() - second.length();
-}
-
-#define TestArrayOf(name)                                                     \
-                                                                              \
-static void PrintArray(const char* name, const wxSortedArray##name & array)   \
-{                                                                             \
-    printf("Dump of the array '%s'\n", name);                                 \
-                                                                              \
-    size_t nCount = array.GetCount();                                         \
-    for ( size_t n = 0; n < nCount; n++ )                                     \
-    {                                                                         \
-        printf("\t%s[%u] = %d\n", name, n, array[n]);                         \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-static void PrintArray(const char* name, const wxArray##name & array)         \
-{                                                                             \
-    printf("Dump of the array '%s'\n", name);                                 \
-                                                                              \
-    size_t nCount = array.GetCount();                                         \
-    for ( size_t n = 0; n < nCount; n++ )                                     \
-    {                                                                         \
-        printf("\t%s[%u] = %d\n", name, n, array[n]);                         \
-    }                                                                         \
-}                                                                             \
-                                                                              \
-static void TestArrayOf ## name ## s()                                        \
-{                                                                             \
-    printf("*** Testing wxArray%s ***\n", #name);                             \
-                                                                              \
-    wxArray##name a;                                                          \
-    a.Add(1);                                                                 \
-    a.Add(17);                                                                \
-    a.Add(5);                                                                 \
-    a.Add(3);                                                                 \
-                                                                              \
-    puts("Initially:");                                                       \
-    PrintArray("a", a);                                                       \
-                                                                              \
-    puts("After sort:");                                                      \
-    a.Sort(name ## Compare);                                                  \
-    PrintArray("a", a);                                                       \
-                                                                              \
-    puts("After reverse sort:");                                              \
-    a.Sort(name ## RevCompare);                                               \
-    PrintArray("a", a);                                                       \
-                                                                              \
-    wxSortedArray##name b;                                                    \
-    b.Add(1);                                                                 \
-    b.Add(17);                                                                \
-    b.Add(5);                                                                 \
-    b.Add(3);                                                                 \
-                                                                              \
-    puts("Sorted array initially:");                                          \
-    PrintArray("b", b);                                                       \
-}
-
-TestArrayOf(Short);
-TestArrayOf(Int);
-
-static void TestArrayOfObjects()
-{
-    puts("*** Testing wxObjArray ***\n");

 
 

+    virtual ExitCode Entry()

     {
     {

-        ArrayBars bars;
-        Bar bar("second bar");
-
-        printf("Initially: %u objects in the array, %u objects total.\n",
-               bars.GetCount(), Bar::GetNumber());
-
-        bars.Add(new Bar("first bar"));
-        bars.Add(bar);
-
-        printf("Now: %u objects in the array, %u objects total.\n",
-               bars.GetCount(), Bar::GetNumber());
-
-        bars.Empty();
-
-        printf("After Empty(): %u objects in the array, %u objects total.\n",
-               bars.GetCount(), Bar::GetNumber());
-    }
-
-    printf("Finally: no more objects in the array, %u objects total.\n",
-           Bar::GetNumber());
-}
-
-#endif // TEST_ARRAYS
-
-// ----------------------------------------------------------------------------
-// strings
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_STRINGS
-
-#include "wx/timer.h"
-#include "wx/tokenzr.h"
-
-static void TestStringConstruction()
-{
-    puts("*** Testing wxString constructores ***");
-
-    #define TEST_CTOR(args, res)                                               \
-        {                                                                      \
-            wxString s args ;                                                  \
-            printf("wxString%s = %s ", #args, s.c_str());                      \
-            if ( s == res )                                                    \
-            {                                                                  \
-                puts("(ok)");                                                  \
-            }                                                                  \
-            else                                                               \
-            {                                                                  \
-                printf("(ERROR: should be %s)\n", res);                        \
-            }                                                                  \
-        }
+        wxPrintf(wxT("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
 

-    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
+        m_sem->Wait();

 
 

-    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"));
+        wxPrintf(wxT("%s: Thread #%d (%ld) acquired the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
 

-    puts("");
-}
-
-static void TestString()
-{
-    wxStopWatch sw;
+        Sleep(1000);

 
 

-    wxString a, b, c;
+        wxPrintf(wxT("%s: Thread #%d (%ld) releasing the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
 

-    a.reserve (128);
-    b.reserve (128);
-    c.reserve (128);
+        m_sem->Post();

 
 

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

     }
 
     }
 

-    printf ("TestString elapsed time: %ld\n", sw.Time());
-}
-
-static void TestPChar()
-{
-    wxStopWatch sw;
-
-    char a [128];
-    char b [128];
-    char c [128];
-
-    for (int i = 0; i < 1000000; ++i)
-    {
-        strcpy (a, "Hello");
-        strcpy (b, " world");
-        strcpy (c, "! How'ya doin'?");
-        strcat (a, b);
-        strcat (a, c);
-        strcpy (c, "Hello world! What's up?");
-        if (strcmp (c, a) == 0)
-            strcpy (c, "Doh!");
-    }
+private:
+    wxSemaphore *m_sem;
+    int m_i;
+};

 
 

-    printf ("TestPChar elapsed time: %ld\n", sw.Time());
-}
+WX_DEFINE_ARRAY_PTR(wxThread *, ArrayThreads);

 
 

-static void TestStringSub()
+static void TestSemaphore()

 {
 {

-    wxString s("Hello, world!");
-
-    puts("*** Testing wxString substring extraction ***");
+    wxPuts(wxT("*** Testing wxSemaphore class. ***"));

 
 

-    printf("String = '%s'\n", s.c_str());
-    printf("Left(5) = '%s'\n", s.Left(5).c_str());
-    printf("Right(6) = '%s'\n", s.Right(6).c_str());
-    printf("Mid(3, 5) = '%s'\n", s(3, 5).c_str());
-    printf("Mid(3) = '%s'\n", s.Mid(3).c_str());
-    printf("substr(3, 5) = '%s'\n", s.substr(3, 5).c_str());
-    printf("substr(3) = '%s'\n", s.substr(3).c_str());
+    static const int SEM_LIMIT = 3;

 
 

-    static const wxChar *prefixes[] =
-    {
-        _T("Hello"),
-        _T("Hello, "),
-        _T("Hello, world!"),
-        _T("Hello, world!!!"),
-        _T(""),
-        _T("Goodbye"),
-        _T("Hi"),
-    };
+    wxSemaphore sem(SEM_LIMIT, SEM_LIMIT);
+    ArrayThreads threads;

 
 

-    for ( size_t n = 0; n < WXSIZEOF(prefixes); n++ )
+    for ( int i = 0; i < 3*SEM_LIMIT; i++ )

     {
     {

-        wxString prefix = prefixes[n], rest;
-        bool rc = s.StartsWith(prefix, &rest);
-        printf("StartsWith('%s') = %s", prefix.c_str(), rc ? "TRUE" : "FALSE");
-        if ( rc )
-        {
-            printf(" (the rest is '%s')\n", rest.c_str());
-        }
-        else
-        {
-            putchar('\n');
-        }
+        threads.Add(new MySemaphoreThread(i, &sem));
+        threads.Last()->Run();

     }
 
     }
 

-    puts("");
-}
-
-static void TestStringFormat()
-{
-    puts("*** Testing wxString formatting ***");
-
-    wxString s;
-    s.Printf("%03d", 18);
-
-    printf("Number 18: %s\n", wxString::Format("%03d", 18).c_str());
-    printf("Number 18: %s\n", s.c_str());
-
-    puts("");
-}
-
-// 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;
-}
-
-static void TestStringFind()
-{
-    puts("*** Testing wxString find() functions ***");
-
-    static const wxChar *strToFind = _T("ell");
-    static const struct StringFindTest
-    {
-        const wxChar *str;
-        size_t        start,
-                      result;   // of searching "ell" in str
-    } findTestData[] =
-    {
-        { _T("Well, hello world"),  0, 1 },
-        { _T("Well, hello world"),  6, 7 },
-        { _T("Well, hello world"),  9, wxString::npos },
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(findTestData); n++ )
+    for ( size_t n = 0; n < threads.GetCount(); n++ )

     {
     {

-        const StringFindTest& ft = findTestData[n];
-        size_t res = wxString(ft.str).find(strToFind, ft.start);
-
-        printf(_T("Index of '%s' in '%s' starting from %u is %s "),
-               strToFind, ft.str, ft.start, PosToString(res).c_str());
-
-        size_t resTrue = ft.result;
-        if ( res == resTrue )
-        {
-            puts(_T("(ok)"));
-        }
-        else
-        {
-            printf(_T("(ERROR: should be %s)\n"),
-                   PosToString(resTrue).c_str());
-        }
+        threads[n]->Wait();
+        delete threads[n];

     }
     }

-
-    puts("");

 }
 
 }
 

-static void TestStringTokenizer()
-{
-    puts("*** Testing wxStringTokenizer ***");
-
-    static const wxChar *modeNames[] =
-    {
-        _T("default"),
-        _T("return empty"),
-        _T("return all empty"),
-        _T("with delims"),
-        _T("like strtok"),
-    };
-
-    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 },
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(tokenizerTestData); n++ )
-    {
-        const StringTokenizerTest& tt = tokenizerTestData[n];
-        wxStringTokenizer tkz(tt.str, tt.delims, tt.mode);
-
-        size_t count = tkz.CountTokens();
-        printf(_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 )
-        {
-            puts(_T("(ok)"));
-        }
-        else
-        {
-            printf(_T("(ERROR: should be %u)\n"), tt.count);
-
-            continue;
-        }
-
-        // if we emulate strtok(), check that we do it correctly
-        wxChar *buf, *s = NULL, *last;
-
-        if ( tkz.GetMode() == wxTOKEN_STRTOK )
-        {
-            buf = new wxChar[wxStrlen(tt.str) + 1];
-            wxStrcpy(buf, tt.str);
-
-            s = wxStrtok(buf, tt.delims, &last);
-        }
-        else
-        {
-            buf = NULL;
-        }
-
-        // now show the tokens themselves
-        size_t count2 = 0;
-        while ( tkz.HasMoreTokens() )
-        {
-            wxString token = tkz.GetNextToken();
-
-            printf(_T("\ttoken %u: '%s'"),
-                   ++count2,
-                   MakePrintable(token).c_str());
-
-            if ( buf )
-            {
-                if ( token == s )
-                {
-                    puts(" (ok)");
-                }
-                else
-                {
-                    printf(" (ERROR: should be %s)\n", s);
-                }
-
-                s = wxStrtok(NULL, tt.delims, &last);
-            }
-            else
-            {
-                // nothing to compare with
-                puts("");
-            }
-        }
-
-        if ( count2 != count )
-        {
-            puts(_T("\tERROR: token count mismatch"));
-        }
+#endif // TEST_THREADS

 
 

-        delete [] buf;
-    }
+// ----------------------------------------------------------------------------
+// entry point
+// ----------------------------------------------------------------------------

 
 

-    puts("");
-}
+#ifdef TEST_SNGLINST
+    #include "wx/snglinst.h"
+#endif // TEST_SNGLINST

 
 

-static void TestStringReplace()
+int main(int argc, char **argv)

 {
 {

-    puts("*** Testing wxString::replace ***");
-
-    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[] =
-    {
-        { _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") },
-    };
+#if wxUSE_UNICODE
+    wxChar **wxArgv = new wxChar *[argc + 1];

 
 

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

     {
     {

-        const StringReplaceTestData data = stringReplaceTestData[n];
-
-        wxString original = data.original;
-        original.replace(data.start, data.len, data.replacement);
+        int n;

 
 

-        wxPrintf(_T("wxString(\"%s\").replace(%u, %u, %s) = %s "),
-                 data.original, data.start, data.len, data.replacement,
-                 original.c_str());
-
-        if ( original == data.result )
-        {
-            puts("(ok)");
-        }
-        else
+        for (n = 0; n < argc; n++ )

         {
         {

-            wxPrintf(_T("(ERROR: should be '%s')\n"), data.result);
+            wxMB2WXbuf warg = wxConvertMB2WX(argv[n]);
+            wxArgv[n] = wxStrdup(warg);

         }
         }

-    }
-
-    puts("");
-}
-
-static void TestStringMatch()
-{
-    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 },
-    };

 
 

-    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"));
+        wxArgv[n] = NULL;

     }
     }

+#else // !wxUSE_UNICODE
+    #define wxArgv argv
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
 

-    wxPuts(_T(""));
-}
-
-#endif // TEST_STRINGS
-
-// ----------------------------------------------------------------------------
-// entry point
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_SNGLINST
-    #include "wx/snglinst.h"
-#endif // TEST_SNGLINST
+    wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");

 
 

-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;
     }
 
 #ifdef TEST_SNGLINST
     wxSingleInstanceChecker checker;
 
         return -1;
     }
 
 #ifdef TEST_SNGLINST
     wxSingleInstanceChecker checker;

-    if ( checker.Create(_T(".wxconsole.lock")) )
+    if ( checker.Create(wxT(".wxconsole.lock")) )

     {
         if ( checker.IsAnotherRunning() )
         {
     {
         if ( checker.IsAnotherRunning() )
         {

-            wxPrintf(_T("Another instance of the program is running, exiting.\n"));
+            wxPrintf(wxT("Another instance of the program is running, exiting.\n"));

 
             return 1;
         }
 
         // wait some time to give time to launch another instance
 
             return 1;
         }
 
         // wait some time to give time to launch another instance

-        wxPrintf(_T("Press \"Enter\" to continue..."));
+        wxPrintf(wxT("Press \"Enter\" to continue..."));

         wxFgetc(stdin);
     }
     else // failed to create
     {
         wxFgetc(stdin);
     }
     else // failed to create
     {

-        wxPrintf(_T("Failed to init wxSingleInstanceChecker.\n"));
+        wxPrintf(wxT("Failed to init wxSingleInstanceChecker.\n"));

     }
 #endif // TEST_SNGLINST
 
     }
 #endif // TEST_SNGLINST
 

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

 #ifdef TEST_CMDLINE
     TestCmdLineConvert();
 
 #if wxUSE_CMDLINE_PARSER
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 #ifdef TEST_CMDLINE
     TestCmdLineConvert();
 
 #if wxUSE_CMDLINE_PARSER
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

-        { wxCMD_LINE_SWITCH, _T("h"), _T("help"), "show this help message",
+        { wxCMD_LINE_SWITCH, "h", "help", "show this help message",

             wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },
             wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },


@@ -5471,6 +3959,8 @@ int main(int argc, char **argv)
             wxCMD_LINE_VAL_NUMBER },
         { wxCMD_LINE_OPTION, "d", "date",    "output file date",
             wxCMD_LINE_VAL_DATE },
             wxCMD_LINE_VAL_NUMBER },
         { wxCMD_LINE_OPTION, "d", "date",    "output file date",
             wxCMD_LINE_VAL_DATE },

+        { wxCMD_LINE_OPTION, "f", "double",  "output double",
+            wxCMD_LINE_VAL_DOUBLE },

 
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
 
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },


@@ -5478,16 +3968,16 @@ int main(int argc, char **argv)
         { wxCMD_LINE_NONE }
     };
 
         { wxCMD_LINE_NONE }
     };
 

-    wxCmdLineParser parser(cmdLineDesc, argc, argv);
+    wxCmdLineParser parser(cmdLineDesc, argc, wxArgv);

 
 

-    parser.AddOption("project_name", "", "full path to project file",
+    parser.AddOption(wxT("project_name"), wxT(""), wxT("full path to project file"),

                      wxCMD_LINE_VAL_STRING,
                      wxCMD_LINE_OPTION_MANDATORY | wxCMD_LINE_NEEDS_SEPARATOR);
 
     switch ( parser.Parse() )
     {
         case -1:
                      wxCMD_LINE_VAL_STRING,
                      wxCMD_LINE_OPTION_MANDATORY | wxCMD_LINE_NEEDS_SEPARATOR);
 
     switch ( parser.Parse() )
     {
         case -1:

-            wxLogMessage("Help was given, terminating.");
+            wxLogMessage(wxT("Help was given, terminating."));

             break;
 
         case 0:
             break;
 
         case 0:


@@ -5495,268 +3985,149 @@ int main(int argc, char **argv)
             break;
 
         default:
             break;
 
         default:

-            wxLogMessage("Syntax error detected, aborting.");
+            wxLogMessage(wxT("Syntax error detected, aborting."));

             break;
     }
 #endif // wxUSE_CMDLINE_PARSER
 
 #endif // TEST_CMDLINE
 
             break;
     }
 #endif // wxUSE_CMDLINE_PARSER
 
 #endif // TEST_CMDLINE
 

-#ifdef TEST_STRINGS
-    if ( TEST_ALL )
-    {
-        TestPChar();
-        TestString();
-        TestStringSub();
-        TestStringConstruction();
-        TestStringFormat();
-        TestStringFind();
-        TestStringTokenizer();
-        TestStringReplace();
-    }
-    else
-    {
-        TestStringMatch();
-    }
-#endif // TEST_STRINGS
-
-#ifdef TEST_ARRAYS
-    if ( TEST_ALL )
-    {
-        wxArrayString a1;
-        a1.Add("tiger");
-        a1.Add("cat");
-        a1.Add("lion");
-        a1.Add("dog");
-        a1.Add("human");
-        a1.Add("ape");
-
-        puts("*** Initially:");
-
-        PrintArray("a1", a1);
-
-        wxArrayString a2(a1);
-        PrintArray("a2", a2);
-
-        wxSortedArrayString a3(a1);
-        PrintArray("a3", a3);
-
-        puts("*** After deleting a string from a1");
-        a1.Remove(2);
-
-        PrintArray("a1", a1);
-        PrintArray("a2", a2);
-        PrintArray("a3", a3);
-
-        puts("*** After reassigning a1 to a2 and a3");
-        a3 = a2 = a1;
-        PrintArray("a2", a2);
-        PrintArray("a3", a3);
-
-        puts("*** After sorting a1");
-        a1.Sort();
-        PrintArray("a1", a1);
-
-        puts("*** After sorting a1 in reverse order");
-        a1.Sort(TRUE);
-        PrintArray("a1", a1);
-
-        puts("*** After sorting a1 by the string length");
-        a1.Sort(StringLenCompare);
-        PrintArray("a1", a1);
-
-        TestArrayOfObjects();
-        TestArrayOfShorts();
-    }
-
-    TestArrayOfInts();
-#endif // TEST_ARRAYS
-

 #ifdef TEST_DIR
 #ifdef TEST_DIR

-    if ( TEST_ALL )
-    {
+    #if TEST_ALL
+        TestDirExists();

         TestDirEnum();
         TestDirEnum();

-        TestDirTraverse();
-    }
+    #endif
+    TestDirTraverse();

 #endif // TEST_DIR
 
 #endif // TEST_DIR
 

-#ifdef TEST_DLLLOADER
+#ifdef TEST_DYNLIB

     TestDllLoad();
     TestDllLoad();

-#endif // TEST_DLLLOADER
+    TestDllListLoaded();
+#endif // TEST_DYNLIB

 
 #ifdef TEST_ENVIRON
     TestEnvironment();
 #endif // TEST_ENVIRON
 
 
 #ifdef TEST_ENVIRON
     TestEnvironment();
 #endif // TEST_ENVIRON
 

-#ifdef TEST_EXECUTE
-    TestExecute();
-#endif // TEST_EXECUTE
-

 #ifdef TEST_FILECONF
     TestFileConfRead();
 #endif // TEST_FILECONF
 
 #ifdef TEST_FILECONF
     TestFileConfRead();
 #endif // TEST_FILECONF
 

-#ifdef TEST_LIST
-    TestListCtor();
-#endif // TEST_LIST
-

 #ifdef TEST_LOCALE
     TestDefaultLang();
 #endif // TEST_LOCALE
 
 #ifdef TEST_LOG
 #ifdef TEST_LOCALE
     TestDefaultLang();
 #endif // TEST_LOCALE
 
 #ifdef TEST_LOG

+    wxPuts(wxT("*** Testing wxLog ***"));
+

     wxString s;
     for ( size_t n = 0; n < 8000; n++ )
     {
     wxString s;
     for ( size_t n = 0; n < 8000; n++ )
     {

-        s << (char)('A' + (n % 26));
+        s << (wxChar)(wxT('A') + (n % 26));

     }
 
     }
 

+    wxLogWarning(wxT("The length of the string is %lu"),
+                 (unsigned long)s.length());
+

     wxString msg;
     wxString msg;

-    msg.Printf("A very very long message: '%s', the end!\n", s.c_str());
+    msg.Printf(wxT("A very very long message: '%s', the end!\n"), s.c_str());

 
     // this one shouldn't be truncated
 
     // this one shouldn't be truncated

-    printf(msg);
+    wxPrintf(msg);

 
     // but this one will because log functions use fixed size buffer
     // (note that it doesn't need '\n' at the end neither - will be added
     //  by wxLog anyhow)
 
     // but this one will because log functions use fixed size buffer
     // (note that it doesn't need '\n' at the end neither - will be added
     //  by wxLog anyhow)

-    wxLogMessage("A very very long message 2: '%s', the end!", s.c_str());
+    wxLogMessage(wxT("A very very long message 2: '%s', the end!"), s.c_str());

 #endif // TEST_LOG
 
 #ifdef TEST_FILE
 #endif // TEST_LOG
 
 #ifdef TEST_FILE

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

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

-    if ( 1 )
-    {
-        wxFileName fn;
-        fn.Assign("c:\\foo", "bar.baz");
-
-        DumpFileName(fn);
-    }
-
-    if ( TEST_ALL )
-    {
-        TestFileNameConstruction();
-        TestFileNameMakeRelative();
-        TestFileNameSplit();
-        TestFileNameTemp();
-        TestFileNameCwd();
-        TestFileNameComparison();
-        TestFileNameOperations();
-    }
+    TestFileNameTemp();
+    TestFileNameCwd();
+    TestFileNameDirManip();
+    TestFileNameComparison();
+    TestFileNameOperations();

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

+    #if 0

     TestFileSetTimes();
     TestFileSetTimes();

+    #endif

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

+
+    // wxFTP cannot be a static variable as its ctor needs to access
+    // wxWidgets internals after it has been initialized
+    ftp = new wxFTP;
+    ftp->SetLog(new wxProtocolLog(FTP_TRACE_MASK));
+

     if ( TestFtpConnect() )
     {
     if ( TestFtpConnect() )
     {

-        if ( TEST_ALL )
-        {
+        #if TEST_ALL

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

-        }
+        #endif // TEST_ALL

 
 

-        if ( TEST_INTERACTIVE )
-            TestFtpInteractive();
+        #if TEST_INTERACTIVE
+            //TestFtpInteractive();
+        #endif

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

-    if ( 0 )
-        TestFtpWuFtpd();
+    delete ftp;

 #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();
-        TestLongLongPrint();
-    }
-#endif // TEST_LONGLONG
-
-#ifdef TEST_HASH
-    TestHash();
-#endif // TEST_HASH
-
-#ifdef TEST_HASHMAP
-    TestHashMap();
-#endif // TEST_HASHMAP
-

 #ifdef TEST_MIME
 #ifdef TEST_MIME

-    wxLog::AddTraceMask(_T("mime"));
-    if ( TEST_ALL )
-    {
-        TestMimeEnum();
-        TestMimeOverride();
-        TestMimeFilename();
-    }
-
+    //wxLog::AddTraceMask(wxT("mime"));
+    TestMimeEnum();
+#if 0
+    TestMimeOverride();

     TestMimeAssociate();
     TestMimeAssociate();

+#endif
+    TestMimeFilename();

 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS

-    if ( TEST_ALL )
-    {
-        TestOsInfo();
-        TestUserInfo();
+    TestOsInfo();
+    TestPlatformInfo();
+    TestUserInfo();

 
 

-        if ( TEST_INTERACTIVE )
-            TestDiskInfo();
-    }
+    #if TEST_INTERACTIVE
+        TestDiskInfo();
+    #endif

 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST
     TestPathList();
 #endif // TEST_PATHLIST
 
 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST
     TestPathList();
 #endif // TEST_PATHLIST
 

-#ifdef TEST_ODBC
-    TestDbOpen();
-#endif // TEST_ODBC
+#ifdef TEST_PRINTF
+    TestPrintf();
+#endif // TEST_PRINTF

 
 #ifdef TEST_REGCONF
 
 #ifdef TEST_REGCONF

+    #if 0

     TestRegConfWrite();
     TestRegConfWrite();

+    #endif
+    TestRegConfRead();

 #endif // TEST_REGCONF
 
 #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();


@@ -5769,66 +4140,79 @@ int main(int argc, char **argv)
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS

-    TestFileStream();
-    TestMemoryStream();
+    #if TEST_ALL
+        TestFileStream();
+    #endif
+        TestMemoryStream();

 #endif // TEST_STREAMS
 
 #endif // TEST_STREAMS
 

+#ifdef TEST_TEXTSTREAM
+    TestTextInputStream();
+#endif // TEST_TEXTSTREAM
+

 #ifdef TEST_THREADS
     int nCPUs = wxThread::GetCPUCount();
 #ifdef TEST_THREADS
     int nCPUs = wxThread::GetCPUCount();

-    printf("This system has %d CPUs\n", nCPUs);
+    wxPrintf(wxT("This system has %d CPUs\n"), nCPUs);

     if ( nCPUs != -1 )
         wxThread::SetConcurrency(nCPUs);
 
     if ( nCPUs != -1 )
         wxThread::SetConcurrency(nCPUs);
 

-    if ( TEST_ALL )
-    {
-        TestDetachedThreads();

         TestJoinableThreads();
         TestJoinableThreads();

+
+    #if TEST_ALL
+        TestJoinableThreads();
+        TestDetachedThreads();

         TestThreadSuspend();
         TestThreadDelete();
         TestThreadSuspend();
         TestThreadDelete();

-    }
-
-    TestThreadConditions();
+        TestThreadConditions();
+        TestSemaphore();
+    #endif

 #endif // TEST_THREADS
 
 #ifdef TEST_TIMER
     TestStopWatch();
 #endif // TEST_THREADS
 
 #ifdef TEST_TIMER
     TestStopWatch();

+    TestTimer();

 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME

-    if ( TEST_ALL )
-    {
-        TestTimeSet();
+    #if TEST_ALL

         TestTimeStatic();
         TestTimeRange();
         TestTimeZones();
         TestTimeStatic();
         TestTimeRange();
         TestTimeZones();

-        TestTimeTicks();
-        TestTimeJDN();

         TestTimeDST();
         TestTimeDST();

-        TestTimeWDays();
-        TestTimeWNumber();
-        TestTimeParse();
-        TestTimeArithmetics();

         TestTimeHolidays();
         TestTimeHolidays();

-        TestTimeFormat();

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

-    }
+    #endif

 
 

-    if ( TEST_INTERACTIVE )
+    #if TEST_INTERACTIVE

         TestDateTimeInteractive();
         TestDateTimeInteractive();

+    #endif

 #endif // TEST_DATETIME
 
 #endif // TEST_DATETIME
 

+#ifdef TEST_SCOPEGUARD
+    TestScopeGuard();
+#endif
+
+#ifdef TEST_STACKWALKER
+#if wxUSE_STACKWALKER
+    TestStackWalk(argv[0]);
+#endif
+#endif // TEST_STACKWALKER
+
+#ifdef TEST_STDPATHS
+    TestStandardPaths();
+#endif
+

 #ifdef TEST_USLEEP
 #ifdef TEST_USLEEP

-    puts("Sleeping for 3 seconds... z-z-z-z-z...");
+    wxPuts(wxT("Sleeping for 3 seconds... z-z-z-z-z..."));

     wxUsleep(3000);
 #endif // TEST_USLEEP
 
     wxUsleep(3000);
 #endif // TEST_USLEEP
 

-#ifdef TEST_VCARD
-    TestVCardRead();
-    TestVCardWrite();
-#endif // TEST_VCARD
+#ifdef TEST_VOLUME
+    TestFSVolume();
+#endif // TEST_VOLUME

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


@@ -5840,11 +4224,16 @@ int main(int argc, char **argv)
     TestZipFileSystem();
 #endif // TEST_ZIP
 
     TestZipFileSystem();
 #endif // TEST_ZIP
 

-#ifdef TEST_ZLIB
-    TestZlibStreamWrite();
-    TestZlibStreamRead();
-#endif // TEST_ZLIB
+#if wxUSE_UNICODE
+    {
+        for ( int n = 0; n < argc; n++ )
+            free(wxArgv[n]);
+
+        delete [] wxArgv;
+    }
+#endif // wxUSE_UNICODE

 
 

+    wxUnusedVar(argc);
+    wxUnusedVar(argv);

     return 0;
 }
     return 0;
 }

-