update from gtk/changes.txt to changes.txt (sic...)

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index e67580588aada06aa1d36450d7dc945be9e6551b..7a9e0bb1afb4c270c46d65c967ecaab6fbe00283 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -83,6 +83,7 @@
     #define TEST_THREADS
     #define TEST_TIMER
     // #define TEST_VCARD            -- don't enable this (VZ)
     #define TEST_THREADS
     #define TEST_TIMER
     // #define TEST_VCARD            -- don't enable this (VZ)

+    #define TEST_VOLUME

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


@@ -90,7 +91,7 @@
     #undef TEST_ALL
     static const bool TEST_ALL = TRUE;
 #else
     #undef TEST_ALL
     static const bool TEST_ALL = TRUE;
 #else

-    #define TEST_THREADS
+    #define TEST_FILENAME

 
     static const bool TEST_ALL = FALSE;
 #endif
 
     static const bool TEST_ALL = FALSE;
 #endif


@@ -99,7 +100,7 @@
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 

-    static const bool TEST_INTERACTIVE = FALSE;
+    static const bool TEST_INTERACTIVE = TRUE;

 #else
     static const bool TEST_INTERACTIVE = FALSE;
 #endif
 #else
     static const bool TEST_INTERACTIVE = FALSE;
 #endif


@@ -183,11 +184,11 @@ static void TestCharset()
 
     for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
     {
 
     for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
     {

-        wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charsets[n]);
+        wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]);

         wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"),
                  charsets[n],
         wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"),
                  charsets[n],

-                 wxTheFontMapper->GetEncodingName(enc).c_str(),
-                 wxTheFontMapper->GetEncodingDescription(enc).c_str());
+                 wxFontMapper::Get()->GetEncodingName(enc).c_str(),
+                 wxFontMapper::Get()->GetEncodingDescription(enc).c_str());

     }
 }
 
     }
 }
 


@@ -801,6 +802,8 @@ static struct FileNameInfo
     { _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 },
 
     { _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 },
 

+    // wxFileName support for Mac file names is broken currently
+#if 0

     // 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 },
     // 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 },


@@ -808,6 +811,7 @@ static struct FileNameInfo
     { _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 },
     { _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 },

+#endif // 0

 
     // VMS file names
     { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), TRUE, wxPATH_VMS },
 
     // VMS file names
     { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), TRUE, wxPATH_VMS },


@@ -830,7 +834,7 @@ static void TestFileNameConstruction()
             printf("ERROR: fullname should be '%s'\n", fni.fullname);
         }
 
             printf("ERROR: fullname should be '%s'\n", fni.fullname);
         }
 

-        bool isAbsolute = fn.IsAbsolute();
+        bool isAbsolute = fn.IsAbsolute(fni.format);

         printf("'%s' is %s (%s)\n\t",
                fullname.c_str(),
                isAbsolute ? "absolute" : "relative",
         printf("'%s' is %s (%s)\n\t",
                fullname.c_str(),
                isAbsolute ? "absolute" : "relative",


@@ -883,17 +887,25 @@ static void TestFileNameTemp()
 
     static const char *tmpprefixes[] =
     {
 
     static const char *tmpprefixes[] =
     {

+        "",

         "foo",
         "foo",

-        "/tmp/foo",

         "..",
         "../bar",
         "..",
         "../bar",

+#ifdef __UNIX__
+        "/tmp/foo",

         "/tmp/foo/bar", // this one must be an error
         "/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
+            printf("Prefix '%s'\t-> error\n", tmpprefixes[n]);
+        }
+        else

         {
             printf("Prefix '%s'\t-> temp file '%s'\n",
                    tmpprefixes[n], path.c_str());
         {
             printf("Prefix '%s'\t-> temp file '%s'\n",
                    tmpprefixes[n], path.c_str());


@@ -982,8 +994,8 @@ static void TestFileGetTimes()
 {
     wxFileName fn(_T("testdata.fc"));
 
 {
     wxFileName fn(_T("testdata.fc"));
 

-    wxDateTime dtAccess, dtMod, dtChange;
-    if ( !fn.GetTimes(&dtAccess, &dtMod, &dtChange) )
+    wxDateTime dtAccess, dtMod, dtCreate;
+    if ( !fn.GetTimes(&dtAccess, &dtMod, &dtCreate) )

     {
         wxPrintf(_T("ERROR: GetTimes() failed.\n"));
     }
     {
         wxPrintf(_T("ERROR: GetTimes() failed.\n"));
     }


@@ -992,9 +1004,9 @@ static void TestFileGetTimes()
         static const wxChar *fmt = _T("%Y-%b-%d %H:%M:%S");
 
         wxPrintf(_T("File times for '%s':\n"), fn.GetFullPath().c_str());
         static const wxChar *fmt = _T("%Y-%b-%d %H:%M:%S");
 
         wxPrintf(_T("File times for '%s':\n"), fn.GetFullPath().c_str());

-        wxPrintf(_T("Access:      \t%s\n"), dtAccess.Format(fmt).c_str());
-        wxPrintf(_T("Mod/creation:\t%s\n"), dtMod.Format(fmt).c_str());
-        wxPrintf(_T("Change:      \t%s\n"), dtChange.Format(fmt).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());

     }
 }
 
     }
 }
 


@@ -1702,9 +1714,9 @@ static void TestMimeAssociate()
                             _T("application/x-xyz"),
                             _T("xyzview '%s'"), // open cmd
                             _T(""),             // print cmd
                             _T("application/x-xyz"),
                             _T("xyzview '%s'"), // open cmd
                             _T(""),             // print cmd

-                            _T("XYZ File")  // description
-                            _T(".xyz"),     // extensions
-                            NULL            // end of extensions
+                            _T("XYZ File"),     // description
+                            _T(".xyz"),         // extensions
+                            NULL                // end of extensions

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


@@ -1947,8 +1959,15 @@ static void TestDivision()
         // multiplication will not overflow)
         wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand());
 
         // multiplication will not overflow)
         wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand());
 

-        // get a random long (not wxLongLong for now) to divide it with
-        long l = rand();
+        // get a random (but non null) long (not wxLongLong for now) to divide
+        // it with
+        long l;
+        do
+        {
+           l = rand();
+        }
+        while ( !l );
+

         q = ll / l;
         r = ll % l;
 
         q = ll / l;
         r = ll % l;
 


@@ -3291,6 +3310,65 @@ static void TestVCardWrite()
 
 #endif // TEST_VCARD
 
 
 #endif // TEST_VCARD
 

+// ----------------------------------------------------------------------------
+// wxVolume tests
+// ----------------------------------------------------------------------------
+
+#if !wxUSE_FSVOLUME
+    #undef TEST_VOLUME
+#endif
+
+#ifdef TEST_VOLUME
+
+#include "wx/volume.h"
+
+static const wxChar *volumeKinds[] =
+{
+    _T("floppy"),
+    _T("hard disk"),
+    _T("CD-ROM"),
+    _T("DVD-ROM"),
+    _T("network volume"),
+    _T("other volume"),
+};
+
+static void TestFSVolume()
+{
+    wxPuts(_T("*** Testing wxFSVolume class ***"));
+
+    wxArrayString volumes = wxFSVolume::GetVolumes();
+    size_t count = volumes.GetCount();
+
+    if ( !count )
+    {
+        wxPuts(_T("ERROR: no mounted volumes?"));
+        return;
+    }
+
+    wxPrintf(_T("%u mounted volumes found:\n"), count);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxFSVolume vol(volumes[n]);
+        if ( !vol.IsOk() )
+        {
+            wxPuts(_T("ERROR: couldn't create volume"));
+            continue;
+        }
+
+        wxPrintf(_T("%u: %s (%s), %s, %s, %s\n"),
+                 n + 1,
+                 vol.GetDisplayName().c_str(),
+                 vol.GetName().c_str(),
+                 volumeKinds[vol.GetKind()],
+                 vol.IsWritable() ? _T("rw") : _T("ro"),
+                 vol.GetFlags() & wxFS_VOL_REMOVABLE ? _T("removable")
+                                                     : _T("fixed"));
+    }
+}
+
+#endif // TEST_VOLUME
+

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


@@ -3302,21 +3380,21 @@ static void TestVCardWrite()
 #include "wx/encconv.h"
 #include "wx/buffer.h"
 
 #include "wx/encconv.h"
 #include "wx/buffer.h"
 

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

 static void TestUtf8()
 {
     puts("*** Testing UTF8 support ***\n");
 
 static void TestUtf8()
 {
     puts("*** Testing UTF8 support ***\n");
 

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

     char buf[1024];
     wchar_t wbuf[1024];
     if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
     char buf[1024];
     wchar_t wbuf[1024];
     if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )


@@ -3325,22 +3403,49 @@ static void TestUtf8()
     }
     else
     {
     }
     else
     {

-        // using wxEncodingConverter
-#if 0
-        wxEncodingConverter ec;
-        ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8);
-        ec.Convert(wbuf, buf);
-#else // using wxCSConv

         wxCSConv conv(_T("koi8-r"));
         if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 )
         {
             puts("ERROR: conversion to KOI8-R failed.");
         }
         else
         wxCSConv conv(_T("koi8-r"));
         if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 )
         {
             puts("ERROR: conversion to KOI8-R failed.");
         }
         else

-#endif
+        {
+            printf("The resulting string (in KOI8-R): %s\n", buf);
+        }
+    }

 
 

-        printf("The resulting string (in koi8-r): %s\n", buf);
+    if ( wxConvUTF8.WC2MB(buf, L"à la", WXSIZEOF(buf)) <= 0 )
+    {
+        puts("ERROR: conversion to UTF-8 failed.");

     }
     }

+    else
+    {
+        printf("The string in UTF-8: %s\n", buf);
+    }
+
+    puts("");
+}
+
+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
 }
 
 #endif // TEST_WCHAR


@@ -4527,7 +4632,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
 {


@@ -4615,7 +4720,7 @@ void MyDetachedThread::OnExit()
 
     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()


@@ -4754,8 +4859,9 @@ static void TestThreadDelete()
 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();


@@ -4766,12 +4872,14 @@ public:
         printf("Thread %lu has started running.\n", GetId());
         fflush(stdout);
 
         printf("Thread %lu has started running.\n", GetId());
         fflush(stdout);
 

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

 
         printf("Thread %lu starts to wait...\n", GetId());
         fflush(stdout);
 
 
         printf("Thread %lu starts to wait...\n", GetId());
         fflush(stdout);
 

+        m_mutex->Lock();

         m_condition->Wait();
         m_condition->Wait();

+        m_mutex->Unlock();

 
         printf("Thread %lu finished to wait, exiting.\n", GetId());
         fflush(stdout);
 
         printf("Thread %lu finished to wait, exiting.\n", GetId());
         fflush(stdout);


@@ -4780,17 +4888,19 @@ public:
     }
 
 private:
     }
 
 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("thread", "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];


@@ -4798,7 +4908,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++ )


@@ -4844,6 +4954,102 @@ static void TestThreadConditions()
     wxThread::Sleep(500);
 }
 
     wxThread::Sleep(500);
 }
 

+#include "wx/utils.h"
+
+class MyExecThread : public wxThread
+{
+public:
+    MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE),
+                                            m_command(command)
+    {
+        Create();
+    }
+
+    virtual ExitCode Entry()
+    {
+        return (ExitCode)wxExecute(m_command, wxEXEC_SYNC);
+    }
+
+private:
+    wxString m_command;
+};
+
+static void TestThreadExec()
+{
+    wxPuts(_T("*** Testing wxExecute interaction with threads ***\n"));
+
+    MyExecThread thread(_T("true"));
+    thread.Run();
+
+    wxPrintf(_T("Main program exit code: %ld.\n"),
+             wxExecute(_T("false"), wxEXEC_SYNC));
+
+    wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait());
+}
+
+// semaphore tests
+#include "wx/datetime.h"
+
+class MySemaphoreThread : public wxThread
+{
+public:
+    MySemaphoreThread(int i, wxSemaphore *sem)
+        : wxThread(wxTHREAD_JOINABLE),
+          m_sem(sem),
+          m_i(i)
+    {
+        Create();
+    }
+
+    virtual ExitCode Entry()
+    {
+        wxPrintf(_T("%s: Thread %d starting to wait for semaphore...\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i);
+
+        m_sem->Wait();
+
+        wxPrintf(_T("%s: Thread %d acquired the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i);
+
+        Sleep(1000);
+
+        wxPrintf(_T("%s: Thread %d releasing the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i);
+
+        m_sem->Post();
+
+        return 0;
+    }
+
+private:
+    wxSemaphore *m_sem;
+    int m_i;
+};
+
+WX_DEFINE_ARRAY(wxThread *, ArrayThreads);
+
+static void TestSemaphore()
+{
+    wxPuts(_T("*** Testing wxSemaphore class. ***"));
+
+    static const int SEM_LIMIT = 3;
+
+    wxSemaphore sem(SEM_LIMIT, SEM_LIMIT);
+    ArrayThreads threads;
+
+    for ( int i = 0; i < 3*SEM_LIMIT; i++ )
+    {
+        threads.Add(new MySemaphoreThread(i, &sem));
+        threads.Last()->Run();
+    }
+
+    for ( size_t n = 0; n < threads.GetCount(); n++ )
+    {
+        threads[n]->Wait();
+        delete threads[n];
+    }
+}
+

 #endif // TEST_THREADS
 
 // ----------------------------------------------------------------------------
 #endif // TEST_THREADS
 
 // ----------------------------------------------------------------------------


@@ -4852,25 +5058,46 @@ static void TestThreadConditions()
 
 #ifdef TEST_ARRAYS
 
 
 #ifdef TEST_ARRAYS
 

-static void PrintArray(const char* name, const wxArrayString& array)
-{
-    printf("Dump of the array '%s'\n", name);
+#include "wx/dynarray.h"

 
 

-    size_t nCount = array.GetCount();
-    for ( size_t n = 0; n < nCount; n++ )
-    {
-        printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str());
-    }
-}
+#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);

 
 

-static void PrintArray(const char* name, const wxArrayInt& array)
+WX_DECLARE_OBJARRAY(Bar, ArrayBars);
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(ArrayBars);
+
+static void PrintArray(const char* name, const wxArrayString& array)

 {
     printf("Dump of the array '%s'\n", name);
 
     size_t nCount = array.GetCount();
     for ( size_t n = 0; n < nCount; n++ )
     {
 {
     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]);
+        printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str());

     }
 }
 
     }
 }
 


@@ -4880,45 +5107,63 @@ int wxCMPFUNC_CONV StringLenCompare(const wxString& first,
     return first.length() - second.length();
 }
 
     return first.length() - second.length();
 }
 

-int wxCMPFUNC_CONV IntCompare(int *first,
-                              int *second)
-{
-    return *first - *second;
-}
-
-int wxCMPFUNC_CONV IntRevCompare(int *first,
-                              int *second)
-{
-    return *second - *first;
-}
-
-static void TestArrayOfInts()
-{
-    puts("*** Testing wxArrayInt ***\n");
-
-    wxArrayInt a;
-    a.Add(1);
-    a.Add(17);
-    a.Add(5);
-    a.Add(3);
-
-    puts("Initially:");
-    PrintArray("a", a);
-
-    puts("After sort:");
-    a.Sort(IntCompare);
-    PrintArray("a", a);
-
-    puts("After reverse sort:");
-    a.Sort(IntRevCompare);
-    PrintArray("a", a);
+#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);                                                       \

 }
 
 }
 

-#include "wx/dynarray.h"
-
-WX_DECLARE_OBJARRAY(Bar, ArrayBars);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(ArrayBars);
+TestArrayOf(Short);
+TestArrayOf(Int);

 
 static void TestArrayOfObjects()
 {
 
 static void TestArrayOfObjects()
 {


@@ -5493,11 +5738,10 @@ int main(int argc, char **argv)
         PrintArray("a1", a1);
 
         TestArrayOfObjects();
         PrintArray("a1", a1);
 
         TestArrayOfObjects();

+        TestArrayOfShorts();

     }
     }

-    else
-    {
-        TestArrayOfInts();
-    }
+
+    TestArrayOfInts();

 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR
 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR


@@ -5561,7 +5805,7 @@ int main(int argc, char **argv)
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME

-    if ( 1 )
+    if ( 0 )

     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");


@@ -5569,7 +5813,7 @@ int main(int argc, char **argv)
         DumpFileName(fn);
     }
 
         DumpFileName(fn);
     }
 

-    if ( TEST_ALL )
+    if ( 1 )

     {
         TestFileNameConstruction();
         TestFileNameMakeRelative();
     {
         TestFileNameConstruction();
         TestFileNameMakeRelative();


@@ -5654,7 +5898,9 @@ int main(int argc, char **argv)
     {
         TestOsInfo();
         TestUserInfo();
     {
         TestOsInfo();
         TestUserInfo();

-        TestDiskInfo();
+
+        if ( TEST_INTERACTIVE )
+            TestDiskInfo();

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


@@ -5711,9 +5957,11 @@ int main(int argc, char **argv)
         TestJoinableThreads();
         TestThreadSuspend();
         TestThreadDelete();
         TestJoinableThreads();
         TestThreadSuspend();
         TestThreadDelete();

+        TestThreadConditions();
+        TestThreadExec();

     }
 
     }
 

-    TestThreadConditions();
+    TestSemaphore();

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


@@ -5756,8 +6004,13 @@ int main(int argc, char **argv)
     TestVCardWrite();
 #endif // TEST_VCARD
 
     TestVCardWrite();
 #endif // TEST_VCARD
 

+#ifdef TEST_VOLUME
+    TestFSVolume();
+#endif // TEST_VOLUME
+

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

+    TestEncodingConverter();

 #endif // TEST_WCHAR
 
 #ifdef TEST_ZIP
 #endif // TEST_WCHAR
 
 #ifdef TEST_ZIP