prefix symbols with wx_ to reduce risk of collision

[wxWidgets.git] / src / gtk / threadsgi.cpp

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index 3503e79616da18ce44d6ac9d691944ef9178a9e1..cc65251bb022e2169eb626927123408db67d46e2 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -8,10 +8,13 @@
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "thread.h"
 #endif
 
 #pragma implementation "thread.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>
 


@@ -21,8 +24,13 @@
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/utils.h"

+#include "wx/log.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"

 
 

-enum thread_state {
+enum thread_state 
+{

   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,
   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,


@@ -34,7 +42,7 @@ enum thread_state {
 /////////////////////////////////////////////////////////////////////////////
 
 static int p_mainid;
 /////////////////////////////////////////////////////////////////////////////
 
 static int p_mainid;

-wxMutex wxMainMutex;
+wxMutex *wxMainMutex;

 
 #include "threadgui.inc"
 
 
 #include "threadgui.inc"
 


@@ -57,8 +65,7 @@ wxMutex::wxMutex()
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)

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

   delete p_internal;
 }
 
   delete p_internal;
 }
 


@@ -66,24 +73,24 @@ wxMutexError wxMutex::Lock()
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)
 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)

-    return MUTEX_BUSY;
+    return wxMUTEX_BUSY;

   m_locked++;
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)

-    return MUTEX_UNLOCKED; 
+    return wxMUTEX_UNLOCKED; 

   release_lock(&(p_internal->p_mutex));
   m_locked--;
   release_lock(&(p_internal->p_mutex));
   m_locked--;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 // GL: Don't know how it works on SGI. Wolfram ?
 }
 
 // GL: Don't know how it works on SGI. Wolfram ?


@@ -132,13 +139,13 @@ void wxThread::Exit(void* status)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)

-    return THREAD_RUNNING;
+    return wxTHREAD_RUNNING;

   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;
   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;

-    return THREAD_NO_RESOURCE;
+    return wxTHREAD_NO_RESOURCE;

   }
   }

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Destroy()
 }
 
 wxThreadError wxThread::Destroy()


@@ -146,17 +153,17 @@ wxThreadError wxThread::Destroy()
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Pause()
 {
 }
 
 wxThreadError wxThread::Pause()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Resume()
 {
 }
 
 wxThreadError wxThread::Resume()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 void *wxThread::Join()
 }
 
 void *wxThread::Join()


@@ -166,10 +173,10 @@ void *wxThread::Join()
     int stat;
 
     if (do_unlock)
     int stat;
 
     if (do_unlock)

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

     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)
     waitpid(p_internal->thread_id, &stat, 0);
     if (do_unlock)

-      wxMainMutex.Lock();
+      wxMainMutex->Lock();

     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;
     if (!WIFEXITED(stat) && !WIFSIGNALED(stat))
       return 0;
     p_internal->state = STATE_IDLE;


@@ -234,19 +241,32 @@ void wxThread::OnExit()
 }
 
 // Global initialization
 }
 
 // Global initialization

-class wxThreadModule : public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxThreadModule)
+
+class wxThreadModule : public wxModule
+{

 public:
 public:

-  virtual bool OnInit() {
+    virtual bool OnInit();
+    virtual void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxThreadModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+
+bool wxThreadModule::OnInit() 
+{
+    wxMainMutex = new wxMutex();

     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxThreadGuiInit();
     p_mainid = (int)getpid();

-    wxMainMutex.Lock();
-  }
+    wxMainMutex->Lock();
+    return TRUE;
+}

 
 

-  virtual void OnExit() {
-    wxMainMutex.Unlock();
+void wxThreadModule::OnExit()
+{
+    wxMainMutex->Unlock();

     wxThreadGuiExit();
     wxThreadGuiExit();

-  }
-};
+    delete wxMainMutex;
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)