added correct coordinate handling

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index f6b625878f6bb422810ecd0182ee192981b38535..4cd91e87c04e9876bfc5a3d64a274552fff41117 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -52,19 +52,21 @@ public:
   HANDLE p_mutex;
 };
 
   HANDLE p_mutex;
 };
 

-wxMutex::wxMutex(void)
+wxMutex::wxMutex()

 {
   p_internal = new wxMutexInternal;
   p_internal->p_mutex = CreateMutex(NULL, FALSE, NULL);
   m_locked = 0;
 }
 
 {
   p_internal = new wxMutexInternal;
   p_internal->p_mutex = CreateMutex(NULL, FALSE, NULL);
   m_locked = 0;
 }
 

-wxMutex::~wxMutex(void)
+wxMutex::~wxMutex()

 {
 {

+  if (m_locked > 0)
+    wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked);

   CloseHandle(p_internal->p_mutex);
 }
 
   CloseHandle(p_internal->p_mutex);
 }
 

-wxMutexError wxMutex::Lock(void)
+wxMutexError wxMutex::Lock()

 {
   DWORD ret;
 
 {
   DWORD ret;
 


@@ -76,7 +78,7 @@ wxMutexError wxMutex::Lock(void)
   return MUTEX_NO_ERROR;
 }
 
   return MUTEX_NO_ERROR;
 }
 

-wxMutexError wxMutex::TryLock(void)
+wxMutexError wxMutex::TryLock()

 {
   DWORD ret;
 
 {
   DWORD ret;
 


@@ -88,7 +90,7 @@ wxMutexError wxMutex::TryLock(void)
   return MUTEX_NO_ERROR;
 }
 
   return MUTEX_NO_ERROR;
 }
 

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

 {
   BOOL ret;
 
 {
   BOOL ret;
 


@@ -107,14 +109,14 @@ public:
   int waiters;
 };
 
   int waiters;
 };
 

-wxCondition::wxCondition(void)
+wxCondition::wxCondition()

 {
   p_internal = new wxConditionInternal;
   p_internal->event = CreateEvent(NULL, FALSE, FALSE, NULL);
   p_internal->waiters = 0;
 }
 
 {
   p_internal = new wxConditionInternal;
   p_internal->event = CreateEvent(NULL, FALSE, FALSE, NULL);
   p_internal->waiters = 0;
 }
 

-wxCondition::~wxCondition(void)
+wxCondition::~wxCondition()

 {
   CloseHandle(p_internal->event);
 }
 {
   CloseHandle(p_internal->event);
 }


@@ -142,12 +144,12 @@ bool wxCondition::Wait(wxMutex& mutex, unsigned long sec,
   return (ret != WAIT_TIMEOUT);
 }
 
   return (ret != WAIT_TIMEOUT);
 }
 

-void wxCondition::Signal(void)
+void wxCondition::Signal()

 {
   SetEvent(p_internal->event);
 }
 
 {
   SetEvent(p_internal->event);
 }
 

-void wxCondition::Broadcast(void)
+void wxCondition::Broadcast()

 {
   int i;
 
 {
   int i;
 


@@ -176,7 +178,7 @@ DWORD wxThreadInternal::WinThreadStart(LPVOID arg)
   return ret;
 }
 
   return ret;
 }
 

-wxThreadError wxThread::Create(void)
+wxThreadError wxThread::Create()

 {
   int win_prio, prio = p_internal->prio;
 
 {
   int win_prio, prio = p_internal->prio;
 


@@ -231,7 +233,7 @@ void wxThread::SetPriority(int prio)
   p_internal->prio = prio;
 }
 
   p_internal->prio = prio;
 }
 

-int wxThread::GetPriority(void)
+int wxThread::GetPriority() const

 {
   return p_internal->prio;
 }
 {
   return p_internal->prio;
 }


@@ -268,7 +270,7 @@ void *wxThread::Join()
   return (void *)exit_code;
 }
 
   return (void *)exit_code;
 }
 

-unsigned long wxThread::GetID()
+unsigned long wxThread::GetID() const

 {
   return (unsigned long)p_internal->tid;
 }
 {
   return (unsigned long)p_internal->tid;
 }


@@ -304,14 +306,14 @@ void wxThread::OnExit()
 class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
 class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:

-  virtual bool OnInit(void) {
+  virtual bool OnInit() {

     p_mainid = GetCurrentThread();
     wxMainMutex.Lock();
     return TRUE;
   }
 
   // Global cleanup
     p_mainid = GetCurrentThread();
     wxMainMutex.Lock();
     return TRUE;
   }
 
   // Global cleanup

-  virtual void OnExit(void) {
+  virtual void OnExit() {

     wxMainMutex.Unlock();
   }
 };
     wxMainMutex.Unlock();
   }
 };