file used to generate setup.h.in

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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index cb3f0192361cb9f925196c4746a0694974368a8b..b0bbc261f714c080681bc255d6a75368c2456ad7 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


@@ -151,9 +151,9 @@ 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
 
 private:
     // no assignment operator nor copy ctor


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


@@ -312,7 +312,7 @@ protected:
     // Returns TRUE if the thread was asked to terminate: this function should
     // be called by the thread from time to time, otherwise the main thread
     // will be left forever in Delete()!
     // Returns TRUE if the thread was asked to terminate: this function should
     // be called by the thread from time to time, otherwise the main thread
     // will be left forever in Delete()!

-    bool TestDestroy() const;
+    bool TestDestroy();

 
     // exits from the current thread - can be called only from this thread
     void Exit(void *exitcode = 0);
 
     // exits from the current thread - can be called only from this thread
     void Exit(void *exitcode = 0);


@@ -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,7 +371,7 @@ public:
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------

-#ifdef wxUSE_THREADS
+#if wxUSE_THREADS

 #ifdef __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
 #ifdef __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