projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxImagePixelData compilation (ticket #3003); added a unit test for it (to be...
[wxWidgets.git]
/
include
/
wx
/
thrimpl.cpp
diff --git
a/include/wx/thrimpl.cpp
b/include/wx/thrimpl.cpp
index ba4aa31bb72e9ba0a3dae9a1a900e28d7426da40..b9773620a9827ee18dc7a6295a23b0ae0a42b5af 100644
(file)
--- a/
include/wx/thrimpl.cpp
+++ b/
include/wx/thrimpl.cpp
@@
-44,6
+44,14
@@
wxMutexError wxMutex::Lock()
return m_internal->Lock();
}
return m_internal->Lock();
}
+wxMutexError wxMutex::LockTimeout(unsigned long ms)
+{
+ wxCHECK_MSG( m_internal, wxMUTEX_INVALID,
+ _T("wxMutex::Lock(): not initialized") );
+
+ return m_internal->Lock(ms);
+}
+
wxMutexError wxMutex::TryLock()
{
wxCHECK_MSG( m_internal, wxMUTEX_INVALID,
wxMutexError wxMutex::TryLock()
{
wxCHECK_MSG( m_internal, wxMUTEX_INVALID,
@@
-328,3
+336,17
@@
wxSemaError wxSemaphore::Post()
return m_internal->Post();
}
return m_internal->Post();
}
+// ----------------------------------------------------------------------------
+// wxThread
+// ----------------------------------------------------------------------------
+
+#ifndef __WXMAC__
+
+#include "wx/utils.h"
+
+void wxThread::Sleep(unsigned long milliseconds)
+{
+ wxMilliSleep(milliseconds);
+}
+
+#endif // __WXMAC__