A few tweaks and cleanups

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

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index c8cd9a796878066bd20083feca23de9afcce9612..af2e0f7304c9a4911b38d0e7ad7a46a69f4b2501 100644 (file)
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -170,7 +170,7 @@ wxMutexError wxMutex::Unlock()
 class wxConditionInternal
 {
 public:
 class wxConditionInternal
 {
 public:

-    inline wxConditionInternal ()
+    inline wxConditionInternal (wxMutex& rMutex) : m_vMutex(rMutex)

     {
         ::DosCreateEventSem(NULL, &m_vEvent, DC_SEM_SHARED, FALSE);
         if (!m_vEvent)
     {
         ::DosCreateEventSem(NULL, &m_vEvent, DC_SEM_SHARED, FALSE);
         if (!m_vEvent)


@@ -208,14 +208,15 @@ public:
 
     HEV                             m_vEvent;
     int                             m_nWaiters;
 
     HEV                             m_vEvent;
     int                             m_nWaiters;

+    wxMutex&                        m_vMutex;

 };
 
 };
 

-wxCondition::wxCondition()
+wxCondition::wxCondition(wxMutex& rMutex)

 {
     APIRET                          ulrc;
     ULONG                           ulCount;
 
 {
     APIRET                          ulrc;
     ULONG                           ulCount;
 

-    m_internal = new wxConditionInternal;
+    m_internal = new wxConditionInternal(rMutex);

     ulrc = ::DosCreateEventSem(NULL, &m_internal->m_vEvent, 0L, FALSE);
     if (ulrc != 0)
     {
     ulrc = ::DosCreateEventSem(NULL, &m_internal->m_vEvent, 0L, FALSE);
     if (ulrc != 0)
     {


@@ -239,10 +240,10 @@ void wxCondition::Wait()
 }
 
 bool wxCondition::Wait(
 }
 
 bool wxCondition::Wait(

-  unsigned long                     lSec
-, unsigned long                     lNsec)
+  unsigned long                     lMilliSec
+)

 {
 {

-    return m_internal->Wait(lSec*1000 + lNsec/1000000);
+    return m_internal->Wait(lMilliSec);

 }
 
 void wxCondition::Signal()
 }
 
 void wxCondition::Signal()