don't create non-existing groups in HasEntry()

[wxWidgets.git] / src / mac / carbon / mpthread.cpp

diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp
index fe01a8bdd1047f2fe4b1ff5a81e45efd396c0b61..edf27aaf3cc9cb4aa1f43c189d2fd837472d6760 100755 (executable)
--- a/src/mac/carbon/mpthread.cpp
+++ b/src/mac/carbon/mpthread.cpp
@@ -1,19 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:       thread.cpp
-// Purpose:    wxThread Implementation
-// Author:     Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
-// Modified by: Aj Lavin, Stefan Csomor
-// Created:    04/22/98
-// RCS-ID:     $Id$
-// Copyright:  (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
-//                 Vadim Zeitlin (1999) , Stefan Csomor (2000)
-// Licence:    wxWindows licence
+// Name:      src/mac/carbon/mpthread.cpp
+// Purpose:   wxThread Implementation
+// Author:    Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
+// Modified   by: Aj Lavin, Stefan Csomor
+// Created:   04/22/98
+// RCS-ID:    $Id$
+// Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
+//                Vadim Zeitlin (1999) , Stefan Csomor (2000)
+// Licence:   wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -22,15 +18,15 @@
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_THREADS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

-#if wxUSE_THREADS
-

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


@@ -40,7 +36,6 @@
 #else
 #include <DriverServices.h>
 #include <Multiprocessing.h>
 #else
 #include <DriverServices.h>
 #include <Multiprocessing.h>

-#include "wx/math.h"

 #endif
 #include "wx/mac/uma.h"
 #endif
 #endif
 #include "wx/mac/uma.h"
 #endif


@@ -53,11 +48,11 @@
 // this state)
 enum wxThreadState
 {
 // this state)
 enum wxThreadState
 {

-       STATE_NEW,              // didn't start execution yet (=> RUNNING)
-       STATE_RUNNING,  // thread is running (=> PAUSED, CANCELED)
-       STATE_PAUSED,   // thread is temporarily suspended (=> RUNNING)
-       STATE_CANCELED, // thread should terminate a.s.a.p. (=> EXITED)
-       STATE_EXITED    // thread is terminating
+    STATE_NEW,      // didn't start execution yet (=> RUNNING)
+    STATE_RUNNING,  // thread is running (=> PAUSED, CANCELED)
+    STATE_PAUSED,   // thread is temporarily suspended (=> RUNNING)
+    STATE_CANCELED, // thread should terminate a.s.a.p. (=> EXITED)
+    STATE_EXITED    // thread is terminating

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -85,7 +80,7 @@ static wxCriticalSection *gs_critsectWaitingForGui = NULL;
 // number of threads waiting for GUI in wxMutexGuiEnter()
 static size_t gs_nWaitingForGui = 0;
 
 // number of threads waiting for GUI in wxMutexGuiEnter()
 static size_t gs_nWaitingForGui = 0;
 

-// overall number of threads, needed for determining the sleep value of the main 
+// overall number of threads, needed for determining the sleep value of the main

 // event loop
 size_t g_numberOfThreads = 0;
 
 // event loop
 size_t g_numberOfThreads = 0;
 


@@ -103,23 +98,23 @@ MPCriticalRegionID gs_guiCritical = kInvalidID;
 
 /*
     Notes :
 
 /*
     Notes :

-    
+

     The implementation is very close to the phtreads implementation, the reason for
     using MPServices is the fact that these are also available under OS 9. Thus allowing
     for one common API for all current builds.
     The implementation is very close to the phtreads implementation, the reason for
     using MPServices is the fact that these are also available under OS 9. Thus allowing
     for one common API for all current builds.

-    
+

     As soon as wxThreads are on a 64 bit address space, the TLS must be extended
     to use two indices one for each 32 bit part as the MP implementation is limited
     to longs.
     As soon as wxThreads are on a 64 bit address space, the TLS must be extended
     to use two indices one for each 32 bit part as the MP implementation is limited
     to longs.

-    
+

     I have two implementations for mutexes :
     I have two implementations for mutexes :

-    version A based on a binary semaphore, problem - not reentrant, version B based 
+    version A based on a binary semaphore, problem - not reentrant, version B based

     on a critical region, allows for reentrancy, performance implications not
     yet tested
 
     The same for condition internal, one implementation by Aj Lavin and the other one
     copied from the thrimpl.cpp which I assume has been more broadly tested, I've just
     on a critical region, allows for reentrancy, performance implications not
     yet tested
 
     The same for condition internal, one implementation by Aj Lavin and the other one
     copied from the thrimpl.cpp which I assume has been more broadly tested, I've just

-    replaced the interlock increment with the appropriate PPC calls 
+    replaced the interlock increment with the appropriate PPC calls

 */
 
 // ----------------------------------------------------------------------------
 */
 
 // ----------------------------------------------------------------------------


@@ -128,31 +123,31 @@ MPCriticalRegionID gs_guiCritical = kInvalidID;
 
 static bool wxMacMPThreadsInitVerify()
 {
 
 static bool wxMacMPThreadsInitVerify()
 {

-       static bool hasThreadManager = false ;
-       if ( !hasThreadManager )
-           hasThreadManager = MPLibraryIsLoaded();
-    
-       if ( !hasThreadManager )
+    static bool hasThreadManager = false ;
+    if ( !hasThreadManager )
+        hasThreadManager = MPLibraryIsLoaded();
+
+    if ( !hasThreadManager )

     {
     {

-               wxMessageBox( wxT("Error") , wxT("MP Thread Support is not available on this System" ), wxOK ) ;
-               return FALSE ;
+        wxMessageBox( wxT("Error") , wxT("MP Thread Support is not available on this System" ), wxOK ) ;
+        return false ;

     }
     }

-    return TRUE ;
-}      
+    return true ;
+}

 
 

-#if 0 
+#if 0

 
 class wxMutexInternal
 {
 public:
 
 class wxMutexInternal
 {
 public:

-       wxMutexInternal(wxMutexType mutexType) ;
-       ~wxMutexInternal() ;
-       bool IsOk() const { return m_isOk; }
-       
-       wxMutexError Lock() ;
-       wxMutexError TryLock() ;
-       wxMutexError Unlock();
-private:               
+    wxMutexInternal(wxMutexType mutexType) ;
+    ~wxMutexInternal() ;
+    bool IsOk() const { return m_isOk; }
+
+    wxMutexError Lock() ;
+    wxMutexError TryLock() ;
+    wxMutexError Unlock();
+private:

     MPSemaphoreID m_semaphore;
     bool m_isOk ;
 };
     MPSemaphoreID m_semaphore;
     bool m_isOk ;
 };


@@ -160,16 +155,16 @@ private:
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {
     wxMacMPThreadsInitVerify() ;
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {
     wxMacMPThreadsInitVerify() ;

-    
+

     m_isOk = false ;
     m_semaphore = kInvalidID ;
     m_isOk = false ;
     m_semaphore = kInvalidID ;

-    
+

     OSStatus err = noErr ;
     switch( mutexType )
     {
         case wxMUTEX_DEFAULT :
             {
     OSStatus err = noErr ;
     switch( mutexType )
     {
         case wxMUTEX_DEFAULT :
             {

-               verify_noerr( MPCreateBinarySemaphore( & m_semaphore) );
+                verify_noerr( MPCreateBinarySemaphore( & m_semaphore) );

                 m_isOk = ( m_semaphore != kInvalidID ) ;
             }
             break ;
                 m_isOk = ( m_semaphore != kInvalidID ) ;
             }
             break ;


@@ -185,37 +180,37 @@ wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 wxMutexInternal::~wxMutexInternal()
 {
     if ( m_semaphore != kInvalidID )
 wxMutexInternal::~wxMutexInternal()
 {
     if ( m_semaphore != kInvalidID )

-           MPDeleteSemaphore( m_semaphore);
+        MPDeleteSemaphore( m_semaphore);

 }
 
 wxMutexError wxMutexInternal::Lock()
 {
     wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
 }
 
 wxMutexError wxMutexInternal::Lock()
 {
     wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;

-       OSStatus err = MPWaitOnSemaphore( m_semaphore, kDurationForever);
-       if ( err)
+    OSStatus err = MPWaitOnSemaphore( m_semaphore, kDurationForever);
+    if ( err)

     {
     {

-               wxLogSysError(wxT("Could not lock mutex"));
-               return wxMUTEX_MISC_ERROR;
+        wxLogSysError(wxT("Could not lock mutex"));
+        return wxMUTEX_MISC_ERROR;

     }
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutexInternal::TryLock()
 {
     wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
 }
 
 wxMutexError wxMutexInternal::TryLock()
 {
     wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;

-       OSStatus err = MPWaitOnSemaphore( m_semaphore, kDurationImmediate);
-       if ( err)
+    OSStatus err = MPWaitOnSemaphore( m_semaphore, kDurationImmediate);
+    if ( err)

     {
     {

-               if ( err == kMPTimeoutErr)
-               {
-                       return wxMUTEX_BUSY;
-               }
-               wxLogSysError(wxT("Could not try lock mutex"));
-               return wxMUTEX_MISC_ERROR;    
+        if ( err == kMPTimeoutErr)
+        {
+            return wxMUTEX_BUSY;
+        }
+        wxLogSysError(wxT("Could not try lock mutex"));
+        return wxMUTEX_MISC_ERROR;

     }
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutexInternal::Unlock()
 }
 
 wxMutexError wxMutexInternal::Unlock()


@@ -225,10 +220,10 @@ wxMutexError wxMutexInternal::Unlock()
        if ( err)
     {
                wxLogSysError(_("Could not unlock mutex"));
        if ( err)
     {
                wxLogSysError(_("Could not unlock mutex"));

-               return wxMUTEX_MISC_ERROR;        
+               return wxMUTEX_MISC_ERROR;

     }
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 #else
 }
 
 #else


@@ -239,11 +234,11 @@ public:
        wxMutexInternal(wxMutexType mutexType) ;
        ~wxMutexInternal() ;
        bool IsOk() const { return m_isOk; }
        wxMutexInternal(wxMutexType mutexType) ;
        ~wxMutexInternal() ;
        bool IsOk() const { return m_isOk; }

-       
+

        wxMutexError Lock() ;
        wxMutexError TryLock() ;
        wxMutexError Unlock();
        wxMutexError Lock() ;
        wxMutexError TryLock() ;
        wxMutexError Unlock();

-private:               
+private:

     MPCriticalRegionID m_critRegion ;
     bool m_isOk ;
 };
     MPCriticalRegionID m_critRegion ;
     bool m_isOk ;
 };


@@ -253,10 +248,10 @@ wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
     wxMacMPThreadsInitVerify() ;
     m_isOk = false ;
     m_critRegion = kInvalidID ;
     wxMacMPThreadsInitVerify() ;
     m_isOk = false ;
     m_critRegion = kInvalidID ;

-    
+

     verify_noerr( MPCreateCriticalRegion( & m_critRegion) );
     m_isOk = ( m_critRegion != kInvalidID ) ;
     verify_noerr( MPCreateCriticalRegion( & m_critRegion) );
     m_isOk = ( m_critRegion != kInvalidID ) ;

-    
+

     if ( !IsOk() )
         wxFAIL_MSG(wxT("Error when creating mutex") ) ;
 }
     if ( !IsOk() )
         wxFAIL_MSG(wxT("Error when creating mutex") ) ;
 }


@@ -276,8 +271,8 @@ wxMutexError wxMutexInternal::Lock()
                wxLogSysError(wxT("Could not lock mutex"));
                return wxMUTEX_MISC_ERROR;
     }
                wxLogSysError(wxT("Could not lock mutex"));
                return wxMUTEX_MISC_ERROR;
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutexInternal::TryLock()
 }
 
 wxMutexError wxMutexInternal::TryLock()


@@ -291,10 +286,10 @@ wxMutexError wxMutexInternal::TryLock()
                        return wxMUTEX_BUSY;
                }
                wxLogSysError(wxT("Could not try lock mutex"));
                        return wxMUTEX_BUSY;
                }
                wxLogSysError(wxT("Could not try lock mutex"));

-               return wxMUTEX_MISC_ERROR;    
+               return wxMUTEX_MISC_ERROR;

     }
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutexInternal::Unlock()
 }
 
 wxMutexError wxMutexInternal::Unlock()


@@ -304,10 +299,10 @@ wxMutexError wxMutexInternal::Unlock()
        if ( err)
     {
                wxLogSysError(_("Could not unlock mutex"));
        if ( err)
     {
                wxLogSysError(_("Could not unlock mutex"));

-               return wxMUTEX_MISC_ERROR;        
+               return wxMUTEX_MISC_ERROR;

     }
     }

-    
-       return wxMUTEX_NO_ERROR;
+
+    return wxMUTEX_NO_ERROR;

 }
 
 #endif
 }
 
 #endif


@@ -321,22 +316,22 @@ class wxSemaphoreInternal
 public:
        wxSemaphoreInternal(int initialcount, int maxcount);
        ~wxSemaphoreInternal();
 public:
        wxSemaphoreInternal(int initialcount, int maxcount);
        ~wxSemaphoreInternal();

-       
+

        bool IsOk() const { return m_isOk; }
        bool IsOk() const { return m_isOk; }

-       
+

        wxSemaError WaitTimeout(unsigned long milliseconds);
        wxSemaError WaitTimeout(unsigned long milliseconds);

-       
+

        wxSemaError Wait() { return WaitTimeout( kDurationForever); }
        wxSemaError Wait() { return WaitTimeout( kDurationForever); }

-       
-       wxSemaError TryWait() 
-       { 
-           wxSemaError err = WaitTimeout(kDurationImmediate); 
+
+       wxSemaError TryWait()
+       {
+           wxSemaError err = WaitTimeout(kDurationImmediate);

            if ( err == wxSEMA_TIMEOUT )
                err = wxSEMA_BUSY ;
            return err ;
        }
        wxSemaError Post();
            if ( err == wxSEMA_TIMEOUT )
                err = wxSEMA_BUSY ;
            return err ;
        }
        wxSemaError Post();

-       
+

 private:
     MPSemaphoreID m_semaphore;
     bool m_isOk ;
 private:
     MPSemaphoreID m_semaphore;
     bool m_isOk ;


@@ -354,7 +349,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
     }
        verify_noerr( MPCreateSemaphore( maxcount, initialcount, & m_semaphore) );
     m_isOk = ( m_semaphore != kInvalidID ) ;
     }
        verify_noerr( MPCreateSemaphore( maxcount, initialcount, & m_semaphore) );
     m_isOk = ( m_semaphore != kInvalidID ) ;

-    
+

     if ( !IsOk() )
         wxFAIL_MSG(wxT("Error when creating semaphore") ) ;
 }
     if ( !IsOk() )
         wxFAIL_MSG(wxT("Error when creating semaphore") ) ;
 }


@@ -398,8 +393,8 @@ wxSemaError wxSemaphoreInternal::Post()
 class wxConditionInternal
 {
 public:
 class wxConditionInternal
 {
 public:

-       
-       wxConditionInternal(wxMutex& mutex) 
+
+       wxConditionInternal(wxMutex& mutex)

     : m_mutex( mutex),
        m_semaphore( 0, 1),
        m_gate( 1, 1)
     : m_mutex( mutex),
        m_semaphore( 0, 1),
        m_gate( 1, 1)


@@ -408,34 +403,34 @@ public:
                m_signals = 0;
                m_canceled = 0;
        }
                m_signals = 0;
                m_canceled = 0;
        }

-       
+

        ~wxConditionInternal()
        {
        }
        ~wxConditionInternal()
        {
        }

-       
+

        bool IsOk() const { return m_mutex.IsOk() ; }
        bool IsOk() const { return m_mutex.IsOk() ; }

-    
+

        wxCondError Wait()
        {
                return WaitTimeout( kDurationForever);
        }
        wxCondError Wait()
        {
                return WaitTimeout( kDurationForever);
        }

-       
+

        wxCondError WaitTimeout(unsigned long msectimeout);
        wxCondError WaitTimeout(unsigned long msectimeout);

-       
+

        wxCondError Signal()
        {
                return DoSignal( false);
        }
        wxCondError Signal()
        {
                return DoSignal( false);
        }

-       
+

        wxCondError Broadcast()
        {
                return DoSignal( true);
        }
        wxCondError Broadcast()
        {
                return DoSignal( true);
        }

-    
+

 private:
 private:

-               
+

                wxCondError DoSignal( bool signalAll);
                wxCondError DoSignal( bool signalAll);

-       
+

        wxMutex&          m_mutex;
        wxSemaphoreInternal     m_semaphore;  // Signals the waiting threads.
        wxSemaphoreInternal       m_gate;
        wxMutex&          m_mutex;
        wxSemaphoreInternal     m_semaphore;  // Signals the waiting threads.
        wxSemaphoreInternal       m_gate;


@@ -447,7 +442,7 @@ private:
 
 
 wxCondError wxConditionInternal::WaitTimeout(unsigned long msectimeout)
 
 
 wxCondError wxConditionInternal::WaitTimeout(unsigned long msectimeout)

-{      
+{

        m_gate.Wait();
        if ( ++ m_waiters == INT_MAX)
     {
        m_gate.Wait();
        if ( ++ m_waiters == INT_MAX)
     {


@@ -458,24 +453,24 @@ wxCondError wxConditionInternal::WaitTimeout(unsigned long msectimeout)
                m_varSection.Leave();
     }
        m_gate.Post();
                m_varSection.Leave();
     }
        m_gate.Post();

-       
+

        m_mutex.Unlock();
        m_mutex.Unlock();

-       
+

        wxSemaError err = m_semaphore.WaitTimeout( msectimeout);
        wxASSERT( err == wxSEMA_NO_ERROR || err == wxSEMA_TIMEOUT);
        wxSemaError err = m_semaphore.WaitTimeout( msectimeout);
        wxASSERT( err == wxSEMA_NO_ERROR || err == wxSEMA_TIMEOUT);

-       
+

        m_varSection.Enter();
        if ( err != wxSEMA_NO_ERROR)
     {
                if ( m_signals > m_canceled)
                {
                        // A signal is being sent after we timed out.
        m_varSection.Enter();
        if ( err != wxSEMA_NO_ERROR)
     {
                if ( m_signals > m_canceled)
                {
                        // A signal is being sent after we timed out.

-                       
+

                        if ( m_waiters == m_signals)
                        {
                                // There are no excess waiters to catch the signal, so
                                // we must throw it away.
                        if ( m_waiters == m_signals)
                        {
                                // There are no excess waiters to catch the signal, so
                                // we must throw it away.

-                               
+

                                wxSemaError err2 = m_semaphore.Wait();
                                if ( err2 != wxSEMA_NO_ERROR)
                                {
                                wxSemaError err2 = m_semaphore.Wait();
                                if ( err2 != wxSEMA_NO_ERROR)
                                {


@@ -518,15 +513,15 @@ wxCondError wxConditionInternal::WaitTimeout(unsigned long msectimeout)
                }
     }
        m_varSection.Leave();
                }
     }
        m_varSection.Leave();

-       
+

        m_mutex.Lock();
        m_mutex.Lock();

-       
-       if ( err)
+
+    if ( err)

     {
                return err == wxSEMA_TIMEOUT ? wxCOND_TIMEOUT : wxCOND_MISC_ERROR;
     }
     {
                return err == wxSEMA_TIMEOUT ? wxCOND_TIMEOUT : wxCOND_MISC_ERROR;
     }

-    
-       return wxCOND_NO_ERROR;
+
+    return wxCOND_NO_ERROR;

 }
 
 
 }
 
 


@@ -534,36 +529,36 @@ wxCondError wxConditionInternal::DoSignal( bool signalAll)
 {
        m_gate.Wait();
        m_varSection.Enter();
 {
        m_gate.Wait();
        m_varSection.Enter();

-       
+

        wxASSERT( m_signals == m_canceled);
        wxASSERT( m_signals == m_canceled);

-       
+

        if ( m_waiters == m_canceled)
     {
                m_varSection.Leave();
                m_gate.Post();
                return wxCOND_NO_ERROR;
     }
        if ( m_waiters == m_canceled)
     {
                m_varSection.Leave();
                m_gate.Post();
                return wxCOND_NO_ERROR;
     }

-       
+

        if ( m_canceled > 0)
     {
                m_waiters -= m_canceled;
                m_signals = 0;
                m_canceled = 0;
     }
        if ( m_canceled > 0)
     {
                m_waiters -= m_canceled;
                m_signals = 0;
                m_canceled = 0;
     }

-       
+

        m_signals = signalAll ? m_waiters : 1;
        size_t n = m_signals;
        m_signals = signalAll ? m_waiters : 1;
        size_t n = m_signals;

-       
+

        m_varSection.Leave();
        m_varSection.Leave();

-       
+

        // Let the waiters inherit the gate lock.
        // Let the waiters inherit the gate lock.

-       
+

        do
     {
                wxSemaError err = m_semaphore.Post();
                wxASSERT( err == wxSEMA_NO_ERROR);
     } while ( -- n);
        do
     {
                wxSemaError err = m_semaphore.Post();
                wxASSERT( err == wxSEMA_NO_ERROR);
     } while ( -- n);

-       
+

        return wxCOND_NO_ERROR;
 }
 
        return wxCOND_NO_ERROR;
 }
 


@@ -722,14 +717,14 @@ public:
                m_prio = WXTHREAD_DEFAULT_PRIORITY;
                m_notifyQueueId = kInvalidID;
         m_exitcode = 0;
                m_prio = WXTHREAD_DEFAULT_PRIORITY;
                m_notifyQueueId = kInvalidID;
         m_exitcode = 0;

-        m_cancelled = FALSE ;
+        m_cancelled = false ;

 
 

-        // set to TRUE only when the thread starts waiting on m_semSuspend
-        m_isPaused = FALSE;
+        // set to true only when the thread starts waiting on m_semSuspend
+        m_isPaused = false;

 
         // defaults for joinable threads
 
         // defaults for joinable threads

-        m_shouldBeJoined = TRUE;
-        m_isDetached = FALSE;
+        m_shouldBeJoined = true;
+        m_isDetached = false;

     }
     ~wxThreadInternal()
     {
     }
     ~wxThreadInternal()
     {


@@ -769,7 +764,7 @@ public:
        // Get the ID of this thread's underlying MP Services task.
        MPTaskID  GetId() const { return m_tid; }
 
        // Get the ID of this thread's underlying MP Services task.
        MPTaskID  GetId() const { return m_tid; }
 

-    void SetCancelFlag() { m_cancelled = TRUE; }
+    void SetCancelFlag() { m_cancelled = true; }

     bool WasCancelled() const { return m_cancelled; }
     // exit code
     void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; }
     bool WasCancelled() const { return m_cancelled; }
     // exit code
     void SetExitCode(wxThread::ExitCode exitcode) { m_exitcode = exitcode; }


@@ -784,8 +779,8 @@ public:
     {
         wxCriticalSectionLocker lock(m_csJoinFlag);
 
     {
         wxCriticalSectionLocker lock(m_csJoinFlag);
 

-        m_shouldBeJoined = FALSE;
-        m_isDetached = TRUE;
+        m_shouldBeJoined = false;
+        m_isDetached = true;

     }
 
 private:
     }
 
 private:


@@ -856,7 +851,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
             pthread->SetState(STATE_EXITED);
         }
     }
             pthread->SetState(STATE_EXITED);
         }
     }

-    
+

     if ( dontRunAtAll )
     {
         if ( pthread->m_isDetached )
     if ( dontRunAtAll )
     {
         if ( pthread->m_isDetached )


@@ -884,7 +879,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 
        OSStatus err = noErr ;
        m_thread = thread;
 
        OSStatus err = noErr ;
        m_thread = thread;

-       
+

        if ( m_notifyQueueId == kInvalidID )
     {
                OSStatus err = MPCreateQueue( & m_notifyQueueId);
        if ( m_notifyQueueId == kInvalidID )
     {
                OSStatus err = MPCreateQueue( & m_notifyQueueId);


@@ -894,9 +889,9 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
                        return false;
                }
     }
                        return false;
                }
     }

-       
+

        m_state = STATE_NEW;
        m_state = STATE_NEW;

-       
+

        err = MPCreateTask( MacThreadStart,
                                                (void*) m_thread,
                                                stackSize,
        err = MPCreateTask( MacThreadStart,
                                                (void*) m_thread,
                                                stackSize,


@@ -905,25 +900,25 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
                                                0,
                                                0,
                                                &m_tid);
                                                0,
                                                0,
                                                &m_tid);

-       
+

        if ( err)
     {
        if ( err)
     {

-               wxLogSysError(_("Can't create thread"));                
+               wxLogSysError(_("Can't create thread"));

                return false;
     }
                return false;
     }

-       
+

        if ( m_prio != WXTHREAD_DEFAULT_PRIORITY )
     {
                SetPriority(m_prio);
     }
        if ( m_prio != WXTHREAD_DEFAULT_PRIORITY )
     {
                SetPriority(m_prio);
     }

-       
+

        return true;
 }
 
 void wxThreadInternal::SetPriority( int priority)
 {
        m_prio = priority;
        return true;
 }
 
 void wxThreadInternal::SetPriority( int priority)
 {
        m_prio = priority;

-       
+

        if ( m_tid)
     {
                // Mac priorities range from 1 to 10,000, with a default of 100.
        if ( m_tid)
     {
                // Mac priorities range from 1 to 10,000, with a default of 100.


@@ -931,7 +926,7 @@ void wxThreadInternal::SetPriority( int priority)
                // We can map wxWidgets to Mac priorities easily by assuming
                // the former uses a logarithmic scale.
                const unsigned int macPriority = ( int)( exp( priority / 25.0 * log( 10.0)) + 0.5);
                // We can map wxWidgets to Mac priorities easily by assuming
                // the former uses a logarithmic scale.
                const unsigned int macPriority = ( int)( exp( priority / 25.0 * log( 10.0)) + 0.5);

-               
+

                MPSetTaskWeight( m_tid, macPriority);
     }
 }
                MPSetTaskWeight( m_tid, macPriority);
     }
 }


@@ -967,14 +962,14 @@ void wxThreadInternal::Wait()
             void * param2;
             void * rc;
 
             void * param2;
             void * rc;
 

-            OSStatus err = MPWaitOnQueue ( m_notifyQueueId, 
-                                & param1, 
-                                & param2, 
-                                & rc, 
+            OSStatus err = MPWaitOnQueue ( m_notifyQueueId,
+                                & param1,
+                                & param2,
+                                & rc,

                                 kDurationForever);
             if ( err)
             {
                                 kDurationForever);
             if ( err)
             {

-                wxLogSysError( _( "Cannot wait on thread to exit."));
+                wxLogSysError( _( "Cannot wait for thread termination."));

                 rc = (void*) -1;
             }
 
                 rc = (void*) -1;
             }
 


@@ -982,7 +977,7 @@ void wxThreadInternal::Wait()
             // but we don't need this here
             m_exitcode = rc;
 
             // but we don't need this here
             m_exitcode = rc;
 

-            m_shouldBeJoined = FALSE;
+            m_shouldBeJoined = false;

         }
     }
 
         }
     }
 


@@ -1077,7 +1072,7 @@ wxThread::wxThread(wxThreadKind kind)
 {
        g_numberOfThreads++;
        m_internal = new wxThreadInternal();
 {
        g_numberOfThreads++;
        m_internal = new wxThreadInternal();

-       
+

        m_isDetached = (kind == wxTHREAD_DETACHED);
 }
 
        m_isDetached = (kind == wxTHREAD_DETACHED);
 }
 


@@ -1106,7 +1101,7 @@ wxThread::~wxThread()
 wxThreadError wxThread::Create(unsigned int stackSize)
 {
        wxCriticalSectionLocker lock(m_critsect);
 wxThreadError wxThread::Create(unsigned int stackSize)
 {
        wxCriticalSectionLocker lock(m_critsect);

-       
+

     if ( m_isDetached )
     {
         m_internal->Detach() ;
     if ( m_isDetached )
     {
         m_internal->Detach() ;


@@ -1116,7 +1111,7 @@ wxThreadError wxThread::Create(unsigned int stackSize)
         m_internal->SetState(STATE_EXITED);
         return wxTHREAD_NO_RESOURCE;
     }
         m_internal->SetState(STATE_EXITED);
         return wxTHREAD_NO_RESOURCE;
     }

-       
+

        return wxTHREAD_NO_ERROR;
 }
 
        return wxTHREAD_NO_ERROR;
 }
 


@@ -1301,7 +1296,7 @@ void wxThread::Exit(ExitCode status)
     OnExit();
 
     MPTerminateTask( m_internal->GetId() , (long) status) ;
     OnExit();
 
     MPTerminateTask( m_internal->GetId() , (long) status) ;

-    
+

     if ( IsDetached() )
     {
         delete this;
     if ( IsDetached() )
     {
         delete this;


@@ -1402,10 +1397,10 @@ bool wxThread::IsAlive() const
     {
         case STATE_RUNNING:
         case STATE_PAUSED:
     {
         case STATE_RUNNING:
         case STATE_PAUSED:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
+            return false;

     }
 }
 
     }
 }
 


@@ -1425,7 +1420,7 @@ class wxThreadModule : public wxModule
 public:
        virtual bool OnInit();
        virtual void OnExit();
 public:
        virtual bool OnInit();
        virtual void OnExit();

-       
+

 private:
                DECLARE_DYNAMIC_CLASS(wxThreadModule)
 };
 private:
                DECLARE_DYNAMIC_CLASS(wxThreadModule)
 };


@@ -1433,24 +1428,24 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()

-{    
+{

        if ( !wxMacMPThreadsInitVerify() )
     {
        if ( !wxMacMPThreadsInitVerify() )
     {

-               return FALSE ;
+               return false ;

     }
     }

-       
+

        verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
        // main thread's This() is NULL
        verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , NULL ) ) ;
 
        gs_idMainThread = wxThread::GetCurrentId() ;
        verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
        // main thread's This() is NULL
        verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , NULL ) ) ;
 
        gs_idMainThread = wxThread::GetCurrentId() ;

-       
+

     gs_critsectWaitingForGui = new wxCriticalSection();
 
     gs_critsectGui = new wxCriticalSection();
     gs_critsectGui->Enter();
     gs_critsectWaitingForGui = new wxCriticalSection();
 
     gs_critsectGui = new wxCriticalSection();
     gs_critsectGui->Enter();

-       
-       return TRUE;
+
+       return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()