Listctrl updates

[wxWidgets.git] / src / gtk1 / threadno.cpp

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 9b1686c349befc96e8580dd8a1bbb4b1ef4612be..375d2ac6a71964732fbf8abb993ef5bf27b25125 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -13,32 +13,40 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/module.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {
-  m_locked = FALSE;
+  m_locked = 0;
 }
 
 wxMutex::~wxMutex()
 {
+  if (m_locked)
+    wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked);
 }
 
-MutexError wxMutex::Lock()
+wxMutexError wxMutex::Lock()
 {
-  m_locked = TRUE;
-  return NO_ERROR;
+  m_locked++;
+  return MUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::TryLock()
+wxMutexError wxMutex::TryLock()
 {
-  m_locked = TRUE;
-  return NO_ERROR;
+  if (m_locked > 0)
+    return MUTEX_BUSY;
+  m_locked++;
+  return MUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::Unlock()
+wxMutexError wxMutex::Unlock()
 {
-  m_locked = FALSE;
-  return NO_ERROR;
+  if (m_locked == 0)
+    return MUTEX_UNLOCKED;
+  m_locked--;
+  return MUTEX_NO_ERROR;
 }
 
 wxCondition::wxCondition()
@@ -67,24 +75,34 @@ void wxCondition::Broadcast()
 {
 }
 
-struct wxThreadPrivate {
+struct wxThreadInternal {
        int thread_id;
        void* exit_status;
 };
 
-ThreadError wxThread::Create()
+wxThreadError wxThread::Create()
 {
   p_internal->exit_status = Entry();
   OnExit();
-  return NO_ERROR;
+  return THREAD_NO_ERROR;
 }
 
-ThreadError wxThread::Destroy()
+wxThreadError wxThread::Destroy()
 {
-  return RUNNING;
+  return THREAD_NOT_RUNNING;
 }
 
-void wxThread::DeferDestroy()
+wxThreadError wxThread::Pause()
+{
+  return THREAD_NOT_RUNNING;
+}
+
+wxThreadError wxThread::Resume()
+{
+  return THREAD_NOT_RUNNING;
+}
+
+void wxThread::DeferDestroy( bool WXUNUSED(on) )
 {
 }
 
@@ -107,24 +125,29 @@ bool wxThread::IsMain()
   return TRUE;
 }
 
+bool wxThread::IsRunning() const
+{
+  return FALSE;
+}
+
 bool wxThread::IsAlive() const
 {
   return FALSE;
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
-int wxThread::GetPriority() const { }
+int wxThread::GetPriority() const { return 0; }
 
-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex *wxMainMutex; // controls access to all GUI functions
 
 wxThread::wxThread()
 {
-  p_internal = new wxThreadPrivate();
+  p_internal = new wxThreadInternal();
 }
 
 wxThread::~wxThread()
 {
-  Cancel();
+  Destroy();
   Join();
   delete p_internal;
 }
@@ -135,22 +158,25 @@ void wxThread::OnExit()
   Join();
 }
 
-// Global initialization
-static void wxThreadInit(void *WXUNUSED(client))
-{
-  wxMainMutex.Lock();
+
+// Automatic initialization
+class wxThreadModule : public wxModule {
+  DECLARE_DYNAMIC_CLASS(wxThreadModule)
+public:
+  bool OnInit();
+  void OnExit();
+};
+
+bool wxThreadModule::OnInit() {
+  wxMainMutex = new wxMutex();
+  wxMainMutex->Lock();
+  return TRUE;
 }
 
-// Global cleanup
-static void wxThreadExit(void *WXUNUSED(client))
+void wxThreadModule::OnExit()
 {
-  wxMainMutex.Unlock();
+  wxMainMutex->Unlock();
+  delete wxMainMutex;
 }
 
-// Let automatic initialization be performed from wxCommonInit().
-static struct
-wxThreadGlobal {
-  wxThreadGlobal() {
-      wxRegisterModuleFunction(wxThreadInit, wxThreadExit, NULL);
-  }
-} dummy;
+IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)