linking fix for wxUSE_VALIDATORS==0

[wxWidgets.git] / src / osx / carbon / thread.cpp

diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index ded1084d3693d2dcd5a9c613e317eef3779505a6..2cabb70b5ff434a90cd83e6c9f271b37b366b53b 100644 (file)
--- a/src/osx/carbon/thread.cpp
+++ b/src/osx/carbon/thread.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/thread.cpp
+// Name:        src/osx/carbon/thread.cpp

 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
 // Modified by: Aj Lavin, Stefan Csomor
 // Purpose:     wxThread Implementation
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
 // Modified by: Aj Lavin, Stefan Csomor


@@ -49,7 +49,7 @@ enum wxThreadState
 // ----------------------------------------------------------------------------
 
 // the task ID of the main thread
 // ----------------------------------------------------------------------------
 
 // the task ID of the main thread

-static wxThreadIdType gs_idMainThread = kInvalidID;
+wxThreadIdType wxThread::ms_idMainThread = kInvalidID;

 
 // this is the Per-Task Storage for the pointer to the appropriate wxThread
 TaskStorageIndex gs_tlsForWXThread = 0;
 
 // this is the Per-Task Storage for the pointer to the appropriate wxThread
 TaskStorageIndex gs_tlsForWXThread = 0;


@@ -106,7 +106,7 @@ MPCriticalRegionID gs_guiCritical = kInvalidID;
 // wxCriticalSection
 // ----------------------------------------------------------------------------
 
 // wxCriticalSection
 // ----------------------------------------------------------------------------
 

-wxCriticalSection::wxCriticalSection()
+wxCriticalSection::wxCriticalSection( wxCriticalSectionType WXUNUSED(critSecType) )

 {
     MPCreateCriticalRegion( (MPCriticalRegionID*) &m_critRegion );
 }
 {
     MPCreateCriticalRegion( (MPCriticalRegionID*) &m_critRegion );
 }


@@ -343,7 +343,7 @@ private:
     wxMutex& m_mutex;
     wxSemaphore m_semaphore;
 
     wxMutex& m_mutex;
     wxSemaphore m_semaphore;
 

-    DECLARE_NO_COPY_CLASS(wxConditionInternal)
+    wxDECLARE_NO_COPY_CLASS(wxConditionInternal);

 };
 
 wxConditionInternal::wxConditionInternal( wxMutex& mutex )
 };
 
 wxConditionInternal::wxConditionInternal( wxMutex& mutex )


@@ -796,11 +796,6 @@ wxThread *wxThread::This()
     return thr;
 }
 
     return thr;
 }
 

-bool wxThread::IsMain()
-{
-    return GetCurrentId() == gs_idMainThread || gs_idMainThread == kInvalidID ;
-}
-

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


@@ -848,7 +843,6 @@ wxThread::~wxThread()
 
     g_numberOfThreads--;
 
 
     g_numberOfThreads--;
 

-#ifdef __WXDEBUG__

     m_critsect.Enter();
 
     // check that the thread either exited or couldn't be created
     m_critsect.Enter();
 
     // check that the thread either exited or couldn't be created


@@ -861,7 +855,6 @@ wxThread::~wxThread()
     }
 
     m_critsect.Leave();
     }
 
     m_critsect.Leave();

-#endif

 
     wxDELETE( m_internal ) ;
 }
 
     wxDELETE( m_internal ) ;
 }


@@ -900,7 +893,7 @@ wxThreadError wxThread::Run()
 wxThreadError wxThread::Pause()
 {
     wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,
 wxThreadError wxThread::Pause()
 {
     wxCHECK_MSG( This() != this, wxTHREAD_MISC_ERROR,

-                 _T("a thread can't pause itself") );
+                 wxT("a thread can't pause itself") );

 
     wxCriticalSectionLocker lock(m_critsect);
 
 
     wxCriticalSectionLocker lock(m_critsect);
 


@@ -1198,8 +1191,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 
 bool wxThreadModule::OnInit()
 {
 
 bool wxThreadModule::OnInit()
 {

-    bool hasThreadManager = 
-#ifdef __LP64__ 
+    bool hasThreadManager =
+#ifdef __LP64__

         true ; // TODO VERIFY IN NEXT BUILD
 #else
         MPLibraryIsLoaded();
         true ; // TODO VERIFY IN NEXT BUILD
 #else
         MPLibraryIsLoaded();


@@ -1216,7 +1209,7 @@ bool wxThreadModule::OnInit()
     verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
     verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ;
 
     verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
     verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ;
 

-    gs_idMainThread = wxThread::GetCurrentId();
+    wxThread::ms_idMainThread = wxThread::GetCurrentId();

     gs_critsectWaitingForGui = new wxCriticalSection();
 
     gs_critsectGui = new wxCriticalSection();
     gs_critsectWaitingForGui = new wxCriticalSection();
 
     gs_critsectGui = new wxCriticalSection();