simplify wxPizza a bit by always drawing the border on parent

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index f6d9939eb4cf84b33813a57504e47467bca54982..cc4d13a2e6f37cfb926c3196a5dcd31de2313910 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -191,7 +191,6 @@ private:
     HANDLE m_mutex;
     
     unsigned long m_owningThread;
-    bool m_isLocked;
     wxMutexType m_type;
 
     DECLARE_NO_COPY_CLASS(wxMutexInternal)
@@ -210,7 +209,6 @@ wxMutexInternal::wxMutexInternal(wxMutexType mutexType)
 
     m_type = mutexType;
     m_owningThread = 0;
-    m_isLocked = false;
 
     if ( !m_mutex )
     {
@@ -243,7 +241,7 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
     if (m_type == wxMUTEX_DEFAULT)
     {
         // Don't allow recursive
-        if (m_isLocked)
+        if (m_owningThread != 0)
         {
             if (m_owningThread == wxThread::GetCurrentId())
                 return wxMUTEX_DEAD_LOCK;
@@ -283,7 +281,6 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
     if (m_type == wxMUTEX_DEFAULT)
     { 
         // required for checking recursiveness
-        m_isLocked = true;
         m_owningThread = wxThread::GetCurrentId();
     }
     
@@ -292,15 +289,15 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 
 wxMutexError wxMutexInternal::Unlock()
 {
+    // required for checking recursiveness
+    m_owningThread = 0;
+
     if ( !::ReleaseMutex(m_mutex) )
     {
         wxLogLastError(_T("ReleaseMutex()"));
 
         return wxMUTEX_MISC_ERROR;
     }
-    
-    // required for checking recursiveness
-    m_isLocked = false;
 
     return wxMUTEX_NO_ERROR;
 }