compilation fix for Motif

[wxWidgets.git] / include / wx / thread.h

diff --git a/include/wx/thread.h b/include/wx/thread.h
index c47aca344955d9bd717e52dad4c1e72afaa4e62b..2c6f2f8c0e367c029bd6a2be712d15611b464ceb 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -137,7 +137,7 @@ private:
 #if defined(__WXMSW__) || defined(__WXPM__)
     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE
 #if defined(__WXMSW__) || defined(__WXPM__)
     class WXDLLEXPORT wxCriticalSectionInternal;
     #define WXCRITICAL_INLINE

-#else // !MSW
+#else // !MSW && !PM

     #define WXCRITICAL_INLINE   inline
 #endif // MSW/!MSW
 
     #define WXCRITICAL_INLINE   inline
 #endif // MSW/!MSW
 


@@ -384,7 +384,7 @@ public:
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 #if wxUSE_THREADS
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 #if wxUSE_THREADS

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__)

     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread


@@ -399,7 +399,15 @@ public:
     // return TRUE if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLEXPORT wxIsWaitingForThread();
     // return TRUE if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLEXPORT wxIsWaitingForThread();

-#else // !MSW
+#elif defined(__WXPM__)
+    // unlock GUI if there are threads waiting for and lock it back when
+    // there are no more of them - should be called periodically by the main
+    // thread
+    extern void WXDLLEXPORT wxMutexGuiLeaveOrEnter();
+
+    // returns TRUE if the main thread has GUI lock
+    extern bool WXDLLEXPORT wxGuiOwnedByMainThread();
+#else // !MSW && !PM

     // implement wxCriticalSection using mutexes
     inline wxCriticalSection::wxCriticalSection() { }
     inline wxCriticalSection::~wxCriticalSection() { }
     // implement wxCriticalSection using mutexes
     inline wxCriticalSection::wxCriticalSection() { }
     inline wxCriticalSection::~wxCriticalSection() { }