added wxTB_HORZ_TEXT (patch 713813); documented it; moved toolbar styles to toolbar.h

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index ec70911da4b7417af88215ff9c3a05923646b1c2..576f756780d69566bcec83e6f326cdb16c376c1c 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        thread.cpp
+// Name:        src/msw/thread.cpp

 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: Vadim Zeitlin to make it work :-)
 // Created:     04/22/98
 // RCS-ID:      $Id$
 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: Vadim Zeitlin to make it work :-)
 // Created:     04/22/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
-//                  Vadim Zeitlin (1999)
+// Copyright:   (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
+//                  Vadim Zeitlin (1999-2002)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -26,20 +26,20 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#    include "wx/wx.h"
+    #include "wx/intl.h"
+    #include "wx/app.h"

 #endif
 
 #if wxUSE_THREADS
 
 #endif
 
 #if wxUSE_THREADS
 

+#include "wx/apptrait.h"
+

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h"

 
 #include "wx/module.h"
 #include "wx/thread.h"
 
 
 #include "wx/module.h"
 #include "wx/thread.h"
 

-#ifdef Yield
-#    undef Yield
-#endif
-

 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT


@@ -62,7 +62,7 @@
 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
     (defined(__GNUG__) && defined(__MSVCRT__)) || \
 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
     (defined(__GNUG__) && defined(__MSVCRT__)) || \

-    defined(__WATCOMC__)
+    defined(__WATCOMC__) || defined(__MWERKS__)

 
     #undef wxUSE_BEGIN_THREAD
     #define wxUSE_BEGIN_THREAD
 
     #undef wxUSE_BEGIN_THREAD
     #define wxUSE_BEGIN_THREAD


@@ -127,128 +127,170 @@ static size_t gs_nWaitingForGui = 0;
 static bool gs_waitingForThread = FALSE;
 
 // ============================================================================
 static bool gs_waitingForThread = FALSE;
 
 // ============================================================================

-// Windows implementation of thread classes
+// Windows implementation of thread and related classes

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxMutex implementation
+// wxCriticalSection
+// ----------------------------------------------------------------------------
+
+wxCriticalSection::wxCriticalSection()
+{
+    wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer),
+                           wxCriticalSectionBufferTooSmall );
+
+    ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);
+}
+
+wxCriticalSection::~wxCriticalSection()
+{
+    ::DeleteCriticalSection((CRITICAL_SECTION *)m_buffer);
+}
+
+void wxCriticalSection::Enter()
+{
+    ::EnterCriticalSection((CRITICAL_SECTION *)m_buffer);
+}
+
+void wxCriticalSection::Leave()
+{
+    ::LeaveCriticalSection((CRITICAL_SECTION *)m_buffer);
+}
+
+// ----------------------------------------------------------------------------
+// wxMutex

 // ----------------------------------------------------------------------------
 
 class wxMutexInternal
 {
 public:
 // ----------------------------------------------------------------------------
 
 class wxMutexInternal
 {
 public:

-    wxMutexInternal()
-    {
-        m_mutex = ::CreateMutex(NULL, FALSE, NULL);
-        if ( !m_mutex )
-        {
-            wxLogSysError(_("Can not create mutex"));
-        }
-    }
+    wxMutexInternal(wxMutexType mutexType);
+    ~wxMutexInternal();

 
 

-    ~wxMutexInternal() { if ( m_mutex ) ::CloseHandle(m_mutex); }
+    bool IsOk() const { return m_mutex != NULL; }
+
+    wxMutexError Lock() { return LockTimeout(INFINITE); }
+    wxMutexError TryLock() { return LockTimeout(0); }
+    wxMutexError Unlock();
+
+private:
+    wxMutexError LockTimeout(DWORD milliseconds);

 
 

-public:

     HANDLE m_mutex;
     HANDLE m_mutex;

+
+    DECLARE_NO_COPY_CLASS(wxMutexInternal)

 };
 
 };
 

-wxMutex::wxMutex()
+// all mutexes are recursive under Win32 so we don't use mutexType
+wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(mutexType))

 {
 {

-    m_internal = new wxMutexInternal;
+    // create a nameless (hence intra process and always private) mutex
+    m_mutex = ::CreateMutex
+                (
+                    NULL,       // default secutiry attributes
+                    FALSE,      // not initially locked
+                    NULL        // no name
+                );

 
 

-    m_locked = 0;
+    if ( !m_mutex )
+    {
+        wxLogLastError(_T("CreateMutex()"));
+    }

 }
 
 }
 

-wxMutex::~wxMutex()
+wxMutexInternal::~wxMutexInternal()

 {
 {

-    if ( m_locked > 0 )
+    if ( m_mutex )

     {
     {

-        wxLogDebug(_T("Warning: freeing a locked mutex (%d locks)."), m_locked);
+        if ( !::CloseHandle(m_mutex) )
+        {
+            wxLogLastError(_T("CloseHandle(mutex)"));
+        }

     }
     }

-
-    delete m_internal;

 }
 
 }
 

-wxMutexError wxMutex::Lock()
+wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)

 {
 {

-    DWORD ret;
-
-    ret = WaitForSingleObject(m_internal->m_mutex, INFINITE);
-    switch ( ret )
+    DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);
+    if ( rc == WAIT_ABANDONED )

     {
     {

-        case WAIT_ABANDONED:
-            return wxMUTEX_BUSY;
+        // the previous caller died without releasing the mutex, but now we can
+        // really lock it
+        wxLogDebug(_T("WaitForSingleObject() returned WAIT_ABANDONED"));
+
+        // use 0 timeout, normally we should always get it
+        rc = ::WaitForSingleObject(m_mutex, 0);
+    }

 
 

+    switch ( rc )
+    {

         case WAIT_OBJECT_0:
             // ok
             break;
 
         case WAIT_OBJECT_0:
             // ok
             break;
 

-        case WAIT_FAILED:
-            wxLogSysError(_("Couldn't acquire a mutex lock"));
-            return wxMUTEX_MISC_ERROR;
-

         case WAIT_TIMEOUT:
         case WAIT_TIMEOUT:

+            return wxMUTEX_BUSY;
+
+        case WAIT_ABANDONED:        // checked for above

         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));

-    }
-
-    m_locked++;
-    return wxMUTEX_NO_ERROR;
-}
-
-wxMutexError wxMutex::TryLock()
-{
-    DWORD ret;
+            // fall through

 
 

-    ret = WaitForSingleObject(m_internal->m_mutex, 0);
-    if (ret == WAIT_TIMEOUT || ret == WAIT_ABANDONED)
-        return wxMUTEX_BUSY;
+        case WAIT_FAILED:
+            wxLogLastError(_T("WaitForSingleObject(mutex)"));
+            return wxMUTEX_MISC_ERROR;
+    }

 
 

-    m_locked++;

     return wxMUTEX_NO_ERROR;
 }
 
     return wxMUTEX_NO_ERROR;
 }
 

-wxMutexError wxMutex::Unlock()
+wxMutexError wxMutexInternal::Unlock()

 {
 {

-    if (m_locked > 0)
-        m_locked--;
-
-    BOOL ret = ReleaseMutex(m_internal->m_mutex);
-    if ( ret == 0 )
+    if ( !::ReleaseMutex(m_mutex) )

     {
     {

-        wxLogSysError(_("Couldn't release a mutex"));
+        wxLogLastError(_T("ReleaseMutex()"));
+

         return wxMUTEX_MISC_ERROR;
     }
 
     return wxMUTEX_NO_ERROR;
 }
 
         return wxMUTEX_MISC_ERROR;
     }
 
     return wxMUTEX_NO_ERROR;
 }
 

-// ==========================================================================
-// wxSemaphore
-// ==========================================================================
-

 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------

-// wxSemaphoreInternal
+// wxSemaphore

 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
 

+// a trivial wrapper around Win32 semaphore

 class wxSemaphoreInternal
 {
 public:
 class wxSemaphoreInternal
 {
 public:

-    wxSemaphoreInternal( int initialcount = 0, int maxcount = 0 );
+    wxSemaphoreInternal(int initialcount, int maxcount);

     ~wxSemaphoreInternal();
 
     ~wxSemaphoreInternal();
 

-    void Wait();
-    bool TryWait();
+    bool IsOk() const { return m_semaphore != NULL; }

 
 

-    bool Wait( unsigned long timeout_millis );
+    wxSemaError Wait() { return WaitTimeout(INFINITE); }

 
 

-    void Post();
+    wxSemaError TryWait()
+    {
+        wxSemaError rc = WaitTimeout(0);
+        if ( rc == wxSEMA_TIMEOUT )
+            rc = wxSEMA_BUSY;
+
+        return rc;
+    }
+
+    wxSemaError WaitTimeout(unsigned long milliseconds);
+
+    wxSemaError Post();

 
 private:
     HANDLE m_semaphore;
 
 private:
     HANDLE m_semaphore;

+
+    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)

 };
 
 };
 

-wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount )
+wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)

 {
     if ( maxcount == 0 )
     {
 {
     if ( maxcount == 0 )
     {


@@ -256,7 +298,14 @@ wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount )
         maxcount = INT_MAX;
     }
 
         maxcount = INT_MAX;
     }
 

-    m_semaphore = ::CreateSemaphore( NULL, initialcount, maxcount, NULL );
+    m_semaphore = ::CreateSemaphore
+                    (
+                        NULL,           // default security attributes
+                        initialcount,
+                        maxcount,
+                        NULL            // no name
+                    );
+

     if ( !m_semaphore )
     {
         wxLogLastError(_T("CreateSemaphore()"));
     if ( !m_semaphore )
     {
         wxLogLastError(_T("CreateSemaphore()"));


@@ -265,134 +314,91 @@ wxSemaphoreInternal::wxSemaphoreInternal( int initialcount, int maxcount )
 
 wxSemaphoreInternal::~wxSemaphoreInternal()
 {
 
 wxSemaphoreInternal::~wxSemaphoreInternal()
 {

-    CloseHandle( m_semaphore );
-}
-
-void wxSemaphoreInternal::Wait()
-{
-    if ( ::WaitForSingleObject( m_semaphore, INFINITE ) != WAIT_OBJECT_0 )
+    if ( m_semaphore )

     {
     {

-        wxLogLastError(_T("WaitForSingleObject"));
+        if ( !::CloseHandle(m_semaphore) )
+        {
+            wxLogLastError(_T("CloseHandle(semaphore)"));
+        }

     }
 }
 
     }
 }
 

-bool wxSemaphoreInternal::TryWait()
+wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long milliseconds)

 {
 {

-    return Wait(0);
-}
-
-bool wxSemaphoreInternal::Wait( unsigned long timeout_millis )
-{
-    DWORD result = ::WaitForSingleObject( m_semaphore, timeout_millis );
+    DWORD rc = ::WaitForSingleObject( m_semaphore, milliseconds );

 
 

-    switch ( result )
+    switch ( rc )

     {
         case WAIT_OBJECT_0:
     {
         case WAIT_OBJECT_0:

-           return TRUE;
+           return wxSEMA_NO_ERROR;

 
         case WAIT_TIMEOUT:
 
         case WAIT_TIMEOUT:

-           break;
+           return wxSEMA_TIMEOUT;

 
         default:
 
         default:

-            wxLogLastError(_T("WaitForSingleObject()"));
+            wxLogLastError(_T("WaitForSingleObject(semaphore)"));

     }
 
     }
 

-    return FALSE;
+    return wxSEMA_MISC_ERROR;

 }
 
 }
 

-void wxSemaphoreInternal::Post()
+wxSemaError wxSemaphoreInternal::Post()

 {
 {

-    if ( !::ReleaseSemaphore( m_semaphore, 1, NULL ) )
+    if ( !::ReleaseSemaphore(m_semaphore, 1, NULL /* ptr to previous count */) )

     {
         wxLogLastError(_T("ReleaseSemaphore"));
     {
         wxLogLastError(_T("ReleaseSemaphore"));

-    }
-}
-
-// --------------------------------------------------------------------------
-// wxSemaphore
-// --------------------------------------------------------------------------
-
-wxSemaphore::wxSemaphore( int initialcount, int maxcount )
-{
-    m_internal = new wxSemaphoreInternal( initialcount, maxcount );
-}
-
-wxSemaphore::~wxSemaphore()
-{
-    delete m_internal;
-}
-
-void wxSemaphore::Wait()
-{
-    m_internal->Wait();
-}

 
 

-bool wxSemaphore::TryWait()
-{
-    return m_internal->TryWait();
-}
+        return wxSEMA_MISC_ERROR;
+    }

 
 

-bool wxSemaphore::Wait( unsigned long timeout_millis )
-{
-    return m_internal->Wait( timeout_millis );
+    return wxSEMA_NO_ERROR;

 }
 
 }
 

-void wxSemaphore::Post()
-{
-    m_internal->Post();
-}
-
-
-// ==========================================================================
-// wxCondition
-// ==========================================================================
-

 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------

-// wxConditionInternal
+// wxCondition

 // --------------------------------------------------------------------------
 
 // --------------------------------------------------------------------------
 

+// Win32 doesn't have explicit support for the POSIX condition variables and
+// the Win32 events have quite different semantics, so we reimplement the
+// conditions from scratch using the mutexes and semaphores

 class wxConditionInternal
 {
 public:
 class wxConditionInternal
 {
 public:

-    wxConditionInternal( wxMutex *mutex );
-    ~wxConditionInternal();
-
-    void Wait();
+    wxConditionInternal(wxMutex& mutex);

 
 

-    bool Wait( unsigned long timeout_millis );
+    bool IsOk() const { return m_mutex.IsOk() && m_semaphore.IsOk(); }

 
 

-    void Signal();
+    wxCondError Wait();
+    wxCondError WaitTimeout(unsigned long milliseconds);

 
 

-    void Broadcast();
+    wxCondError Signal();
+    wxCondError Broadcast();

 
 private:
 
 private:

-    int m_numWaiters;
-    wxMutex m_mutexNumWaiters;
+    // the number of threads currently waiting for this condition
+    LONG m_numWaiters;

 
 

-    wxMutex *m_mutex;
+    // the critical section protecting m_numWaiters
+    wxCriticalSection m_csWaiters;

 
 

+    wxMutex& m_mutex;

     wxSemaphore m_semaphore;
 };
 
     wxSemaphore m_semaphore;
 };
 

-wxConditionInternal::wxConditionInternal( wxMutex *mutex )
+wxConditionInternal::wxConditionInternal(wxMutex& mutex)
+                   : m_mutex(mutex)

 {
 {

-    m_mutex = mutex;
-
+    // another thread can't access it until we return from ctor, so no need to
+    // protect access to m_numWaiters here

     m_numWaiters = 0;
 }
 
     m_numWaiters = 0;
 }
 

-wxConditionInternal::~wxConditionInternal()
-{
-}
-
-void wxConditionInternal::Wait()
+wxCondError wxConditionInternal::Wait()

 {
     // increment the number of waiters
 {
     // increment the number of waiters

-    m_mutexNumWaiters.Lock();
-    m_numWaiters++;
-    m_mutexNumWaiters.Unlock();
+    ::InterlockedIncrement(&m_numWaiters);

 
 

-    m_mutex->Unlock();
+    m_mutex.Unlock();

 
     // a potential race condition can occur here
     //
 
     // a potential race condition can occur here
     //


@@ -405,28 +411,25 @@ void wxConditionInternal::Wait()
     // can 'remember' signals the race condition will not occur
 
     // wait ( if necessary ) and decrement semaphore
     // can 'remember' signals the race condition will not occur
 
     // wait ( if necessary ) and decrement semaphore

-    m_semaphore.Wait();
+    wxSemaError err = m_semaphore.Wait();
+    m_mutex.Lock();

 
 

-    m_mutex->Lock();
+    return err == wxSEMA_NO_ERROR ? wxCOND_NO_ERROR : wxCOND_MISC_ERROR;

 }
 
 }
 

-bool wxConditionInternal::Wait( unsigned long timeout_millis )
+wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)

 {
 {

-    m_mutexNumWaiters.Lock();
-    m_numWaiters++;
-    m_mutexNumWaiters.Unlock();
+    ::InterlockedIncrement(&m_numWaiters);

 
 

-    m_mutex->Unlock();
+    m_mutex.Unlock();

 
     // a race condition can occur at this point in the code
     //
     // please see the comments in Wait(), for details
 
 
     // a race condition can occur at this point in the code
     //
     // please see the comments in Wait(), for details
 

-    bool success = TRUE;
-
-    bool result = m_semaphore.Wait( timeout_millis );
+    wxSemaError err = m_semaphore.WaitTimeout(milliseconds);

 
 

-    if ( !result )
+    if ( err == wxSEMA_BUSY )

     {
         // another potential race condition exists here it is caused when a
         // 'waiting' thread timesout, and returns from WaitForSingleObject, but
     {
         // another potential race condition exists here it is caused when a
         // 'waiting' thread timesout, and returns from WaitForSingleObject, but


@@ -440,128 +443,50 @@ bool wxConditionInternal::Wait( unsigned long timeout_millis )
         // 'nwaiters_mutex'. this call does not block because of the zero
         // timeout, but will allow the waiting thread to catch the missed
         // signals.
         // 'nwaiters_mutex'. this call does not block because of the zero
         // timeout, but will allow the waiting thread to catch the missed
         // signals.

-        m_mutexNumWaiters.Lock();
-        result = m_semaphore.Wait( 0 );
+        wxCriticalSectionLocker lock(m_csWaiters);
+
+        err = m_semaphore.WaitTimeout(0);

 
 

-        if ( !result )
+        if ( err != wxSEMA_NO_ERROR )

         {
             m_numWaiters--;
         {
             m_numWaiters--;

-            success = FALSE;

         }
         }

-
-        m_mutexNumWaiters.Unlock();

     }
 
     }
 

-    m_mutex->Lock();
+    m_mutex.Lock();

 
 

-    return success;
+    return err == wxSEMA_NO_ERROR ? wxCOND_NO_ERROR : wxCOND_MISC_ERROR;

 }
 
 }
 

-void wxConditionInternal::Signal()
+wxCondError wxConditionInternal::Signal()

 {
 {

-    m_mutexNumWaiters.Lock();
+    wxCriticalSectionLocker lock(m_csWaiters);

 
     if ( m_numWaiters > 0 )
     {
         // increment the semaphore by 1
 
     if ( m_numWaiters > 0 )
     {
         // increment the semaphore by 1

-        m_semaphore.Post();
+        if ( m_semaphore.Post() != wxSEMA_NO_ERROR )
+            return wxCOND_MISC_ERROR;

 
         m_numWaiters--;
     }
 
 
         m_numWaiters--;
     }
 

-    m_mutexNumWaiters.Unlock();
+    return wxCOND_NO_ERROR;

 }
 
 }
 

-void wxConditionInternal::Broadcast()
+wxCondError wxConditionInternal::Broadcast()

 {
 {

-    m_mutexNumWaiters.Lock();
+    wxCriticalSectionLocker lock(m_csWaiters);

 
     while ( m_numWaiters > 0 )
     {
 
     while ( m_numWaiters > 0 )
     {

-        m_semaphore.Post();
-        m_numWaiters--;
-    }
+        if ( m_semaphore.Post() != wxSEMA_NO_ERROR )
+            return wxCOND_MISC_ERROR;

 
 

-    m_mutexNumWaiters.Unlock();
-}
-
-// ----------------------------------------------------------------------------
-// wxCondition implementation
-// ----------------------------------------------------------------------------
-
-wxCondition::wxCondition( wxMutex *mutex )
-{
-    if ( !mutex )
-    {
-        wxFAIL_MSG( _T("NULL mutex in wxCondition ctor") );
-
-        m_internal = NULL;
-    }
-    else
-    {
-        m_internal = new wxConditionInternal( mutex );
+        m_numWaiters--;

     }
     }

-}
-
-wxCondition::~wxCondition()
-{
-    delete m_internal;
-}
-
-void wxCondition::Wait()
-{
-    if ( m_internal )
-        m_internal->Wait();
-}
-
-bool wxCondition::Wait( unsigned long timeout_millis )
-{
-    return m_internal ? m_internal->Wait(timeout_millis) : FALSE;
-}
-
-void wxCondition::Signal()
-{
-    if ( m_internal )
-        m_internal->Signal();
-}

 
 

-void wxCondition::Broadcast()
-{
-    if ( m_internal )
-        m_internal->Broadcast();
-}
-
-// ----------------------------------------------------------------------------
-// wxCriticalSection implementation
-// ----------------------------------------------------------------------------
-
-wxCriticalSection::wxCriticalSection()
-{
-#ifdef __WXDEBUG__
-    // Done this way to stop warnings during compilation about statement
-    // always being FALSE
-    int csSize = sizeof(CRITICAL_SECTION);
-    int bSize  = sizeof(m_buffer);
-    wxASSERT_MSG( csSize <= bSize,
-                  _T("must increase buffer size in wx/thread.h") );
-#endif
-
-    ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);
-}
-
-wxCriticalSection::~wxCriticalSection()
-{
-    ::DeleteCriticalSection((CRITICAL_SECTION *)m_buffer);
-}
-
-void wxCriticalSection::Enter()
-{
-    ::EnterCriticalSection((CRITICAL_SECTION *)m_buffer);
-}
-
-void wxCriticalSection::Leave()
-{
-    ::LeaveCriticalSection((CRITICAL_SECTION *)m_buffer);
+    return wxCOND_NO_ERROR;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -627,6 +552,8 @@ private:
     wxThreadState m_state;      // state, see wxThreadState enum
     unsigned int  m_priority;   // thread priority in "wx" units
     DWORD         m_tid;        // thread id
     wxThreadState m_state;      // state, see wxThreadState enum
     unsigned int  m_priority;   // thread priority in "wx" units
     DWORD         m_tid;        // thread id

+
+    DECLARE_NO_COPY_CLASS(wxThreadInternal)

 };
 
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 };
 
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)


@@ -705,6 +632,9 @@ void wxThreadInternal::SetPriority(unsigned int priority)
 
 bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {
 
 bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {

+    wxASSERT_MSG( m_state == STATE_NEW && !m_hThread,
+                    _T("Create()ing thread twice?") );
+

     // for compilers which have it, we should use C RTL function for thread
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)
     // for compilers which have it, we should use C RTL function for thread
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)


@@ -1063,10 +993,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         {
             // set flag for wxIsWaitingForThread()
             gs_waitingForThread = TRUE;
         {
             // set flag for wxIsWaitingForThread()
             gs_waitingForThread = TRUE;

-
-#if wxUSE_GUI
-            wxBeginBusyCursor();
-#endif // wxUSE_GUI

         }
 
         // ask the thread to terminate
         }
 
         // ask the thread to terminate


@@ -1077,20 +1003,32 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
             m_internal->Cancel();
         }
 
             m_internal->Cancel();
         }
 

-#if wxUSE_GUI

         // we can't just wait for the thread to terminate because it might be
         // calling some GUI functions and so it will never terminate before we
         // process the Windows messages that result from these functions
         // we can't just wait for the thread to terminate because it might be
         // calling some GUI functions and so it will never terminate before we
         // process the Windows messages that result from these functions

-        DWORD result;
+        // (note that even in console applications we might have to process
+        // messages if we use wxExecute() or timers or ...)
+        DWORD result = 0;       // suppress warnings from broken compilers

         do
         {
         do
         {

+            if ( IsMain() )
+            {
+                // give the thread we're waiting for chance to do the GUI call
+                // it might be in
+                if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
+                {
+                    wxMutexGuiLeave();
+                }
+            }
+

             result = ::MsgWaitForMultipleObjects
                      (
                        1,              // number of objects to wait for
                        &hThread,       // the objects
                        FALSE,          // don't wait for all objects
                        INFINITE,       // no timeout
             result = ::MsgWaitForMultipleObjects
                      (
                        1,              // number of objects to wait for
                        &hThread,       // the objects
                        FALSE,          // don't wait for all objects
                        INFINITE,       // no timeout

-                       QS_ALLEVENTS    // return as soon as there are any events
+                       QS_ALLINPUT |   // return as soon as there are any events
+                       QS_ALLPOSTMESSAGE

                      );
 
             switch ( result )
                      );
 
             switch ( result )


@@ -1107,57 +1045,43 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
 
                 case WAIT_OBJECT_0 + 1:
                     // new message arrived, process it
 
                 case WAIT_OBJECT_0 + 1:
                     // new message arrived, process it

-                    if ( !wxTheApp->DoMessage() )

                     {
                     {

-                        // WM_QUIT received: kill the thread
-                        Kill();
-
-                        return wxTHREAD_KILLED;
-                    }
+                        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits()
+                                                       : NULL;

 
 

-                    if ( IsMain() )
-                    {
-                        // give the thread we're waiting for chance to exit
-                        // from the GUI call it might have been in
-                        if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
+                        if ( traits && !traits->DoMessageFromThreadWait() )

                         {
                         {

-                            wxMutexGuiLeave();
+                            // WM_QUIT received: kill the thread
+                            Kill();
+
+                            return wxTHREAD_KILLED;

                         }
                     }
                         }
                     }

-

                     break;
 
                 default:
                     wxFAIL_MSG(wxT("unexpected result of MsgWaitForMultipleObject"));
             }
         } while ( result != WAIT_OBJECT_0 );
                     break;
 
                 default:
                     wxFAIL_MSG(wxT("unexpected result of MsgWaitForMultipleObject"));
             }
         } while ( result != WAIT_OBJECT_0 );

-#else // !wxUSE_GUI
-        // simply wait for the thread to terminate
-        //
-        // OTOH, even console apps create windows (in wxExecute, for WinSock
-        // &c), so may be use MsgWaitForMultipleObject() too here?
-        if ( WaitForSingleObject(hThread, INFINITE) != WAIT_OBJECT_0 )
-        {
-            wxFAIL_MSG(wxT("unexpected result of WaitForSingleObject"));
-        }
-#endif // wxUSE_GUI/!wxUSE_GUI

 
         if ( IsMain() )
         {
             gs_waitingForThread = FALSE;
 
         if ( IsMain() )
         {
             gs_waitingForThread = FALSE;

-
-#if wxUSE_GUI
-            wxEndBusyCursor();
-#endif // wxUSE_GUI

         }
     }
 
         }
     }
 

-    if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
+    // although the thread might be already in the EXITED state it might not
+    // have terminated yet and so we are not sure that it has actually
+    // terminated if the "if" above hadn't been taken
+    do

     {
     {

-        wxLogLastError(wxT("GetExitCodeThread"));
+        if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
+        {
+            wxLogLastError(wxT("GetExitCodeThread"));

 
 

-        rc = (ExitCode)-1;
-    }
+            rc = (ExitCode)-1;
+        }
+    } while ( (DWORD)rc == STILL_ACTIVE );

 
     if ( IsDetached() )
     {
 
     if ( IsDetached() )
     {


@@ -1168,9 +1092,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         delete this;
     }
 
         delete this;
     }
 

-    wxASSERT_MSG( (DWORD)rc != STILL_ACTIVE,
-                  wxT("thread must be already terminated.") );
-

     if ( pRc )
         *pRc = rc;
 
     if ( pRc )
         *pRc = rc;
 


@@ -1346,7 +1267,7 @@ void wxThreadModule::OnExit()
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 

-void WXDLLEXPORT wxMutexGuiEnter()
+void WXDLLIMPEXP_BASE wxMutexGuiEnter()

 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),
 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),


@@ -1368,7 +1289,7 @@ void WXDLLEXPORT wxMutexGuiEnter()
     gs_critsectGui->Enter();
 }
 
     gs_critsectGui->Enter();
 }
 

-void WXDLLEXPORT wxMutexGuiLeave()
+void WXDLLIMPEXP_BASE wxMutexGuiLeave()

 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
 
 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
 


@@ -1390,7 +1311,7 @@ void WXDLLEXPORT wxMutexGuiLeave()
     gs_critsectGui->Leave();
 }
 
     gs_critsectGui->Leave();
 }
 

-void WXDLLEXPORT wxMutexGuiLeaveOrEnter()
+void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter()

 {
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only main thread may call wxMutexGuiLeaveOrEnter()!") );
 {
     wxASSERT_MSG( wxThread::IsMain(),
                   wxT("only main thread may call wxMutexGuiLeaveOrEnter()!") );


@@ -1420,13 +1341,13 @@ void WXDLLEXPORT wxMutexGuiLeaveOrEnter()
     }
 }
 
     }
 }
 

-bool WXDLLEXPORT wxGuiOwnedByMainThread()
+bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread()

 {
     return gs_bGuiOwnedByMainThread;
 }
 
 // wake up the main thread if it's in ::GetMessage()
 {
     return gs_bGuiOwnedByMainThread;
 }
 
 // wake up the main thread if it's in ::GetMessage()

-void WXDLLEXPORT wxWakeUpMainThread()
+void WXDLLIMPEXP_BASE wxWakeUpMainThread()

 {
     // sending any message would do - hopefully WM_NULL is harmless enough
     if ( !::PostThreadMessage(gs_idMainThread, WM_NULL, 0, 0) )
 {
     // sending any message would do - hopefully WM_NULL is harmless enough
     if ( !::PostThreadMessage(gs_idMainThread, WM_NULL, 0, 0) )


@@ -1436,11 +1357,16 @@ void WXDLLEXPORT wxWakeUpMainThread()
     }
 }
 
     }
 }
 

-bool WXDLLEXPORT wxIsWaitingForThread()
+bool WXDLLIMPEXP_BASE wxIsWaitingForThread()

 {
     return gs_waitingForThread;
 }
 
 {
     return gs_waitingForThread;
 }
 

+// ----------------------------------------------------------------------------
+// include common implementation code
+// ----------------------------------------------------------------------------
+
+#include "wx/thrimpl.cpp"
+

 #endif // wxUSE_THREADS
 
 #endif // wxUSE_THREADS
 

-// vi:sts=4:sw=4:et