fix sizing of extra control

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 382148a1cadb44d38816fd946d0eeca31b1c635b..ce887b1a5904ff1383290a04df68751d8748d9f6 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 wxWidgets
+// 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


@@ -25,6 +25,9 @@
 #include "wx/file.h"
 #include "wx/app.h"
 #include "wx/log.h"
 #include "wx/file.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!


@@ -46,14 +49,14 @@
 
 // what to test (in alphabetic order)? Define TEST_ALL to 0 to do a single
 // test, define it to 1 to do all tests.
 
 // what to test (in alphabetic order)? Define TEST_ALL to 0 to do a single
 // test, define it to 1 to do all tests.

-#define TEST_ALL 0
+#define TEST_ALL 1

 
 
 #if TEST_ALL
     #define TEST_CMDLINE
     #define TEST_DATETIME
     #define TEST_DIR
 
 
 #if TEST_ALL
     #define TEST_CMDLINE
     #define TEST_DATETIME
     #define TEST_DIR

-    #define TEST_DLLLOADER
+    #define TEST_DYNLIB

     #define TEST_ENVIRON
     #define TEST_EXECUTE
     #define TEST_FILE
     #define TEST_ENVIRON
     #define TEST_EXECUTE
     #define TEST_FILE


@@ -65,8 +68,8 @@
     #define TEST_LOCALE
     #define TEST_LOG
     #define TEST_MIME
     #define TEST_LOCALE
     #define TEST_LOG
     #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_PRINTF
     #define TEST_REGCONF
     #define TEST_REGEX


@@ -85,7 +88,7 @@
     #define TEST_WCHAR
     #define TEST_ZIP
 #else // #if TEST_ALL
     #define TEST_WCHAR
     #define TEST_ZIP
 #else // #if TEST_ALL

-    #define TEST_STACKWALKER
+    #define TEST_EXECUTE

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


@@ -133,7 +136,7 @@ static wxString MakePrintable(const wxChar *s)
 
 static void ShowCmdLine(const wxCmdLineParser& parser)
 {
 
 static void ShowCmdLine(const wxCmdLineParser& parser)
 {

-    wxString s = _T("Input files: ");
+    wxString s = _T("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++ )


@@ -147,6 +150,7 @@ static void ShowCmdLine(const wxCmdLineParser& parser)
 
     wxString strVal;
     long lVal;
 
     wxString strVal;
     long lVal;

+    double dVal;

     wxDateTime dt;
     if ( parser.Found(_T("o"), &strVal) )
         s << _T("Output file:\t") << strVal << '\n';
     wxDateTime dt;
     if ( parser.Found(_T("o"), &strVal) )
         s << _T("Output file:\t") << strVal << '\n';


@@ -154,6 +158,8 @@ static void ShowCmdLine(const wxCmdLineParser& parser)
         s << _T("Input dir:\t") << strVal << '\n';
     if ( parser.Found(_T("s"), &lVal) )
         s << _T("Size:\t") << lVal << '\n';
         s << _T("Input dir:\t") << strVal << '\n';
     if ( parser.Found(_T("s"), &lVal) )
         s << _T("Size:\t") << lVal << '\n';

+    if ( parser.Found(_T("f"), &dVal) )
+        s << _T("Double:\t") << dVal << '\n';

     if ( parser.Found(_T("d"), &dt) )
         s << _T("Date:\t") << dt.FormatISODate() << '\n';
     if ( parser.Found(_T("project_name"), &strVal) )
     if ( parser.Found(_T("d"), &dt) )
         s << _T("Date:\t") << dt.FormatISODate() << '\n';
     if ( parser.Found(_T("project_name"), &strVal) )


@@ -201,7 +207,7 @@ static void TestCmdLineConvert()
 #ifdef __UNIX__
     static const wxChar *ROOTDIR = _T("/");
     static const wxChar *TESTDIR = _T("/usr/local/share");
 #ifdef __UNIX__
     static const wxChar *ROOTDIR = _T("/");
     static const wxChar *TESTDIR = _T("/usr/local/share");

-#elif defined(__WXMSW__)
+#elif defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__)

     static const wxChar *ROOTDIR = _T("c:\\");
     static const wxChar *TESTDIR = _T("d:\\");
 #else
     static const wxChar *ROOTDIR = _T("c:\\");
     static const wxChar *TESTDIR = _T("d:\\");
 #else


@@ -228,6 +234,8 @@ static void TestDirEnumHelper(wxDir& dir,
     wxPuts(wxEmptyString);
 }
 
     wxPuts(wxEmptyString);
 }
 

+#if TEST_ALL
+

 static void TestDirEnum()
 {
     wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***"));
 static void TestDirEnum()
 {
     wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***"));


@@ -283,6 +291,8 @@ static void TestDirEnum()
     TestDirEnumHelper(dirNo);
 }
 
     TestDirEnumHelper(dirNo);
 }
 

+#endif // TEST_ALL
+

 class DirPrintTraverser : public wxDirTraverser
 {
 public:
 class DirPrintTraverser : public wxDirTraverser
 {
 public:


@@ -333,6 +343,8 @@ static void TestDirTraverse()
     dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN);
 }
 
     dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN);
 }
 

+#if TEST_ALL
+

 static void TestDirExists()
 {
     wxPuts(_T("*** Testing wxDir::Exists() ***"));
 static void TestDirExists()
 {
     wxPuts(_T("*** Testing wxDir::Exists() ***"));


@@ -366,13 +378,15 @@ static void TestDirExists()
     }
 }
 
     }
 }
 

+#endif // TEST_ALL
+

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

-#ifdef TEST_DLLLOADER
+#ifdef TEST_DYNLIB

 
 #include "wx/dynlib.h"
 
 
 #include "wx/dynlib.h"
 


@@ -398,7 +412,7 @@ static void TestDllLoad()
     }
     else
     {
     }
     else
     {

-        typedef int (*wxStrlenType)(const char *);
+        typedef int (wxSTDCALL *wxStrlenType)(const char *);

         wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME);
         if ( !pfnStrlen )
         {
         wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME);
         if ( !pfnStrlen )
         {


@@ -419,6 +433,26 @@ static void TestDllLoad()
                 wxPuts(_T("... ok"));
             }
         }
                 wxPuts(_T("... ok"));
             }
         }

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

     }
 }
 
     }
 }
 


@@ -434,7 +468,7 @@ static void TestDllListLoaded()
     for ( size_t n = 0; n < count; ++n )
     {
         const wxDynamicLibraryDetails& details = dlls[n];
     for ( size_t n = 0; n < count; ++n )
     {
         const wxDynamicLibraryDetails& details = dlls[n];

-        printf("%-45s", details.GetPath().mb_str());
+        printf("%-45s", (const char *)details.GetPath().mb_str());

 
         void *addr;
         size_t len;
 
         void *addr;
         size_t len;


@@ -444,13 +478,13 @@ static void TestDllListLoaded()
                    (unsigned long)addr, (unsigned long)((char *)addr + len));
         }
 
                    (unsigned long)addr, (unsigned long)((char *)addr + len));
         }
 

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

     }
 }
 
 #endif
 
     }
 }
 
 #endif
 

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

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


@@ -502,11 +536,13 @@ static void TestExecute()
     wxPuts(_T("*** testing wxExecute ***"));
 
 #ifdef __UNIX__
     wxPuts(_T("*** testing wxExecute ***"));
 
 #ifdef __UNIX__

-    #define COMMAND "cat -n ../../Makefile" // "echo hi"
+    #define COMMAND "echo hi"
+    #define ASYNC_COMMAND "xclock"

     #define SHELL_COMMAND "echo hi from shell"
     #define SHELL_COMMAND "echo hi from shell"

-    #define REDIRECT_COMMAND COMMAND // "date"
+    #define REDIRECT_COMMAND "cat -n Makefile"

 #elif defined(__WXMSW__)
     #define COMMAND "command.com /c echo hi"
 #elif defined(__WXMSW__)
     #define COMMAND "command.com /c echo hi"

+    #define ASYNC_COMMAND "notepad"

     #define SHELL_COMMAND "echo hi"
     #define REDIRECT_COMMAND COMMAND
 #else
     #define SHELL_COMMAND "echo hi"
     #define REDIRECT_COMMAND COMMAND
 #else


@@ -522,19 +558,22 @@ static void TestExecute()
 
     wxPrintf(_T("Testing wxExecute: "));
     fflush(stdout);
 
     wxPrintf(_T("Testing wxExecute: "));
     fflush(stdout);

-    if ( wxExecute(_T(COMMAND), true /* sync */) == 0 )
+    if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 )

         wxPuts(_T("Ok."));
     else
         wxPuts(_T("ERROR."));
 
         wxPuts(_T("Ok."));
     else
         wxPuts(_T("ERROR."));
 

-#if 0 // no, it doesn't work (yet?)

     wxPrintf(_T("Testing async wxExecute: "));
     fflush(stdout);
     wxPrintf(_T("Testing async wxExecute: "));
     fflush(stdout);

-    if ( wxExecute(COMMAND) != 0 )
+    int pid = wxExecute(ASYNC_COMMAND);
+    if ( pid != 0 )
+    {

         wxPuts(_T("Ok (command launched)."));
         wxPuts(_T("Ok (command launched)."));

+        if ( wxKill(pid) == -1 )
+            wxPuts("ERROR: failed to kill child process.");
+    }

     else
         wxPuts(_T("ERROR."));
     else
         wxPuts(_T("ERROR."));

-#endif // 0

 
     wxPrintf(_T("Testing wxExecute with redirection:\n"));
     wxArrayString output;
 
     wxPrintf(_T("Testing wxExecute with redirection:\n"));
     wxArrayString output;


@@ -544,10 +583,25 @@ static void TestExecute()
     }
     else
     {
     }
     else
     {

-        size_t count = output.GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        // don't show too much output, MAX_LINES is enough
+        static const unsigned MAX_LINES = 20;
+
+        const unsigned count = output.size();
+        for ( unsigned n = 0;
+              n < (count > MAX_LINES ? MAX_LINES/2 : count);
+              n++ )

         {
         {

-            wxPrintf(_T("\t%s\n"), output[n].c_str());
+            wxPrintf("%04u:\t%s\n", n + 1, output[n]);
+        }
+
+        if ( count > MAX_LINES )
+        {
+            wxPrintf("... skipping %u lines...\n", count - MAX_LINES);
+
+            for ( unsigned n = count - MAX_LINES/2; n < count; n++ )
+            {
+                wxPrintf("%04u:\t%s\n", n + 1, output[n]);
+            }

         }
 
         wxPuts(_T("Ok."));
         }
 
         wxPuts(_T("Ok."));


@@ -689,6 +743,24 @@ static void TestFileCopy()
     wxPuts(wxEmptyString);
 }
 
     wxPuts(wxEmptyString);
 }
 

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

 #endif // TEST_FILE
 
 // ----------------------------------------------------------------------------
 #endif // TEST_FILE
 
 // ----------------------------------------------------------------------------


@@ -841,70 +913,6 @@ static void TestFileNameTemp()
     }
 }
 
     }
 }
 

-static void TestFileNameMakeRelative()
-{
-    wxPuts(_T("*** 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 = _T("/usr/bin/");
-                break;
-
-            case wxPATH_DOS:
-                base = _T("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( _T("unexpected path format") );
-        }
-
-        wxPrintf(_T("'%s' relative to '%s': "),
-               fn.GetFullPath(fni.format).c_str(), base.c_str());
-
-        if ( !fn.MakeRelativeTo(base, fni.format) )
-        {
-            wxPuts(_T("unchanged"));
-        }
-        else
-        {
-            wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
-        }
-    }
-}
-
-static void TestFileNameMakeAbsolute()
-{
-    wxPuts(_T("*** testing wxFileName::MakeAbsolute() ***"));
-
-    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
-    {
-        const FileNameInfo& fni = filenames[n];
-        wxFileName fn(fni.fullname, fni.format);
-
-        wxPrintf(_T("'%s' absolutized: "),
-               fn.GetFullPath(fni.format).c_str());
-        fn.MakeAbsolute();
-        wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
-    }
-
-    wxPuts(wxEmptyString);
-}
-

 static void TestFileNameDirManip()
 {
     // TODO: test AppendDir(), RemoveDir(), ...
 static void TestFileNameDirManip()
 {
     // TODO: test AppendDir(), RemoveDir(), ...


@@ -933,8 +941,8 @@ 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()
 {


@@ -1317,32 +1325,6 @@ static void TestMimeEnum()
     wxPuts(wxEmptyString);
 }
 
     wxPuts(wxEmptyString);
 }
 

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

 static void TestMimeFilename()
 {
     wxPuts(_T("*** Testing MIME type from filename query ***\n"));
 static void TestMimeFilename()
 {
     wxPuts(_T("*** Testing MIME type from filename query ***\n"));


@@ -1387,6 +1369,35 @@ static void TestMimeFilename()
     wxPuts(wxEmptyString);
 }
 
     wxPuts(wxEmptyString);
 }
 

+// these tests were broken by wxMimeTypesManager changes, temporarily disabling
+#if 0
+
+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);
+
+    wxPuts(wxEmptyString);
+}
+

 static void TestMimeAssociate()
 {
     wxPuts(_T("*** Testing creation of filetype association ***\n"));
 static void TestMimeAssociate()
 {
     wxPuts(_T("*** Testing creation of filetype association ***\n"));


@@ -1397,7 +1408,7 @@ static void TestMimeAssociate()
                             _T(""),             // print cmd
                             _T("XYZ File"),     // description
                             _T(".xyz"),         // extensions
                             _T(""),             // print cmd
                             _T("XYZ File"),     // description
                             _T(".xyz"),         // extensions

-                            NULL                // end of extensions
+                            wxNullPtr           // end of extensions

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


@@ -1415,8 +1426,84 @@ static void TestMimeAssociate()
     wxPuts(wxEmptyString);
 }
 
     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(_T("Load module: %s\n"), GetClassInfo()->GetClassName()); return true; }
+    virtual void OnExit() { wxPrintf(_T("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
 // ----------------------------------------------------------------------------


@@ -1425,6 +1512,7 @@ static void TestMimeAssociate()
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

+#if TEST_INTERACTIVE

 static void TestDiskInfo()
 {
     wxPuts(_T("*** Testing wxGetDiskSpace() ***"));
 static void TestDiskInfo()
 {
     wxPuts(_T("*** Testing wxGetDiskSpace() ***"));


@@ -1453,6 +1541,7 @@ static void TestDiskInfo()
         }
     }
 }
         }
     }
 }

+#endif // TEST_INTERACTIVE

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


@@ -1463,7 +1552,7 @@ static void TestOsInfo()
     wxPrintf(_T("Running under: %s, version %d.%d\n"),
             wxGetOsDescription().c_str(), major, minor);
 
     wxPrintf(_T("Running under: %s, version %d.%d\n"),
             wxGetOsDescription().c_str(), major, minor);
 

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

 
     wxPrintf(_T("Host name is %s (%s).\n"),
            wxGetHostName().c_str(), wxGetFullHostName().c_str());
 
     wxPrintf(_T("Host name is %s (%s).\n"),
            wxGetHostName().c_str(), wxGetFullHostName().c_str());


@@ -1471,6 +1560,23 @@ static void TestOsInfo()
     wxPuts(wxEmptyString);
 }
 
     wxPuts(wxEmptyString);
 }
 

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

 static void TestUserInfo()
 {
     wxPuts(_T("*** Testing user info functions ***\n"));
 static void TestUserInfo()
 {
     wxPuts(_T("*** Testing user info functions ***\n"));


@@ -1580,26 +1686,6 @@ static void TestRegExInteractive()
 
 #endif // TEST_REGEX
 
 
 #endif // TEST_REGEX
 

-// ----------------------------------------------------------------------------
-// database
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_ODBC
-    #undef TEST_ODBC
-#endif
-
-#ifdef TEST_ODBC
-
-#include <wx/db.h>
-
-static void TestDbOpen()
-{
-    HENV henv;
-    wxDb db(henv);
-}
-
-#endif // TEST_ODBC
-

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


@@ -2002,7 +2088,7 @@ static void TestRegConfWrite()
 
 static void TestRegConfRead()
 {
 
 static void TestRegConfRead()
 {

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

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


@@ -2149,9 +2235,9 @@ static void TestScopeGuard()
     wxON_BLOCK_EXIT2(function2, 3.14, 'p');
 
     Object obj;
     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');
+    wxON_BLOCK_EXIT_OBJ0(obj, Object::method0);
+    wxON_BLOCK_EXIT_OBJ1(obj, Object::method1, 7);
+    wxON_BLOCK_EXIT_OBJ2(obj, Object::method2, 2.71, 'e');

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


@@ -2648,22 +2734,22 @@ public:
     {
     }
 
     {
     }
 

-    virtual void Walk()
+    virtual void Walk(size_t skip = 1)

     {
         wxPuts(_T("Stack dump:"));
 
     {
         wxPuts(_T("Stack dump:"));
 

-        wxStackWalker::Walk();
+        wxStackWalker::Walk(skip);

     }
 
 protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
     }
 
 protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {

-        printf("[%2d] ", frame.GetLevel());
+        printf("[%2d] ", (int) frame.GetLevel());

 
         wxString name = frame.GetName();
         if ( !name.empty() )
         {
 
         wxString name = frame.GetName();
         if ( !name.empty() )
         {

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

         }
         else
         {
         }
         else
         {


@@ -2673,8 +2759,8 @@ protected:
         if ( frame.HasSourceLocation() )
         {
             printf("\t%s:%d",
         if ( frame.HasSourceLocation() )
         {
             printf("\t%s:%d",

-                   frame.GetFileName().mb_str(),
-                   frame.GetLine());
+                   (const char*)frame.GetFileName().mb_str(),
+                   (int)frame.GetLine());

         }
 
         puts("");
         }
 
         puts("");


@@ -2682,7 +2768,9 @@ protected:
         wxString type, val;
         for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
         {
         wxString type, val;
         for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
         {

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

         }
     }
 };
         }
     }
 };


@@ -2706,6 +2794,7 @@ static void TestStackWalk(const char *argv0)
 #ifdef TEST_STDPATHS
 
 #include "wx/stdpaths.h"
 #ifdef TEST_STDPATHS
 
 #include "wx/stdpaths.h"

+#include "wx/wxchar.h"      // wxPrintf

 
 static void TestStandardPaths()
 {
 
 static void TestStandardPaths()
 {


@@ -2713,14 +2802,25 @@ static void TestStandardPaths()
 
     wxTheApp->SetAppName(_T("console"));
 
 
     wxTheApp->SetAppName(_T("console"));
 

-    wxStandardPaths& stdp = wxStandardPaths::Get();
+    wxStandardPathsBase& stdp = wxStandardPaths::Get();

     wxPrintf(_T("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
     wxPrintf(_T("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
     wxPrintf(_T("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
     wxPrintf(_T("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
     wxPrintf(_T("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
     wxPrintf(_T("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());
     wxPrintf(_T("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
     wxPrintf(_T("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
     wxPrintf(_T("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
     wxPrintf(_T("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
     wxPrintf(_T("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
     wxPrintf(_T("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());

+    wxPrintf(_T("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str());
+    wxPrintf(_T("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str());

     wxPrintf(_T("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());
     wxPrintf(_T("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());

+    wxPrintf(_T("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str());
+    wxPrintf(_T("Localized res. dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir(_T("fr")).c_str());
+    wxPrintf(_T("Message catalogs dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir
+                  (
+                    _T("fr"),
+                    wxStandardPaths::ResourceCat_Messages
+                  ).c_str());

 }
 
 #endif // TEST_STDPATHS
 }
 
 #endif // TEST_STDPATHS


@@ -2744,11 +2844,13 @@ static void TestFileStream()
         fsOut.Write("foo", 3);
     }
 
         fsOut.Write("foo", 3);
     }
 

-    wxFileInputStream fsIn(filename);
-    wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize());
-    while ( !fsIn.Eof() )

     {
     {

-        wxPutchar(fsIn.GetC());
+        wxFileInputStream fsIn(filename);
+        wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize());
+        while ( !fsIn.Eof() )
+        {
+            wxPutchar(fsIn.GetC());
+        }

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


@@ -2798,7 +2900,7 @@ static void TestMemoryStream()
 
 #ifdef TEST_TIMER
 
 
 #ifdef TEST_TIMER
 

-#include "wx/timer.h"
+#include "wx/stopwatch.h"

 #include "wx/utils.h"
 
 static void TestStopWatch()
 #include "wx/utils.h"
 
 static void TestStopWatch()


@@ -2851,6 +2953,52 @@ static void TestStopWatch()
     wxPuts(_T(", ok."));
 }
 
     wxPuts(_T(", ok."));
 }
 

+#include "wx/timer.h"
+#include "wx/evtloop.h"
+
+void TestTimer()
+{
+    wxPuts(_T("*** Testing wxTimer ***\n"));
+
+    class MyTimer : public wxTimer
+    {
+    public:
+        MyTimer() : wxTimer() { m_num = 0; }
+
+        virtual void Notify()
+        {
+            wxPrintf(_T("%d"), m_num++);
+            fflush(stdout);
+
+            if ( m_num == 10 )
+            {
+                wxPrintf(_T("... exiting the event loop"));
+                Stop();
+
+                wxEventLoop::GetActive()->Exit(0);
+                wxPuts(_T(", ok."));
+            }
+
+            fflush(stdout);
+        }
+
+    private:
+        int m_num;
+    };
+
+    wxEventLoop loop;
+
+    wxTimer timer1;
+    timer1.Start(100, true /* one shot */);
+    timer1.Stop();
+    timer1.Start(100, true /* one shot */);
+
+    MyTimer timer;
+    timer.Start(500);
+
+    loop.Run();
+}
+

 #endif // TEST_TIMER
 
 // ----------------------------------------------------------------------------
 #endif // TEST_TIMER
 
 // ----------------------------------------------------------------------------


@@ -3059,7 +3207,7 @@ static void TestVCardRead()
 
         wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str());
 
 
         wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str());
 

-        // now show how to deal with multiply occuring properties
+        // now show how to deal with multiply occurring properties

         DumpVCardAddresses(vcard);
         DumpVCardPhoneNumbers(vcard);
 
         DumpVCardAddresses(vcard);
         DumpVCardPhoneNumbers(vcard);
 


@@ -3287,7 +3435,11 @@ static void TestZipStreamRead()
     wxPuts(_T("*** Testing ZIP reading ***\n"));
 
     static const wxString filename = _T("foo");
     wxPuts(_T("*** Testing ZIP reading ***\n"));
 
     static const wxString filename = _T("foo");

-    wxZipInputStream istr(TESTFILE_ZIP, filename);
+    wxFFileInputStream in(TESTFILE_ZIP);
+    wxZipInputStream istr(in); 
+    wxZipEntry entry(filename);
+    istr.OpenEntry(entry);
+

     wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
 
     wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str());
     wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
 
     wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str());


@@ -4078,6 +4230,24 @@ static void TestSemaphore()
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

+#if wxUSE_UNICODE
+    wxChar **wxArgv = new wxChar *[argc + 1];
+
+    {
+        int n;
+
+        for (n = 0; n < argc; n++ )
+        {
+            wxMB2WXbuf warg = wxConvertMB2WX(argv[n]);
+            wxArgv[n] = wxStrdup(warg);
+        }
+
+        wxArgv[n] = NULL;
+    }
+#else // !wxUSE_UNICODE
+    #define wxArgv argv
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+

     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
 
     wxInitializer initializer;
     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
 
     wxInitializer initializer;


@@ -4115,52 +4285,27 @@ int main(int argc, char **argv)
 #if wxUSE_CMDLINE_PARSER
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 #if wxUSE_CMDLINE_PARSER
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

-        { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"),
+        { wxCMD_LINE_SWITCH, "h", "help", "show this help message",

             wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
             wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },

-        { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") },
-        { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"),   _T("be quiet") },
+        { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
+        { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },

 
 

-        { wxCMD_LINE_OPTION, _T("o"), _T("output"),  _T("output file") },
-        { wxCMD_LINE_OPTION, _T("i"), _T("input"),   _T("input dir") },
-        { wxCMD_LINE_OPTION, _T("s"), _T("size"),    _T("output block size"),
+        { wxCMD_LINE_OPTION, "o", "output",  "output file" },
+        { wxCMD_LINE_OPTION, "i", "input",   "input dir" },
+        { wxCMD_LINE_OPTION, "s", "size",    "output block size",

             wxCMD_LINE_VAL_NUMBER },
             wxCMD_LINE_VAL_NUMBER },

-        { wxCMD_LINE_OPTION, _T("d"), _T("date"),    _T("output file date"),
+        { wxCMD_LINE_OPTION, "d", "date",    "output file date",

             wxCMD_LINE_VAL_DATE },
             wxCMD_LINE_VAL_DATE },

+        { wxCMD_LINE_OPTION, "f", "double",  "output double",
+            wxCMD_LINE_VAL_DOUBLE },

 
 

-        { wxCMD_LINE_PARAM,  NULL, NULL, _T("input file"),
+        { wxCMD_LINE_PARAM,  NULL, NULL, "input file",

             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
 
         { wxCMD_LINE_NONE }
     };
 
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
 
         { wxCMD_LINE_NONE }
     };
 

-#if wxUSE_UNICODE
-    wxChar **wargv = new wxChar *[argc + 1];
-
-    {
-        int n;
-
-        for (n = 0; n < argc; n++ )
-        {
-            wxMB2WXbuf warg = wxConvertMB2WX(argv[n]);
-            wargv[n] = wxStrdup(warg);
-        }
-
-        wargv[n] = NULL;
-    }
-
-    #define argv wargv
-#endif // wxUSE_UNICODE
-
-    wxCmdLineParser parser(cmdLineDesc, argc, argv);
-
-#if wxUSE_UNICODE
-    {
-        for ( int n = 0; n < argc; n++ )
-            free(wargv[n]);
-
-        delete [] wargv;
-    }
-#endif // wxUSE_UNICODE
+    wxCmdLineParser parser(cmdLineDesc, argc, wxArgv);

 
     parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"),
                      wxCMD_LINE_VAL_STRING,
 
     parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"),
                      wxCMD_LINE_VAL_STRING,


@@ -4192,10 +4337,10 @@ int main(int argc, char **argv)
     TestDirTraverse();
 #endif // TEST_DIR
 
     TestDirTraverse();
 #endif // TEST_DIR
 

-#ifdef TEST_DLLLOADER
+#ifdef TEST_DYNLIB

     TestDllLoad();
     TestDllListLoaded();
     TestDllLoad();
     TestDllListLoaded();

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

 
 #ifdef TEST_ENVIRON
     TestEnvironment();
 
 #ifdef TEST_ENVIRON
     TestEnvironment();


@@ -4241,13 +4386,10 @@ int main(int argc, char **argv)
     TestFileRead();
     TestTextFileRead();
     TestFileCopy();
     TestFileRead();
     TestTextFileRead();
     TestFileCopy();

+    TestTempFile();

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

-    TestFileNameConstruction();
-    TestFileNameMakeRelative();
-    TestFileNameMakeAbsolute();
-    TestFileNameSplit();

     TestFileNameTemp();
     TestFileNameCwd();
     TestFileNameDirManip();
     TestFileNameTemp();
     TestFileNameCwd();
     TestFileNameDirManip();


@@ -4286,23 +4428,22 @@ int main(int argc, char **argv)
 #endif // TEST_FTP
 
 #ifdef TEST_MIME
 #endif // TEST_FTP
 
 #ifdef TEST_MIME

-    wxLog::AddTraceMask(_T("mime"));
-    #if TEST_ALL
-        TestMimeEnum();
-        TestMimeOverride();
-        TestMimeAssociate();
-    #endif
+    //wxLog::AddTraceMask(_T("mime"));
+    TestMimeEnum();
+#if 0
+    TestMimeOverride();
+    TestMimeAssociate();
+#endif

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

-    #if TEST_ALL
-        TestOsInfo();
-        TestUserInfo();
+    TestOsInfo();
+    TestPlatformInfo();
+    TestUserInfo();

 
 

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

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


@@ -4310,10 +4451,6 @@ int main(int argc, char **argv)
     TestPathList();
 #endif // TEST_PATHLIST
 
     TestPathList();
 #endif // TEST_PATHLIST
 

-#ifdef TEST_ODBC
-    TestDbOpen();
-#endif // TEST_ODBC
-

 #ifdef TEST_PRINTF
     TestPrintf();
 #endif // TEST_PRINTF
 #ifdef TEST_PRINTF
     TestPrintf();
 #endif // TEST_PRINTF


@@ -4371,21 +4508,15 @@ int main(int argc, char **argv)
 
 #ifdef TEST_TIMER
     TestStopWatch();
 
 #ifdef TEST_TIMER
     TestStopWatch();

+    TestTimer();

 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME
     #if TEST_ALL
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME
     #if TEST_ALL

-        TestTimeSet();

         TestTimeStatic();
         TestTimeRange();
         TestTimeZones();
         TestTimeStatic();
         TestTimeRange();
         TestTimeZones();

-        TestTimeTicks();
-        TestTimeJDN();

         TestTimeDST();
         TestTimeDST();

-        TestTimeWDays();
-        TestTimeWNumber();
-        TestTimeParse();
-        TestTimeArithmetics();

         TestTimeHolidays();
         TestTimeSpanFormat();
         TestTimeMS();
         TestTimeHolidays();
         TestTimeSpanFormat();
         TestTimeMS();


@@ -4436,8 +4567,16 @@ int main(int argc, char **argv)
     TestZipFileSystem();
 #endif // TEST_ZIP
 
     TestZipFileSystem();
 #endif // TEST_ZIP
 

+#if wxUSE_UNICODE
+    {
+        for ( int n = 0; n < argc; n++ )
+            free(wxArgv[n]);
+
+        delete [] wxArgv;
+    }
+#endif // wxUSE_UNICODE
+

     wxUnusedVar(argc);
     wxUnusedVar(argv);
     return 0;
 }
     wxUnusedVar(argc);
     wxUnusedVar(argv);
     return 0;
 }

-