added more HP-UX charset names

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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 7c7bab4351ea722d28fbd5c5de99a1681ca66938..86b94bd4674da22c3bffffb57de4d2fe85f20e7f 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -22,11 +22,6 @@
 
 #if wxUSE_THREADS
 
 
 #if wxUSE_THREADS
 

-// only for wxUSE_THREADS - otherwise we'd get undefined symbols
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "thread.h"
-#endif
-

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


@@ -738,7 +733,7 @@ public:
 
 #if wxUSE_THREADS
 
 
 #if wxUSE_THREADS
 

-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) || defined(__EMX__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__OS2__) || defined(__EMX__)

     // 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


@@ -747,10 +742,8 @@ public:
     // returns true if the main thread has GUI lock
     extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread();
 
     // returns true if the main thread has GUI lock
     extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread();
 

-#ifndef __WXPM__

     // wakes up the main thread if it's sleeping inside ::GetMessage()
     extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();
     // wakes up the main thread if it's sleeping inside ::GetMessage()
     extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();

-#endif // !OS/2

 
     // return true if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
 
     // return true if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages


@@ -760,4 +753,3 @@ public:
 #endif // wxUSE_THREADS
 
 #endif // _WX_THREAD_H_
 #endif // wxUSE_THREADS
 
 #endif // _WX_THREAD_H_

-