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 f312f1c51ddf67c6801260f7c8085dfdb565994f..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_FILENAME
+    #define TEST_STREAMS

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


@@ -308,13 +308,13 @@ static void TestDirEnum()
     puts("*** Testing wxDir::GetFirst/GetNext ***");
 
     wxString cwd = wxGetCwd();
     puts("*** Testing wxDir::GetFirst/GetNext ***");
 
     wxString cwd = wxGetCwd();

-    if ( wxDir::Exists(cwd) )
+    if ( !wxDir::Exists(cwd) )

     {
         printf("ERROR: current directory '%s' doesn't exist?\n", cwd.c_str());
         return;
     }
 
     {
         printf("ERROR: current directory '%s' doesn't exist?\n", cwd.c_str());
         return;
     }
 

-    wxDir dir(cwd);
+    wxDir dir("s:/tmp/foo");

     if ( !dir.IsOpened() )
     {
         printf("ERROR: failed to open current directory '%s'.\n", cwd.c_str());
     if ( !dir.IsOpened() )
     {
         printf("ERROR: failed to open current directory '%s'.\n", cwd.c_str());


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


@@ -3071,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());


@@ -5084,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();
 


@@ -5836,12 +5851,12 @@ int main(int argc, char **argv)
 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR
 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR

-    TestDirExists();

     if ( TEST_ALL )
     {
     if ( TEST_ALL )
     {

-        TestDirEnum();
+        TestDirExists();

         TestDirTraverse();
     }
         TestDirTraverse();
     }

+    TestDirEnum();

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


@@ -5982,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


@@ -6036,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