Added defines to allow altered tab placement under gcc-2.95

[wxWidgets.git] / include / wx / thread.h

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 3a850853faed729e12bc371e42d33af3f4834371..fc734e687826386ff0e8c24e8acf56bbfe2511d5 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -13,10 +13,6 @@
 #ifndef __THREADH__
 #define __THREADH__
 
 #ifndef __THREADH__
 #define __THREADH__
 

-#ifdef __GNUG__
-    #pragma interface "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -25,6 +21,10 @@
 #include "wx/setup.h"
 
 #if wxUSE_THREADS
 #include "wx/setup.h"
 
 #if wxUSE_THREADS

+/* otherwise we get undefined references for non-thread case (KB)*/
+#ifdef __GNUG__
+    #pragma interface "thread.h"
+#endif

 
 // Windows headers define it
 #ifdef Yield
 
 // Windows headers define it
 #ifdef Yield


@@ -134,7 +134,7 @@ private:
 
 // in order to avoid any overhead under !MSW make all wxCriticalSection class
 // functions inline - but this can't be done under MSW
 
 // in order to avoid any overhead under !MSW make all wxCriticalSection class
 // functions inline - but this can't be done under MSW

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)

     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
 #else // !MSW
     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
 #else // !MSW


@@ -151,16 +151,16 @@ public:
     WXCRITICAL_INLINE ~wxCriticalSection();
 
     // enter the section (the same as locking a mutex)
     WXCRITICAL_INLINE ~wxCriticalSection();
 
     // enter the section (the same as locking a mutex)

-    void WXCRITICAL_INLINE Enter();
+    WXCRITICAL_INLINE void Enter();

     // leave the critical section (same as unlocking a mutex)
     // leave the critical section (same as unlocking a mutex)

-    void WXCRITICAL_INLINE Leave();
+    WXCRITICAL_INLINE void Leave();

 
 private:
     // no assignment operator nor copy ctor
     wxCriticalSection(const wxCriticalSection&);
     wxCriticalSection& operator=(const wxCriticalSection&);
 
 
 private:
     // no assignment operator nor copy ctor
     wxCriticalSection(const wxCriticalSection&);
     wxCriticalSection& operator=(const wxCriticalSection&);
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)

     wxCriticalSectionInternal *m_critsect;
 #else // !MSW
     wxMutex m_mutex;
     wxCriticalSectionInternal *m_critsect;
 #else // !MSW
     wxMutex m_mutex;


@@ -301,7 +301,7 @@ public:
         // Returns true if the thread is running (not paused, not killed).
     bool IsRunning() const;
         // Returns true if the thread is suspended
         // Returns true if the thread is running (not paused, not killed).
     bool IsRunning() const;
         // Returns true if the thread is suspended

-    bool IsPaused() const { return IsAlive() && !IsRunning(); }
+    bool IsPaused() const;

 
     // called when the thread exits - in the context of this thread
     //
 
     // called when the thread exits - in the context of this thread
     //


@@ -352,6 +352,8 @@ void WXDLLEXPORT wxMutexGuiLeave();
 
 #else // !wxUSE_THREADS
 
 
 #else // !wxUSE_THREADS
 

+#include "wx/defs.h" // for WXDLLEXPORT
+

 // no thread support
 inline void WXDLLEXPORT wxMutexGuiEnter() { }
 inline void WXDLLEXPORT wxMutexGuiLeave() { }
 // no thread support
 inline void WXDLLEXPORT wxMutexGuiEnter() { }
 inline void WXDLLEXPORT wxMutexGuiLeave() { }


@@ -369,8 +371,8 @@ public:
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------

-#ifdef wxUSE_THREADS
-#ifdef __WXMSW__
+#if wxUSE_THREADS
+#if defined(__WXMSW__) || defined(__WXPM__)

     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread