sometimes mutexes are used before our module is initialized

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp
index b0d67a020c4bfd1c95d7720c605f7abadd7f7901..043fea5282d1120a6e972c151c355dfda269c78f 100755 (executable)
--- a/src/mac/carbon/mpthread.cpp
+++ b/src/mac/carbon/mpthread.cpp
@@ -126,6 +126,20 @@ MPCriticalRegionID gs_guiCritical = kInvalidID;
 // wxMutex implementation
 // ----------------------------------------------------------------------------
 
 // wxMutex implementation
 // ----------------------------------------------------------------------------
 

+static bool wxMacMPThreadsInitVerify()
+{
+       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 ;
+    }
+    return TRUE ;
+}      
+

 #if 0 
 
 class wxMutexInternal
 #if 0 
 
 class wxMutexInternal


@@ -145,6 +159,8 @@ private:
 
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {
 
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {

+    wxMacMPThreadsInitVerify() ;
+    

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


@@ -234,6 +250,7 @@ private:
 
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {
 
 wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
 {

+    wxMacMPThreadsInitVerify() ;

     m_isOk = false ;
     m_critRegion = kInvalidID ;
     
     m_isOk = false ;
     m_critRegion = kInvalidID ;
     


@@ -327,6 +344,7 @@ private:
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 {
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 {

+    wxMacMPThreadsInitVerify() ;

     m_isOk = false ;
     m_semaphore = kInvalidID ;
        if ( maxcount == 0 )
     m_isOk = false ;
     m_semaphore = kInvalidID ;
        if ( maxcount == 0 )


@@ -860,6 +878,7 @@ OSStatus wxThreadInternal::MacThreadStart(void *parameter)
 
 bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {
 
 bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {

+    wxMacMPThreadsInitVerify() ;

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


@@ -1414,13 +1433,9 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()

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

     {
     {

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

                return FALSE ;
     }
        
                return FALSE ;
     }