X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c351dad14431c3e1aeeef6b86f61ba898d1d9ad..53e46b61bbe4ce72b92c8898907f0a879d5f012b:/src/gtk/threadno.cpp

diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp
index 06acae0260..4ac3f05954 100644
--- a/src/gtk/threadno.cpp
+++ b/src/gtk/threadno.cpp
@@ -1,51 +1,61 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        thread.cpp
-// Purpose:     No thread support
-// Author:      Original from Wolfram Gloger/Guilhem Lavaux
+// Purpose:     Solaris thread support
+// Author:      Guilhem Lavaux
 // Modified by:
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
+
 #ifdef __GNUG__
-#pragma implementation "thread.h"
+    #pragma implementation "thread.h"
 #endif
 
 #include "wx/wx.h"
+#include "wx/module.h"
+#include "wx/thread.h"
+#include "wx/log.h"
 
-wxMutex::wxMutex(void)
+wxMutex::wxMutex()
 {
-  m_locked = FALSE;
+    m_locked = 0;
 }
 
-wxMutex::~wxMutex(void)
+wxMutex::~wxMutex()
 {
+    if (m_locked)
+        wxLogDebug( "wxMutex warning: destroying a locked mutex (%d locks)", m_locked );
 }
 
-MutexError wxMutex::Lock(void)
+wxMutexError wxMutex::Lock()
 {
-  m_locked = TRUE;
-  return NO_ERROR;
+    m_locked++;
+    return wxMUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::TryLock(void)
+wxMutexError wxMutex::TryLock()
 {
-  m_locked = TRUE;
-  return NO_ERROR;
+    if (m_locked > 0)
+        return wxMUTEX_BUSY;
+    m_locked++;
+    return wxMUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::Unlock(void)
+wxMutexError wxMutex::Unlock()
 {
-  m_locked = FALSE;
-  return NO_ERROR;
+    if (m_locked == 0)
+        return wxMUTEX_UNLOCKED;
+    m_locked--;
+    return wxMUTEX_NO_ERROR;
 }
 
-wxCondition::wxCondition(void)
+wxCondition::wxCondition()
 {
 }
 
-wxCondition::~wxCondition(void)
+wxCondition::~wxCondition()
 {
 }
 
@@ -54,103 +64,124 @@ void wxCondition::Wait(wxMutex& WXUNUSED(mutex))
 }
 
 bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
-                      unsigned long WXUNUSED(nsec))
+        unsigned long WXUNUSED(nsec))
 {
-  return FALSE;
+    return FALSE;
 }
 
-void wxCondition::Signal(void)
+void wxCondition::Signal()
 {
 }
 
-void wxCondition::Broadcast(void)
+void wxCondition::Broadcast()
 {
 }
 
-struct wxThreadPrivate {
-	int thread_id;
-	void* exit_status;
+struct wxThreadInternal
+{
+    int thread_id;
+    void* exit_status;
 };
 
-ThreadError wxThread::Create(void)
+wxThreadError wxThread::Create()
+{
+    p_internal->exit_status = Entry();
+    OnExit();
+    return wxTHREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Destroy()
 {
-  p_internal->exit_status = Entry();
-  OnExit();
-  return NO_ERROR;
+    return wxTHREAD_NOT_RUNNING;
 }
 
-ThreadError wxThread::Destroy(void)
+wxThreadError wxThread::Pause()
 {
-  return RUNNING;
+    return wxTHREAD_NOT_RUNNING;
 }
 
-void wxThread::DifferDestroy(void)
+wxThreadError wxThread::Resume()
 {
+    return wxTHREAD_NOT_RUNNING;
 }
 
-void wxThread::TestDestroy(void)
+void wxThread::DeferDestroy( bool WXUNUSED(on) )
+{
+}
+
+void wxThread::TestDestroy()
 {
 }
 
 void *wxThread::Join()
 {
-  return p_internal->exit_status;
+    return p_internal->exit_status;
 }
 
-unsigned long wxThread::GetID()
+unsigned long wxThread::GetID() const
 {
-  return 0;
+    return 0;
 }
 
-bool wxThread::IsMain(void)
+bool wxThread::IsMain()
 {
-  return TRUE;
+    return TRUE;
 }
 
-bool wxThread::IsAlive(void)
+bool wxThread::IsRunning() const
 {
-  return FALSE;
+    return FALSE;
+}
+
+bool wxThread::IsAlive() const
+{
+    return FALSE;
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
-int wxThread::GetPriority(void) { }
+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();
-  Join();
-  delete p_internal;
+    Destroy();
+    Join();
+    delete p_internal;
 }
 
 // The default callback just joins the thread and throws away the result.
 void wxThread::OnExit()
 {
-  Join();
+    Join();
 }
 
-// Global initialization
-static void wxThreadInit(void *WXUNUSED(client))
+IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+
+bool wxThreadModule::OnInit()
 {
-  wxMainMutex.Lock();
+    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;
+
+
+void wxMutexGuiEnter()
+{
+}
+
+void wxMutexGuiLeave()
+{
+}