new VC++ project files with both dll and lib in one project

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 52b3291077bf2929fb26c86cacd16103a999c60b..7c66077a993ce05dd6494a49104fe164931775b1 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "thread.h"
 #endif
 
     #pragma implementation "thread.h"
 #endif
 


@@ -826,7 +826,7 @@ wxThreadInternal::WaitForTerminate(bool shouldCancel,
                     //     in a secondary thread because if it had created some
                     //     window somehow (possible not even using wxWindows)
                     //     the system might dead lock then
                     //     in a secondary thread because if it had created some
                     //     window somehow (possible not even using wxWindows)
                     //     the system might dead lock then

-                    if ( IsMain() )
+                    if ( wxThread::IsMain() )

                     {
                         // it looks that sometimes WAIT_OBJECT_0 + 1 is
                         // returned but there are no messages in the thread
                     {
                         // it looks that sometimes WAIT_OBJECT_0 + 1 is
                         // returned but there are no messages in the thread