use ES_RIGHT|ES_NUMBER styles for the buddy control as it's used for numeric entry...

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index a5fa470848e285e249c81fb1d664ed59acddd3c4..5d7c3bcd2aba900fe340779a8f24c01d63907ba9 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -255,6 +255,7 @@ wxMutexError wxMutexInternal::Lock()
 
 wxMutexError wxMutexInternal::Lock(unsigned long ms)
 {
 
 wxMutexError wxMutexInternal::Lock(unsigned long ms)
 {

+#ifdef HAVE_PTHREAD_MUTEX_TIMEDLOCK

     static const long MSEC_IN_SEC   = 1000;
     static const long NSEC_IN_MSEC  = 1000000;
     static const long NSEC_IN_USEC  = 1000;
     static const long MSEC_IN_SEC   = 1000;
     static const long NSEC_IN_MSEC  = 1000000;
     static const long NSEC_IN_USEC  = 1000;


@@ -295,6 +296,11 @@ wxMutexError wxMutexInternal::Lock(unsigned long ms)
     }
 
     return HandleLockResult(pthread_mutex_timedlock(&m_mutex, &ts));
     }
 
     return HandleLockResult(pthread_mutex_timedlock(&m_mutex, &ts));

+#else // !HAVE_PTHREAD_MUTEX_TIMEDLOCK
+    wxUnusedVar(ms);
+
+    return wxMUTEX_MISC_ERROR;
+#endif // HAVE_PTHREAD_MUTEX_TIMEDLOCK/!HAVE_PTHREAD_MUTEX_TIMEDLOCK

 }
 
 wxMutexError wxMutexInternal::HandleLockResult(int err)
 }
 
 wxMutexError wxMutexInternal::HandleLockResult(int err)