X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87b6002d7c48dea4ebd53bbf60996d1a87a0a5c6..9ead8387d02667092186a7dd2671bacbd010406a:/include/wx/thread.h diff --git a/include/wx/thread.h b/include/wx/thread.h index 6c92c2c425..86b94bd467 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -22,11 +22,6 @@ #if wxUSE_THREADS -// only for wxUSE_THREADS - otherwise we'd get undefined symbols -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "thread.h" -#endif - // Windows headers define it #ifdef Yield #undef Yield @@ -321,7 +316,7 @@ public: bool IsOk() const; // NB: the associated mutex MUST be locked beforehand by the calling thread - // + // // it atomically releases the lock on the associated mutex // and starts waiting to be woken up by a Signal()/Broadcast() // once its signaled, then it will wait until it can reacquire @@ -332,7 +327,7 @@ public: // timeout ellapses even if the condition hasn't been signalled: in this // case, the return value is false, otherwise (i.e. in case of a normal // return) it is true - // + // // the timeeout parameter specifies a interval that needs to be waited in // milliseconds wxCondError WaitTimeout(unsigned long milliseconds); @@ -738,7 +733,7 @@ public: #if wxUSE_THREADS -#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) || defined(__EMX__) +#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__OS2__) || defined(__EMX__) // 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 @@ -747,10 +742,8 @@ public: // returns true if the main thread has GUI lock extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread(); -#ifndef __WXPM__ // wakes up the main thread if it's sleeping inside ::GetMessage() extern void WXDLLIMPEXP_BASE wxWakeUpMainThread(); -#endif // !OS/2 // return true if the main thread is waiting for some other to terminate: // wxApp then should block all "dangerous" messages @@ -760,4 +753,3 @@ public: #endif // wxUSE_THREADS #endif // _WX_THREAD_H_ -