fixes to ShowFullScreen (KDE 3.1)

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index b3bc923c6877110b8bc2c5f703ccc49afc0d1c97..cf2353b6157b7d5f7386936d10f2346c221490a6 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -32,6 +32,7 @@
 #if wxUSE_THREADS
 
 #include "wx/msw/private.h"
 #if wxUSE_THREADS
 
 #include "wx/msw/private.h"

+#include "wx/msw/missing.h"

 
 #include "wx/module.h"
 #include "wx/thread.h"
 
 #include "wx/module.h"
 #include "wx/thread.h"


@@ -132,7 +133,7 @@ static bool gs_waitingForThread = FALSE;
 
 wxCriticalSection::wxCriticalSection()
 {
 
 wxCriticalSection::wxCriticalSection()
 {

-    wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(m_buffer),
+    wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer),

                            wxCriticalSectionBufferTooSmall );
 
     ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);
                            wxCriticalSectionBufferTooSmall );
 
     ::InitializeCriticalSection((CRITICAL_SECTION *)m_buffer);


@@ -173,6 +174,8 @@ private:
     wxMutexError LockTimeout(DWORD milliseconds);
 
     HANDLE m_mutex;
     wxMutexError LockTimeout(DWORD milliseconds);
 
     HANDLE m_mutex;

+
+    DECLARE_NO_COPY_CLASS(wxMutexInternal)

 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType


@@ -242,7 +245,7 @@ wxMutexError wxMutexInternal::Unlock()
 {
     if ( !::ReleaseMutex(m_mutex) )
     {
 {
     if ( !::ReleaseMutex(m_mutex) )
     {

-        wxLogLastError(_("ReleaseMutex()"));
+        wxLogLastError(_T("ReleaseMutex()"));

 
         return wxMUTEX_MISC_ERROR;
     }
 
         return wxMUTEX_MISC_ERROR;
     }


@@ -271,6 +274,8 @@ public:
 
 private:
     HANDLE m_semaphore;
 
 private:
     HANDLE m_semaphore;

+
+    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)

 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)


@@ -535,6 +540,8 @@ private:
     wxThreadState m_state;      // state, see wxThreadState enum
     unsigned int  m_priority;   // thread priority in "wx" units
     DWORD         m_tid;        // thread id
     wxThreadState m_state;      // state, see wxThreadState enum
     unsigned int  m_priority;   // thread priority in "wx" units
     DWORD         m_tid;        // thread id

+
+    DECLARE_NO_COPY_CLASS(wxThreadInternal)

 };
 
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 };
 
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)


@@ -971,10 +978,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         {
             // set flag for wxIsWaitingForThread()
             gs_waitingForThread = TRUE;
         {
             // set flag for wxIsWaitingForThread()
             gs_waitingForThread = TRUE;

-
-#if wxUSE_GUI
-            wxBeginBusyCursor();
-#endif // wxUSE_GUI

         }
 
         // ask the thread to terminate
         }
 
         // ask the thread to terminate


@@ -989,16 +992,27 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         // we can't just wait for the thread to terminate because it might be
         // calling some GUI functions and so it will never terminate before we
         // process the Windows messages that result from these functions
         // we can't just wait for the thread to terminate because it might be
         // calling some GUI functions and so it will never terminate before we
         // process the Windows messages that result from these functions

-        DWORD result;
+        DWORD result = 0;       // suppress warnings from broken compilers

         do
         {
         do
         {

+            if ( IsMain() )
+            {
+                // give the thread we're waiting for chance to do the GUI call
+                // it might be in
+                if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
+                {
+                    wxMutexGuiLeave();
+                }
+            }
+

             result = ::MsgWaitForMultipleObjects
                      (
                        1,              // number of objects to wait for
                        &hThread,       // the objects
                        FALSE,          // don't wait for all objects
                        INFINITE,       // no timeout
             result = ::MsgWaitForMultipleObjects
                      (
                        1,              // number of objects to wait for
                        &hThread,       // the objects
                        FALSE,          // don't wait for all objects
                        INFINITE,       // no timeout

-                       QS_ALLEVENTS    // return as soon as there are any events
+                       QS_ALLINPUT |   // return as soon as there are any events
+                       QS_ALLPOSTMESSAGE

                      );
 
             switch ( result )
                      );
 
             switch ( result )


@@ -1022,17 +1036,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
 
                         return wxTHREAD_KILLED;
                     }
 
                         return wxTHREAD_KILLED;
                     }

-
-                    if ( IsMain() )
-                    {
-                        // give the thread we're waiting for chance to exit
-                        // from the GUI call it might have been in
-                        if ( (gs_nWaitingForGui > 0) && wxGuiOwnedByMainThread() )
-                        {
-                            wxMutexGuiLeave();
-                        }
-                    }
-

                     break;
 
                 default:
                     break;
 
                 default:


@@ -1053,10 +1056,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         if ( IsMain() )
         {
             gs_waitingForThread = FALSE;
         if ( IsMain() )
         {
             gs_waitingForThread = FALSE;

-
-#if wxUSE_GUI
-            wxEndBusyCursor();
-#endif // wxUSE_GUI

         }
     }
 
         }
     }