Various fixes for various compilers...

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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 1acb78279f807e0831867e9dc90826eae2baad16..39bc1dd2d49f219fe78dcc637f1eb44f1549b304 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,10 +134,12 @@ 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__)

     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE

-#else // !MSW
+#elif defined(__WXPM__)
+    #define WXCRITICAL_INLINE
+#else // !MSW && !PM

     #define WXCRITICAL_INLINE   inline
 #endif // MSW/!MSW
 
     #define WXCRITICAL_INLINE   inline
 #endif // MSW/!MSW
 


@@ -151,16 +153,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__)

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


@@ -301,7 +303,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
     //


@@ -350,12 +352,26 @@ private:
 void WXDLLEXPORT wxMutexGuiEnter();
 void WXDLLEXPORT wxMutexGuiLeave();
 
 void WXDLLEXPORT wxMutexGuiEnter();
 void WXDLLEXPORT wxMutexGuiLeave();
 

+// macros for entering/leaving critical sections which may be used without
+// having to take them inside "#if wxUSE_THREADS"
+#define wxENTER_CRIT_SECT(cs)   (cs)->Enter()
+#define wxLEAVE_CRIT_SECT(cs)   (cs)->Leave()
+#define wxCRIT_SECT_LOCKER(name, cs)  wxCriticalSectionLocker name(*cs)
+

 #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() { }
 

+// macros for entering/leaving critical sections which may be used without
+// having to take them inside "#if wxUSE_THREADS"
+#define wxENTER_CRIT_SECT(cs)
+#define wxLEAVE_CRIT_SECT(cs)
+#define wxCRIT_SECT_LOCKER(name, cs)
+

 #endif // wxUSE_THREADS
 
 // automatically unlock GUI mutex in dtor
 #endif // wxUSE_THREADS
 
 // automatically unlock GUI mutex in dtor


@@ -370,7 +386,7 @@ public:
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 #if wxUSE_THREADS
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 #if wxUSE_THREADS

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     // 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


@@ -385,7 +401,18 @@ public:
     // return TRUE if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLEXPORT wxIsWaitingForThread();
     // return TRUE if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLEXPORT wxIsWaitingForThread();

-#else // !MSW
+#elif 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
+    extern void WXDLLEXPORT wxMutexGuiLeaveOrEnter();
+
+    // returns TRUE if the main thread has GUI lock
+    extern bool WXDLLEXPORT wxGuiOwnedByMainThread();
+
+    inline wxCriticalSection::wxCriticalSection() { }
+    inline wxCriticalSection::~wxCriticalSection() { }
+#else // !MSW && !PM

     // implement wxCriticalSection using mutexes
     inline wxCriticalSection::wxCriticalSection() { }
     inline wxCriticalSection::~wxCriticalSection() { }
     // implement wxCriticalSection using mutexes
     inline wxCriticalSection::wxCriticalSection() { }
     inline wxCriticalSection::~wxCriticalSection() { }