Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / thread.cpp

diff --git a/src/palmos/thread.cpp b/src/palmos/thread.cpp
index 765a778535dc5f7c9d63546bf214e7d7bf55cecf..febc8f1a676c238bb336e1ba7a4c325e8280d57e 100644 (file)
--- a/src/palmos/thread.cpp
+++ b/src/palmos/thread.cpp
@@ -467,12 +467,12 @@ wxThreadError wxThread::Resume()
 // stopping thread
 // ---------------
 
-wxThread::ExitCode wxThread::Wait()
+wxThread::ExitCode wxThread::Wait(wxThreadWait WXUNUSED(waitMode))
 {
     return 0;
 }
 
-wxThreadError wxThread::Delete(ExitCode *pRc)
+wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode))
 {
     return wxTHREAD_NO_ERROR;
 }