Fixed a "comparison is always false" warning

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

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 8c64c8818ae3f9b2aa2b261aea86bdfd96da4562..3634a69ddec7e9aa49ce2efc0d8992e072602df7 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -37,10 +37,12 @@
 #ifdef __WXMAC__
 #include <Threads.h>
 #include "wx/mac/uma.h"
 #ifdef __WXMAC__
 #include <Threads.h>
 #include "wx/mac/uma.h"

+#include "wx/mac/macnotfy.h"

 #endif
 
 #define INFINITE 0xFFFFFFFF
 
 #endif
 
 #define INFINITE 0xFFFFFFFF
 

+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -62,6 +64,7 @@ enum wxThreadState
 
 static ThreadID gs_idMainThread = kNoThreadID ;
 static bool gs_waitingForThread = FALSE ;
 
 static ThreadID gs_idMainThread = kNoThreadID ;
 static bool gs_waitingForThread = FALSE ;

+size_t g_numberOfThreads = 0;

 
 // ============================================================================
 // MacOS implementation of thread classes
 
 // ============================================================================
 // MacOS implementation of thread classes


@@ -257,12 +260,12 @@ public:
     }
 
     bool IsOk() const { return m_mutex.IsOk() ; }
     }
 
     bool IsOk() const { return m_mutex.IsOk() ; }

-    
+

     wxCondError Wait()
     {
         return WaitTimeout(0xFFFFFFFF );
     }
     wxCondError Wait()
     {
         return WaitTimeout(0xFFFFFFFF );
     }

-    
+

     wxCondError WaitTimeout(unsigned long msectimeout)
     {
         wxMacStCritical critical ;
     wxCondError WaitTimeout(unsigned long msectimeout)
     {
         wxMacStCritical critical ;


@@ -300,7 +303,7 @@ public:
     {
         wxMacStCritical critical ;
         return wxCOND_NO_ERROR;
     {
         wxMacStCritical critical ;
         return wxCOND_NO_ERROR;

-    }    
+    }

 
     wxArrayLong m_waiters ;
     wxInt32     m_excessSignals ;
 
     wxArrayLong m_waiters ;
     wxInt32     m_excessSignals ;


@@ -529,7 +532,7 @@ void wxThread::Sleep(unsigned long milliseconds)
     do
     {
         YieldToAnyThread();
     do
     {
         YieldToAnyThread();

-    } while( clock() - start < milliseconds /  1000.0 * CLOCKS_PER_SEC ) ;
+    } while( clock() - start < milliseconds * CLOCKS_PER_SEC /  1000.0 ) ;

 }
 
 int wxThread::GetCPUCount()
 }
 
 int wxThread::GetCPUCount()


@@ -569,6 +572,7 @@ bool wxThread::SetConcurrency(size_t level)
 
 wxThread::wxThread(wxThreadKind kind)
 {
 
 wxThread::wxThread(wxThreadKind kind)
 {

+    g_numberOfThreads++;

     m_internal = new wxThreadInternal();
 
     m_isDetached = kind == wxTHREAD_DETACHED;
     m_internal = new wxThreadInternal();
 
     m_isDetached = kind == wxTHREAD_DETACHED;


@@ -577,6 +581,17 @@ wxThread::wxThread(wxThreadKind kind)
 
 wxThread::~wxThread()
 {
 
 wxThread::~wxThread()
 {

+    if (g_numberOfThreads>0)
+    {
+        g_numberOfThreads--;
+    }
+#ifdef __WXDEBUG__
+    else
+    {
+        wxFAIL_MSG(wxT("More threads deleted than created."));
+    }
+#endif
+

     s_threads.Remove( (void*) this ) ;
     if (m_internal != NULL) {
         delete m_internal;
     s_threads.Remove( (void*) this ) ;
     if (m_internal != NULL) {
         delete m_internal;


@@ -844,7 +859,7 @@ bool wxThreadModule::OnInit()
 #endif
     if ( !hasThreadManager )
     {
 #endif
     if ( !hasThreadManager )
     {

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

         return FALSE ;
     }
 
         return FALSE ;
     }