Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/thread.cpp b/src/palmos/thread.cpp
index 6883854f73f14e641952bdaa9b7ba3bb12635ed3..febc8f1a676c238bb336e1ba7a4c325e8280d57e 100644 (file)
--- a/src/palmos/thread.cpp
+++ b/src/palmos/thread.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/thread.cpp
 // Purpose:     wxThread Implementation
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/thread.cpp
 // Purpose:     wxThread Implementation

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -24,21 +20,21 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_THREADS
+
+#include "wx/thread.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/app.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#if wxUSE_THREADS
-

 #include "wx/apptrait.h"
 
 #include "wx/palmos/private.h"
 #include "wx/palmos/missing.h"
 
 #include "wx/apptrait.h"
 
 #include "wx/palmos/private.h"
 #include "wx/palmos/missing.h"
 

-#include "wx/module.h"
-#include "wx/thread.h"
-

 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT


@@ -175,7 +171,7 @@ private:
 
     HANDLE m_mutex;
 
 
     HANDLE m_mutex;
 

-    DECLARE_NO_COPY_CLASS(wxMutexInternal)
+    wxDECLARE_NO_COPY_CLASS(wxMutexInternal);

 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType


@@ -228,7 +224,7 @@ public:
 private:
     HANDLE m_semaphore;
 
 private:
     HANDLE m_semaphore;
 

-    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)
+    wxDECLARE_NO_COPY_CLASS(wxSemaphoreInternal);

 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)


@@ -343,7 +339,7 @@ private:
     // reaches 0 we kill the owning wxThread -- and die ourselves with it
     LONG m_nRef;
 
     // reaches 0 we kill the owning wxThread -- and die ourselves with it
     LONG m_nRef;
 

-    DECLARE_NO_COPY_CLASS(wxThreadInternal)
+    wxDECLARE_NO_COPY_CLASS(wxThreadInternal);

 };
 
 // small class which keeps a thread alive during its lifetime
 };
 
 // small class which keeps a thread alive during its lifetime


@@ -416,10 +412,6 @@ void wxThread::Yield()
 {
 }
 
 {
 }
 

-void wxThread::Sleep(unsigned long milliseconds)
-{
-}
-

 int wxThread::GetCPUCount()
 {
     return 1;
 int wxThread::GetCPUCount()
 {
     return 1;


@@ -475,12 +467,12 @@ wxThreadError wxThread::Resume()
 // stopping thread
 // ---------------
 
 // stopping thread
 // ---------------
 

-wxThread::ExitCode wxThread::Wait()
+wxThread::ExitCode wxThread::Wait(wxThreadWait WXUNUSED(waitMode))

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxThreadError wxThread::Delete(ExitCode *pRc)
+wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode))

 {
     return wxTHREAD_NO_ERROR;
 }
 {
     return wxTHREAD_NO_ERROR;
 }


@@ -561,11 +553,11 @@ void wxThreadModule::OnExit()
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 

-void WXDLLIMPEXP_BASE wxMutexGuiEnter()
+void wxMutexGuiEnterImpl()

 {
 }
 
 {
 }
 

-void WXDLLIMPEXP_BASE wxMutexGuiLeave()
+void wxMutexGuiLeaveImpl()

 {
 }
 
 {
 }
 


@@ -595,4 +587,3 @@ bool WXDLLIMPEXP_BASE wxIsWaitingForThread()
 #include "wx/thrimpl.cpp"
 
 #endif // wxUSE_THREADS
 #include "wx/thrimpl.cpp"
 
 #endif // wxUSE_THREADS

-