wxGLCanvas works again

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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 3a850853faed729e12bc371e42d33af3f4834371..82c784744789605fc9f91a9661b09f75c71b3b13 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -13,10 +13,6 @@
 #ifndef __THREADH__
 #define __THREADH__
 
 #ifndef __THREADH__
 #define __THREADH__
 

-#ifdef __GNUG__
-    #pragma interface "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -25,6 +21,10 @@
 #include "wx/setup.h"
 
 #if wxUSE_THREADS
 #include "wx/setup.h"
 
 #if wxUSE_THREADS

+/* otherwise we get undefined references for non-thread case (KB)*/
+#ifdef __GNUG__
+    #pragma interface "thread.h"
+#endif

 
 // Windows headers define it
 #ifdef Yield
 
 // Windows headers define it
 #ifdef Yield


@@ -151,9 +151,9 @@ public:
     WXCRITICAL_INLINE ~wxCriticalSection();
 
     // enter the section (the same as locking a mutex)
     WXCRITICAL_INLINE ~wxCriticalSection();
 
     // enter the section (the same as locking a mutex)

-    void WXCRITICAL_INLINE Enter();
+    WXCRITICAL_INLINE void Enter();

     // leave the critical section (same as unlocking a mutex)
     // leave the critical section (same as unlocking a mutex)

-    void WXCRITICAL_INLINE Leave();
+    WXCRITICAL_INLINE void Leave();

 
 private:
     // no assignment operator nor copy ctor
 
 private:
     // no assignment operator nor copy ctor


@@ -352,6 +352,8 @@ void WXDLLEXPORT wxMutexGuiLeave();
 
 #else // !wxUSE_THREADS
 
 
 #else // !wxUSE_THREADS
 

+#include <wx/defs.h> // for WXDLLEXPORT
+

 // no thread support
 inline void WXDLLEXPORT wxMutexGuiEnter() { }
 inline void WXDLLEXPORT wxMutexGuiLeave() { }
 // no thread support
 inline void WXDLLEXPORT wxMutexGuiEnter() { }
 inline void WXDLLEXPORT wxMutexGuiLeave() { }


@@ -369,7 +371,7 @@ public:
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------

-#ifdef wxUSE_THREADS
+#if wxUSE_THREADS

 #ifdef __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
 #ifdef __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