generate #line references to source .xrc files in wxrc --gettext (patch #1803492...

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 696467232b9b4721ae3fd09ab230e8c808fd8ec4..04c23b8225642435c2fd3d52aeee004b7bbcb981 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -27,6 +27,7 @@
 #include "wx/log.h"
 #include "wx/apptrait.h"
 #include "wx/platinfo.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!


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

-    #define TEST_TIMER
+    #define TEST_MIME

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


@@ -1382,7 +1383,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
 


@@ -2958,6 +2959,7 @@ void TestTimer()
         virtual void Notify()
         {
             wxPrintf(_T("%d"), m_num++);
         virtual void Notify()
         {
             wxPrintf(_T("%d"), m_num++);

+            fflush(stdout);

 
             if ( m_num == 10 )
             {
 
             if ( m_num == 10 )
             {


@@ -2977,6 +2979,11 @@ void TestTimer()
 
     wxEventLoop loop;
 
 
     wxEventLoop loop;
 

+    wxTimer timer1;
+    timer1.Start(100, true /* one shot */);
+    timer1.Stop();
+    timer1.Start(100, true /* one shot */);
+

     MyTimer timer;
     timer.Start(500);
 
     MyTimer timer;
     timer.Start(500);
 


@@ -4406,12 +4413,10 @@ 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();
-    #endif
-        TestMimeOverride();
-        TestMimeAssociate();
+    //wxLog::AddTraceMask(_T("mime"));
+    TestMimeEnum();
+    TestMimeOverride();
+    // TestMimeAssociate();

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