No real changes, just use wxString::clear() instead of assignment.

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

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index e4d1387488163a05d1c027157835cadc9a9c0085..830595af2a64133b3cc6f5a906d14ed077a23de0 100644 (file)
--- a/src/os2/thread.cpp
+++ b/src/os2/thread.cpp
@@ -114,7 +114,7 @@ wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(eMutexType))
     APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {
     APIRET ulrc = ::DosCreateMutexSem(NULL, &m_vMutex, 0L, FALSE);
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not create mutex."));
+        wxLogSysError(_("Cannot create mutex."));

         m_vMutex = NULL;
     }
 }
         m_vMutex = NULL;
     }
 }


@@ -354,7 +354,7 @@ public:
     {
         m_hThread = 0;
         m_eState = STATE_NEW;
     {
         m_hThread = 0;
         m_eState = STATE_NEW;

-        m_nPriority = WXTHREAD_DEFAULT_PRIORITY;
+        m_nPriority = wxPRIORITY_DEFAULT;

     }
 
     ~wxThreadInternal()
     }
 
     ~wxThreadInternal()


@@ -497,7 +497,7 @@ bool wxThreadInternal::Create( wxThread* pThread,
         return false;
     }
     m_hThread = tid;
         return false;
     }
     m_hThread = tid;

-    if (m_nPriority != WXTHREAD_DEFAULT_PRIORITY)
+    if (m_nPriority != wxPRIORITY_DEFAULT)

     {
         SetPriority(m_nPriority);
     }
     {
         SetPriority(m_nPriority);
     }


@@ -511,7 +511,7 @@ bool wxThreadInternal::Suspend()
 
     if (ulrc != 0)
     {
 
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not suspend thread %lu"), m_hThread);
+        wxLogSysError(_("Cannot suspend thread %lu"), m_hThread);

         return false;
     }
     m_eState = STATE_PAUSED;
         return false;
     }
     m_eState = STATE_PAUSED;


@@ -525,7 +525,7 @@ bool wxThreadInternal::Resume()
 
     if (ulrc != 0)
     {
 
     if (ulrc != 0)
     {

-        wxLogSysError(_("Can not resume thread %lu"), m_hThread);
+        wxLogSysError(_("Cannot resume thread %lu"), m_hThread);

         return false;
     }
 
         return false;
     }
 


@@ -661,18 +661,18 @@ wxThreadError wxThread::Resume()
 // stopping thread
 // ---------------
 
 // stopping thread
 // ---------------
 

-wxThread::ExitCode wxThread::Wait()
+wxThread::ExitCode wxThread::Wait(wxThreadWait waitMode)

 {
     // although under Windows we can wait for any thread, it's an error to
     // wait for a detached one in wxWin API
     wxCHECK_MSG( !IsDetached(), (ExitCode)-1,
                  wxT("can't wait for detached thread") );
     ExitCode rc = (ExitCode)-1;
 {
     // although under Windows we can wait for any thread, it's an error to
     // wait for a detached one in wxWin API
     wxCHECK_MSG( !IsDetached(), (ExitCode)-1,
                  wxT("can't wait for detached thread") );
     ExitCode rc = (ExitCode)-1;

-    (void)Delete(&rc);
+    (void)Delete(&rc, waitMode);

     return(rc);
 }
 
     return(rc);
 }
 

-wxThreadError wxThread::Delete(ExitCode *pRc)
+wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait WXUNUSED(waitMode))

 {
     ExitCode rc = 0;
 
 {
     ExitCode rc = 0;