rebaked after timer/socket changes

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

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index 57596edb67be78db9e21155b057c42771663fabc..f8d7d177e0ffb1171be2930c24876246a048cfa0 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -1,35 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        threadsgi.cpp
+// Name:        src/gtk/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)
 // 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:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "thread.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 
 // For compilers that support precompilation, includes "wx.h".
 #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 <stdio.h>
 #include <unistd.h>
 
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.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"
 
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

-enum thread_state 
+enum thread_state

 {
   STATE_IDLE = 0,
   STATE_RUNNING,
 {
   STATE_IDLE = 0,
   STATE_RUNNING,


@@ -87,7 +88,7 @@ wxMutexError wxMutex::TryLock()
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
 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;
   release_lock(&(p_internal->p_mutex));
   m_locked--;
   return wxMUTEX_NO_ERROR;


@@ -254,13 +255,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 

-bool wxThreadModule::OnInit() 
+bool wxThreadModule::OnInit()

 {
     wxMainMutex = new wxMutex();
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();
 {
     wxMainMutex = new wxMutex();
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();

-    return TRUE;
+    return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()


@@ -269,4 +270,3 @@ void wxThreadModule::OnExit()
     wxThreadGuiExit();
     delete wxMainMutex;
 }
     wxThreadGuiExit();
     delete wxMainMutex;
 }

-