fix for wxComboBox::GetSelection from inside event handler

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

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index a56b6f751c4883071b12b89c57ab82005cc2cda2..ccec6bbc2ef08c6c4885356e6819931f266acf1f 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -166,10 +166,23 @@ wxMutex::wxMutex()
 
     // support recursive locks like Win32, i.e. a thread can lock a mutex which
     // it had itself already locked
 
     // support recursive locks like Win32, i.e. a thread can lock a mutex which
     // it had itself already locked

+    //
+    // but initialization of recursive mutexes is non portable <sigh>, so try
+    // several methods
+#ifdef HAVE_PTHREAD_MUTEXATTR_T

     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

+

     pthread_mutex_init(&(m_internal->m_mutex), &attr);
     pthread_mutex_init(&(m_internal->m_mutex), &attr);

+#elif defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+    // we can use this only as initializer so we have to assign it first to a
+    // temp var - assigning directly to m_mutex wouldn't even compile
+    pthread_mutex_t mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+    m_internal->m_mutex = mutex;
+#else // no recursive mutexes
+    pthread_mutex_init(&(m_internal->m_mutex), NULL);
+#endif // HAVE_PTHREAD_MUTEXATTR_T/...

 
     m_locked = 0;
 }
 
     m_locked = 0;
 }


@@ -730,8 +743,12 @@ void wxThreadInternal::Wait()
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;
         wxMutexGuiLeave();
 
     bool isDetached = m_isDetached;

-    long id = (long)GetId();
-    wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
+#ifdef __VMS
+   long long id = (long long)GetId();
+#else
+   long id = (long)GetId();
+#endif
+   wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),

                id);
 
     // wait until the thread terminates (we're blocking in _another_ thread,
                id);
 
     // wait until the thread terminates (we're blocking in _another_ thread,


@@ -852,7 +869,7 @@ void wxThread::Sleep(unsigned long milliseconds)
 
 int wxThread::GetCPUCount()
 {
 
 int wxThread::GetCPUCount()
 {

-#if defined(__LINUX__)
+#if defined(__LINUX__) && wxUSE_FFILE

     // read from proc (can't use wxTextFile here because it's a special file:
     // it has 0 size but still can be read from)
     wxLogNull nolog;
     // read from proc (can't use wxTextFile here because it's a special file:
     // it has 0 size but still can be read from)
     wxLogNull nolog;


@@ -1092,9 +1109,15 @@ unsigned int wxThread::GetPriority() const
     return m_internal->GetPriority();
 }
 
     return m_internal->GetPriority();
 }
 

+#ifdef __VMS
+unsigned long long wxThread::GetId() const
+{
+    return (unsigned long long)m_internal->GetId();
+#else

 unsigned long wxThread::GetId() const
 {
     return (unsigned long)m_internal->GetId();
 unsigned long wxThread::GetId() const
 {
     return (unsigned long)m_internal->GetId();

+#endif

 }
 
 // -----------------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------------