X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2dd8380badebac8dc01f8948288235ae91056ed..77611ad4da9df336a0805508276a81b8f4437107:/src/stubs/thread.cpp

diff --git a/src/stubs/thread.cpp b/src/stubs/thread.cpp
index c197787003..34ad1a4f14 100644
--- a/src/stubs/thread.cpp
+++ b/src/stubs/thread.cpp
@@ -17,6 +17,8 @@
 #include "wx/thread.h"
 #include "wx/utils.h"
 
+#if wxUSE_THREADS
+
 enum thread_state {
   STATE_IDLE = 0,
   STATE_RUNNING,
@@ -28,7 +30,7 @@ enum thread_state {
 // Static variables
 /////////////////////////////////////////////////////////////////////////////
 
-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex *wxMainMutex; // controls access to all GUI functions
 
 /////////////////////////////////////////////////////////////////////////////
 // Windows implementation
@@ -57,14 +59,14 @@ wxMutexError wxMutex::Lock()
 {
     // TODO
     m_locked++;
-    return MUTEX_NO_ERROR;
+    return wxMUTEX_NO_ERROR;
 }
 
 wxMutexError wxMutex::TryLock()
 {
     // TODO
     m_locked++;
-    return MUTEX_NO_ERROR;
+    return wxMUTEX_NO_ERROR;
 }
 
 wxMutexError wxMutex::Unlock()
@@ -73,7 +75,7 @@ wxMutexError wxMutex::Unlock()
         m_locked--;
 
     // TODO
-    return MUTEX_NO_ERROR;
+    return wxMUTEX_NO_ERROR;
 }
 
 class wxConditionInternal {
@@ -134,25 +136,25 @@ public:
 wxThreadError wxThread::Create()
 {
     // TODO
-    return THREAD_NO_ERROR;
+    return wxTHREAD_NO_ERROR;
 }
 
 wxThreadError wxThread::Destroy()
 {
     // TODO
-    return THREAD_NO_ERROR;
+    return wxTHREAD_NO_ERROR;
 }
 
 wxThreadError wxThread::Pause()
 {
     // TODO
-    return THREAD_NO_ERROR;
+    return wxTHREAD_NO_ERROR;
 }
 
 wxThreadError wxThread::Resume()
 {
     // TODO
-    return THREAD_NO_ERROR;
+    return wxTHREAD_NO_ERROR;
 }
 
 void wxThread::Exit(void *status)
@@ -193,11 +195,13 @@ unsigned long wxThread::GetID() const
     return 0;
 }
 
+/*
 wxThread *wxThread::GetThreadFromID(unsigned long id)
 {
     // TODO
     return NULL;
 }
+*/
 
 bool wxThread::IsAlive() const
 {
@@ -243,15 +247,19 @@ class wxThreadModule : public wxModule {
 public:
   virtual bool OnInit() {
     /* TODO p_mainid = GetCurrentThread(); */
-    wxMainMutex.Lock();
+    wxMainMutex = new wxMutex();
+    wxMainMutex->Lock();
     return TRUE;
   }
 
   // Global cleanup
   virtual void OnExit() {
-    wxMainMutex.Unlock();
+    wxMainMutex->Unlock();
+    delete wxMainMutex;
   }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
+#endif
+  // wxUSE_THREADS