X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7da60d7c18d4b7a9ed586208cc6174b87b55db91..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/include/wx/thread.h diff --git a/include/wx/thread.h b/include/wx/thread.h index 07f886e973..86b94bd467 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -22,20 +22,11 @@ #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 #endif -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" -#endif - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -247,7 +238,8 @@ private: // include windows.h from this public header and we also have to use the // union to force the correct (i.e. maximal) alignment // - // if CRITICAL_SECTION size changes in Windows, you'll get an assert below + // if CRITICAL_SECTION size changes in Windows, you'll get an assert from + // thread.cpp and will need to increase the buffer size // // finally, we need this typedef instead of declaring m_buffer directly // because otherwise the assert mentioned above wouldn't compile with some @@ -257,10 +249,6 @@ private: #else // __WIN32__ typedef char wxCritSectBuffer[24]; #endif - -wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer), - wxCriticalSectionBufferTooSmall ); - union { unsigned long m_dummy1; @@ -745,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 @@ -754,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 @@ -767,4 +753,3 @@ public: #endif // wxUSE_THREADS #endif // _WX_THREAD_H_ -