Fix setting tooltips for wxSearchCtrl and other composite controls.

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

diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index cb3f8aef599b06dc3fcd3337884c5f44aab54290..1e5c3ee9fb7317a41ee866d709d6ffc7c1c74c62 100644 (file)
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -479,7 +479,7 @@ MyFrame::DoLogRecord(wxLogLevel level,
         wxDateTime(info.timestamp).FormatISOTime(),
         info.threadId == wxThread::GetMainId()
             ? wxString("main")
         wxDateTime(info.timestamp).FormatISOTime(),
         info.threadId == wxThread::GetMainId()
             ? wxString("main")

-            : wxString::Format("%x", info.threadId),
+            : wxString::Format("%lx", info.threadId),

         msg + "\n"
     );
 }
         msg + "\n"
     );
 }


@@ -969,7 +969,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
     if ( TestDestroy() )
         return NULL;
 
     if ( TestDestroy() )
         return NULL;
 

-    wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+    wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );

 
     event.SetInt( 50 );
     wxQueueEvent( m_frame, event.Clone() );
 
     event.SetInt( 50 );
     wxQueueEvent( m_frame, event.Clone() );


@@ -984,7 +984,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
             break;
 
         // create any type of command event here
             break;
 
         // create any type of command event here

-        wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+        wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );

         event.SetInt( m_count );
 
         // send in a thread-safe way
         event.SetInt( m_count );
 
         // send in a thread-safe way


@@ -993,7 +993,7 @@ wxThread::ExitCode MyWorkerThread::Entry()
         wxMilliSleep(200);
     }
 
         wxMilliSleep(200);
     }
 

-    wxThreadEvent event( wxEVT_COMMAND_THREAD, WORKER_EVENT );
+    wxThreadEvent event( wxEVT_THREAD, WORKER_EVENT );

     event.SetInt(-1); // that's all
     wxQueueEvent( m_frame, event.Clone() );
 #endif
     event.SetInt(-1); // that's all
     wxQueueEvent( m_frame, event.Clone() );
 #endif


@@ -1043,7 +1043,7 @@ wxThread::ExitCode MyGUIThread::Entry()
         wxMutexGuiLeave();
 
         // notify the dialog that another piece of our masterpiece is complete:
         wxMutexGuiLeave();
 
         // notify the dialog that another piece of our masterpiece is complete:

-        wxThreadEvent event( wxEVT_COMMAND_THREAD, GUITHREAD_EVENT );
+        wxThreadEvent event( wxEVT_THREAD, GUITHREAD_EVENT );

         event.SetInt(i+1);
         wxQueueEvent( m_dlg, event.Clone() );
 
         event.SetInt(i+1);
         wxQueueEvent( m_dlg, event.Clone() );