Added demo of using a sizer in a wxScrolledWindow

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 8d363fc5f9f65b133f9433474301e795476a3eb0..bc6de72314285368d2cde47f7006f1c5739ed538 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -91,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_ARRAYS
+    #define TEST_STREAMS

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


@@ -307,7 +307,19 @@ static void TestDirEnum()
 {
     puts("*** Testing wxDir::GetFirst/GetNext ***");
 
 {
     puts("*** Testing wxDir::GetFirst/GetNext ***");
 

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

 
     puts("Enumerating everything in current directory:");
     TestDirEnumHelper(dir);
 
     puts("Enumerating everything in current directory:");
     TestDirEnumHelper(dir);


@@ -395,6 +407,38 @@ static void TestDirTraverse()
     dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
 }
 
     dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
 }
 

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

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


@@ -783,6 +827,14 @@ static void DumpFileName(const wxFileName& fn)
              fn.GetPath(wxPATH_GET_SEPARATOR).c_str());
     wxPrintf(_T("with both:   \t'%s'\n"),
              fn.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).c_str());
              fn.GetPath(wxPATH_GET_SEPARATOR).c_str());
     wxPrintf(_T("with both:   \t'%s'\n"),
              fn.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).c_str());

+
+    wxPuts(_T("The directories in the path are:"));
+    wxArrayString dirs = fn.GetDirs();
+    size_t count = dirs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str());
+    }

 }
 
 static struct FileNameInfo
 }
 
 static struct FileNameInfo


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

+    { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },

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


@@ -1687,6 +1740,7 @@ static void TestMimeFilename()
         _T("readme.txt"),
         _T("document.pdf"),
         _T("image.gif"),
         _T("readme.txt"),
         _T("document.pdf"),
         _T("image.gif"),

+        _T("picture.jpeg"),

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


@@ -2382,6 +2436,10 @@ static void TestRegExInteractive()
 // database
 // ----------------------------------------------------------------------------
 
 // database
 // ----------------------------------------------------------------------------
 

+#if !wxUSE_ODBC
+    #undef TEST_ODBC
+#endif
+

 #ifdef TEST_ODBC
 
 #include <wx/db.h>
 #ifdef TEST_ODBC
 
 #include <wx/db.h>


@@ -3014,13 +3072,27 @@ static void TestFileStream()
 
 static void TestMemoryStream()
 {
 
 static void TestMemoryStream()
 {

-    puts("*** Testing wxMemoryInputStream ***");
+    wxPuts(_T("*** Testing wxMemoryOutputStream ***"));
+
+    wxMemoryOutputStream memOutStream;
+    wxPrintf(_T("Initially out stream offset: %lu\n"),
+             (unsigned long)memOutStream.TellO());
+
+    for ( const wxChar *p = _T("Hello, stream!"); *p; p++ )
+    {
+        memOutStream.PutC(*p);
+    }
+
+    wxPrintf(_T("Final out stream offset: %lu\n"),
+             (unsigned long)memOutStream.TellO());
+
+    wxPuts(_T("*** Testing wxMemoryInputStream ***"));

 
     wxChar buf[1024];
 
     wxChar buf[1024];

-    wxStrncpy(buf, _T("Hello, stream!"), WXSIZEOF(buf));
+    size_t len = memOutStream.CopyTo(buf, WXSIZEOF(buf));

 
 

-    wxMemoryInputStream memInpStream(buf, wxStrlen(buf));
-    printf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
+    wxMemoryInputStream memInpStream(buf, len);
+    wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize());

     while ( !memInpStream.Eof() )
     {
         putchar(memInpStream.GetC());
     while ( !memInpStream.Eof() )
     {
         putchar(memInpStream.GetC());


@@ -3338,7 +3410,7 @@ static void TestVCardWrite()
 // wxVolume tests
 // ----------------------------------------------------------------------------
 
 // wxVolume tests
 // ----------------------------------------------------------------------------
 

-#if !wxUSE_FSVOLUME
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME

     #undef TEST_VOLUME
 #endif
 
     #undef TEST_VOLUME
 #endif
 


@@ -3569,16 +3641,16 @@ static void TestZipFileSystem()
 #include "wx/wfstream.h"
 
 static const wxChar *FILENAME_GZ = _T("test.gz");
 #include "wx/wfstream.h"
 
 static const wxChar *FILENAME_GZ = _T("test.gz");

-static const char *TEST_DATA = "hello and hello again";
+static const char *TEST_DATA = "hello and hello and hello and hello and hello";

 
 static void TestZlibStreamWrite()
 {
     puts("*** Testing Zlib stream reading ***\n");
 
     wxFileOutputStream fileOutStream(FILENAME_GZ);
 
 static void TestZlibStreamWrite()
 {
     puts("*** Testing Zlib stream reading ***\n");
 
     wxFileOutputStream fileOutStream(FILENAME_GZ);

-    wxZlibOutputStream ostr(fileOutStream, 0);
+    wxZlibOutputStream ostr(fileOutStream);

     printf("Compressing the test string... ");
     printf("Compressing the test string... ");

-    ostr.Write(TEST_DATA, sizeof(TEST_DATA));
+    ostr.Write(TEST_DATA, strlen(TEST_DATA) + 1);

     if ( !ostr )
     {
         puts("(ERROR: failed)");
     if ( !ostr )
     {
         puts("(ERROR: failed)");


@@ -3823,7 +3895,7 @@ static void TestTimeTicks()
         else
         {
             printf(" (ERROR: should be %ld, delta = %ld)\n",
         else
         {
             printf(" (ERROR: should be %ld, delta = %ld)\n",

-                   d.ticks, ticks - d.ticks);
+                   (long)d.ticks, (long)(ticks - d.ticks));

         }
 
         dt = d.DT().ToTimezone(wxDateTime::GMT0);
         }
 
         dt = d.DT().ToTimezone(wxDateTime::GMT0);


@@ -3836,7 +3908,7 @@ static void TestTimeTicks()
         else
         {
             printf(" (ERROR: should be %ld, delta = %ld)\n",
         else
         {
             printf(" (ERROR: should be %ld, delta = %ld)\n",

-                   d.gmticks, ticks - d.gmticks);
+                   (long)d.gmticks, (long)(ticks - d.gmticks));

         }
     }
 
         }
     }
 


@@ -5027,18 +5099,18 @@ public:
 
     virtual ExitCode Entry()
     {
 
     virtual ExitCode Entry()
     {

-        wxPrintf(_T("%s: Thread %d starting to wait for semaphore...\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
         m_sem->Wait();
 
 
         m_sem->Wait();
 

-        wxPrintf(_T("%s: Thread %d acquired the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
         Sleep(1000);
 
 
         Sleep(1000);
 

-        wxPrintf(_T("%s: Thread %d releasing the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());

 
         m_sem->Post();
 
 
         m_sem->Post();
 


@@ -5625,6 +5697,8 @@ static void TestStringMatch()
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

+    wxApp::CheckBuildOptions(wxBuildOptions());
+

     wxInitializer initializer;
     if ( !initializer )
     {
     wxInitializer initializer;
     if ( !initializer )
     {


@@ -5779,9 +5853,10 @@ int main(int argc, char **argv)
 #ifdef TEST_DIR
     if ( TEST_ALL )
     {
 #ifdef TEST_DIR
     if ( TEST_ALL )
     {

-        TestDirEnum();
+        TestDirExists();

         TestDirTraverse();
     }
         TestDirTraverse();
     }

+    TestDirEnum();

 #endif // TEST_DIR
 
 #ifdef TEST_DLLLOADER
 #endif // TEST_DIR
 
 #ifdef TEST_DLLLOADER


@@ -5841,10 +5916,12 @@ int main(int argc, char **argv)
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");

+        fn.Assign("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc");

 
         DumpFileName(fn);
     }
 
 
         DumpFileName(fn);
     }
 

+    TestFileNameConstruction();

     if ( TEST_ALL )
     {
         TestFileNameConstruction();
     if ( TEST_ALL )
     {
         TestFileNameConstruction();


@@ -5859,6 +5936,7 @@ int main(int argc, char **argv)
 
 #ifdef TEST_FILETIME
     TestFileGetTimes();
 
 #ifdef TEST_FILETIME
     TestFileGetTimes();

+    if ( 0 )

     TestFileSetTimes();
 #endif // TEST_FILETIME
 
     TestFileSetTimes();
 #endif // TEST_FILETIME
 


@@ -5919,10 +5997,9 @@ int main(int argc, char **argv)
     {
         TestMimeEnum();
         TestMimeOverride();
     {
         TestMimeEnum();
         TestMimeOverride();

-        TestMimeFilename();
+        TestMimeAssociate();

     }
     }

-
-    TestMimeAssociate();
+    TestMimeFilename();

 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS


@@ -5973,8 +6050,11 @@ int main(int argc, char **argv)
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS
 #endif // TEST_SOCKETS
 
 #ifdef TEST_STREAMS

-    TestFileStream();
-    TestMemoryStream();
+    if ( TEST_ALL )
+    {
+        TestFileStream();
+    }
+        TestMemoryStream();

 #endif // TEST_STREAMS
 
 #ifdef TEST_THREADS
 #endif // TEST_STREAMS
 
 #ifdef TEST_THREADS