X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf1852e121aab16762192f1fa08843c87d6f55ac..da61ab3189f71a2b0913bac13c48755c5d038037:/include/wx/thread.h?ds=sidebyside diff --git a/include/wx/thread.h b/include/wx/thread.h index d37d81a733..1acb78279f 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -105,14 +105,16 @@ class WXDLLEXPORT wxMutexLocker { public: // lock the mutex in the ctor - wxMutexLocker(wxMutex *mutex) - { m_isOk = mutex && ((m_mutex = mutex)->Lock() == wxMUTEX_NO_ERROR); } + wxMutexLocker(wxMutex& mutex) : m_mutex(mutex) + { m_isOk = m_mutex.Lock() == wxMUTEX_NO_ERROR; } // returns TRUE if mutex was successfully locked in ctor - bool IsOk() const { return m_isOk; } + bool IsOk() const + { return m_isOk; } // unlock the mutex in dtor - ~wxMutexLocker() { if ( IsOk() ) m_mutex->Unlock(); } + ~wxMutexLocker() + { if ( IsOk() ) m_mutex.Unlock(); } private: // no assignment operator nor copy ctor @@ -120,7 +122,7 @@ private: wxMutexLocker& operator=(const wxMutexLocker&); bool m_isOk; - wxMutex *m_mutex; + wxMutex& m_mutex; }; // ---------------------------------------------------------------------------- @@ -310,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()! - bool TestDestroy() const; + bool TestDestroy(); // exits from the current thread - can be called only from this thread void Exit(void *exitcode = 0); @@ -367,7 +369,7 @@ public: // ----------------------------------------------------------------------------- // 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