fix building with WXWIN_COMPATIBILITY_2_8 == 0

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

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index e813c70ee6b795929bc4853ef1d2ff09085e0cde..830c0eb1d21fa8667f2f1dc1ec5fa70df2f0daae 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        threadsgi.cpp
+// Name:        src/gtk1/threadsgi.cpp
 // Purpose:     wxThread (SGI) Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by:
 // Created:     04/22/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,20 +12,24 @@
 #include "wx/wxprec.h"
 
 #include "wx/thread.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.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,
@@ -62,7 +65,9 @@ wxMutex::wxMutex()
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)
+  {
     wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
+  }
   delete p_internal;
 }
 
@@ -84,7 +89,7 @@ wxMutexError wxMutex::TryLock()
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
-    return wxMUTEX_UNLOCKED; 
+    return wxMUTEX_UNLOCKED;
   release_lock(&(p_internal->p_mutex));
   m_locked--;
   return wxMUTEX_NO_ERROR;
@@ -120,7 +125,7 @@ void wxThreadPrivate::SprocStart(void *ptr)
 
   thr->p_internal->thread_id = getpid();
   thr->p_internal->exit_status = 0;
-  status = thr->Entry();
+  status = thr->CallEntry();
   thr->Exit(status);
 }
 
@@ -251,13 +256,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
-bool wxThreadModule::OnInit() 
+bool wxThreadModule::OnInit()
 {
     wxMainMutex = new wxMutex();
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();
-    return TRUE;
+    return true;
 }
 
 void wxThreadModule::OnExit()
@@ -266,4 +271,3 @@ void wxThreadModule::OnExit()
     wxThreadGuiExit();
     delete wxMainMutex;
 }
-