More compilation fixes for Solaris. :-<

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

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 126a211fcacb3b039b2daf085deea32541b04664..72994404561dc15534cf8ad07fd9fe1d8f0e882a 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        thread.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Modified by:
 // Created:     04/22/98
 // RCS-ID:      $Id$


@@ -13,6 +13,9 @@
 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

+#include "wx/module.h"
+#include "wx/thread.h"
+#include "wx/log.h"

 
 wxMutex::wxMutex()
 {
 
 wxMutex::wxMutex()
 {


@@ -22,29 +25,29 @@ wxMutex::wxMutex()
 wxMutex::~wxMutex()
 {
   if (m_locked)
 wxMutex::~wxMutex()
 {
   if (m_locked)

-    wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked);
+    wxLogDebug( "wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked );

 }
 
 }
 

-MutexError wxMutex::Lock()
+wxMutexError wxMutex::Lock()

 {
   m_locked++;
 {
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 }
 

-MutexError wxMutex::TryLock()
+wxMutexError wxMutex::TryLock()

 {
   if (m_locked > 0)
 {
   if (m_locked > 0)

-    return MUTEX_BUSY;
+    return wxMUTEX_BUSY;

   m_locked++;
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 }
 

-MutexError wxMutex::Unlock()
+wxMutexError wxMutex::Unlock()

 {
   if (m_locked == 0)
 {
   if (m_locked == 0)

-    return MUTEX_UNLOCKED;
+    return wxMUTEX_UNLOCKED;

   m_locked--;
   m_locked--;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxCondition::wxCondition()
 }
 
 wxCondition::wxCondition()


@@ -73,24 +76,34 @@ void wxCondition::Broadcast()
 {
 }
 
 {
 }
 

-struct wxThreadPrivate {
+struct wxThreadInternal {

        int thread_id;
        void* exit_status;
 };
 
        int thread_id;
        void* exit_status;
 };
 

-ThreadError wxThread::Create()
+wxThreadError wxThread::Create()

 {
   p_internal->exit_status = Entry();
   OnExit();
 {
   p_internal->exit_status = Entry();
   OnExit();

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 }
 

-ThreadError wxThread::Destroy()
+wxThreadError wxThread::Destroy()

 {
 {

-  return THREAD_RUNNING;
+  return wxTHREAD_NOT_RUNNING;

 }
 
 }
 

-void wxThread::DeferDestroy()
+wxThreadError wxThread::Pause()
+{
+  return wxTHREAD_NOT_RUNNING;
+}
+
+wxThreadError wxThread::Resume()
+{
+  return wxTHREAD_NOT_RUNNING;
+}
+
+void wxThread::DeferDestroy( bool WXUNUSED(on) )

 {
 }
 
 {
 }
 


@@ -113,24 +126,29 @@ bool wxThread::IsMain()
   return TRUE;
 }
 
   return TRUE;
 }
 

+bool wxThread::IsRunning() const
+{
+  return FALSE;
+}
+

 bool wxThread::IsAlive() const
 {
   return FALSE;
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
 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()
 {
 
 wxThread::wxThread()
 {

-  p_internal = new wxThreadPrivate();
+  p_internal = new wxThreadInternal();

 }
 
 wxThread::~wxThread()
 {
 }
 
 wxThread::~wxThread()
 {

-  Cancel();
+  Destroy();

   Join();
   delete p_internal;
 }
   Join();
   delete p_internal;
 }


@@ -142,22 +160,27 @@ void wxThread::OnExit()
 }
 
 
 }
 
 

-// Automatic initialization
-class wxThreadModule : public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxThreadModule)
-public:
-  bool OnInit();
-  void OnExit();
-};
+IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)

 
 

-bool wxThreadModule::OnInit() {
-  wxMainMutex.Lock();
+bool wxThreadModule::OnInit() 
+{
+  wxMainMutex = new wxMutex();
+  wxMainMutex->Lock();

   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxThreadModule::wxThreadExit()
+void wxThreadModule::OnExit()

 {
 {

-  wxMainMutex.Unlock();
+  wxMainMutex->Unlock();
+  delete wxMainMutex;

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+
+
+void wxMutexGuiEnter()
+{
+}
+
+void wxMutexGuiLeave()
+{
+}