X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68401dfe2c39c7251174cb1bc4509ac66b9644be..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/thread.h diff --git a/include/wx/thread.h b/include/wx/thread.h index 491bf986de..7e0dc5997f 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -13,10 +13,6 @@ #ifndef __THREADH__ #define __THREADH__ -#ifdef __GNUG__ - #pragma interface "thread.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -25,6 +21,10 @@ #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 @@ -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 -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) class WXDLLEXPORT wxCriticalSectionInternal; #define WXCRITICAL_INLINE #else // !MSW @@ -160,7 +160,7 @@ private: wxCriticalSection(const wxCriticalSection&); wxCriticalSection& operator=(const wxCriticalSection&); -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) 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 - bool IsPaused() const { return IsAlive() && !IsRunning(); } + bool IsPaused() const; // called when the thread exits - in the context of this thread // @@ -352,6 +352,8 @@ void WXDLLEXPORT wxMutexGuiLeave(); #else // !wxUSE_THREADS +#include // for WXDLLEXPORT + // no thread support inline void WXDLLEXPORT wxMutexGuiEnter() { } inline void WXDLLEXPORT wxMutexGuiLeave() { } @@ -370,7 +372,7 @@ public: // implementation only until the end of file // ----------------------------------------------------------------------------- #if wxUSE_THREADS -#ifdef __WXMSW__ +#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