added automatic growing of in-place wxTextCtrls for generic wxListCtrl and wxTreeCtrl

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 439992a63a7b7f37c74c362a1bbd13e8b81669b6..e701abb39bc42521d5b8e6aee02f939872db76ea 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+#    include "wx/wx.h"

 #endif
 
 #if wxUSE_THREADS
 #endif
 
 #if wxUSE_THREADS


@@ -36,12 +36,18 @@
 #include "wx/module.h"
 #include "wx/thread.h"
 
 #include "wx/module.h"
 #include "wx/thread.h"
 

+#ifdef Yield
+#    undef Yield
+#endif
+

 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
 #endif
 
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
 #endif
 

-#if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
+#if defined(__VISUALC__) || \
+    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
+    (defined(__GNUG__) && defined(__MSVCRT__))

 
 #if defined(__BORLANDC__) && !defined(__MT__)
 // I can't set -tWM in the IDE (anyone?) so have to do this
 
 #if defined(__BORLANDC__) && !defined(__MT__)
 // I can't set -tWM in the IDE (anyone?) so have to do this


@@ -53,7 +59,6 @@
 #define __MFC_COMPAT__
 #endif
 
 #define __MFC_COMPAT__
 #endif
 

-

     #include <process.h>
 #endif
 
     #include <process.h>
 #endif
 


@@ -237,7 +242,7 @@ public:
         {
             if ( !::CloseHandle(event) )
             {
         {
             if ( !::CloseHandle(event) )
             {

-                wxLogLastError("CloseHandle(event)");
+                wxLogLastError(wxT("CloseHandle(event)"));

             }
         }
     }
             }
         }
     }


@@ -276,7 +281,7 @@ void wxCondition::Signal()
     // will be woken up.
     if ( !::SetEvent(m_internal->event) )
     {
     // will be woken up.
     if ( !::SetEvent(m_internal->event) )
     {

-        wxLogLastError("SetEvent");
+        wxLogLastError(wxT("SetEvent"));

     }
 }
 
     }
 }
 


@@ -346,7 +351,7 @@ public:
         {
             if ( !::CloseHandle(m_hThread) )
             {
         {
             if ( !::CloseHandle(m_hThread) )
             {

-                wxLogLastError("CloseHandle(thread)");
+                wxLogLastError(wxT("CloseHandle(thread)"));

             }
 
             m_hThread = 0;
             }
 
             m_hThread = 0;


@@ -385,31 +390,38 @@ private:
 
 DWORD wxThreadInternal::WinThreadStart(wxThread *thread)
 {
 
 DWORD wxThreadInternal::WinThreadStart(wxThread *thread)
 {

-    // first of all, check whether we hadn't been cancelled already
+    DWORD rc;
+    bool wasCancelled;
+
+    // first of all, check whether we hadn't been cancelled already and don't
+    // start the user code at all then

     if ( thread->m_internal->GetState() == STATE_EXITED )
     {
     if ( thread->m_internal->GetState() == STATE_EXITED )
     {

-        return (DWORD)-1;
+        rc = (DWORD)-1;
+        wasCancelled = TRUE;

     }
     }

-
-    // store the thread object in the TLS
-    if ( !::TlsSetValue(gs_tlsThisThread, thread) )
+    else // do run thread

     {
     {

-        wxLogSysError(_("Can not start thread: error writing TLS."));
+        // store the thread object in the TLS
+        if ( !::TlsSetValue(gs_tlsThisThread, thread) )
+        {
+            wxLogSysError(_("Can not start thread: error writing TLS."));

 
 

-        return (DWORD)-1;
-    }
+            return (DWORD)-1;
+        }

 
 

-    DWORD rc = (DWORD)thread->Entry();
+        rc = (DWORD)thread->Entry();

 
 

-    // enter m_critsect before changing the thread state
-    thread->m_critsect.Enter();
-    bool wasCancelled = thread->m_internal->GetState() == STATE_CANCELED;
-    thread->m_internal->SetState(STATE_EXITED);
-    thread->m_critsect.Leave();
+        // enter m_critsect before changing the thread state
+        thread->m_critsect.Enter();
+        wasCancelled = thread->m_internal->GetState() == STATE_CANCELED;
+        thread->m_internal->SetState(STATE_EXITED);
+        thread->m_critsect.Leave();
+    }

 
     thread->OnExit();
 
 
     thread->OnExit();
 

-    // if the thread was cancelled (from Delete()), then it the handle is still
+    // if the thread was cancelled (from Delete()), then its handle is still

     // needed there
     if ( thread->IsDetached() && !wasCancelled )
     {
     // needed there
     if ( thread->IsDetached() && !wasCancelled )
     {


@@ -455,8 +467,8 @@ bool wxThreadInternal::Create(wxThread *thread)
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)
 #if defined(__VISUALC__) || \
     // creation instead of Win32 API one because otherwise we will have memory
     // leaks if the thread uses C RTL (and most threads do)
 #if defined(__VISUALC__) || \

-    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) \\
-    (defined(__GNUG__) && defined(__MSVCRT__)
+    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
+    (defined(__GNUG__) && defined(__MSVCRT__))

     typedef unsigned (__stdcall *RtlThreadStart)(void *);
 
     m_hThread = (HANDLE)_beginthreadex(NULL, 0,
     typedef unsigned (__stdcall *RtlThreadStart)(void *);
 
     m_hThread = (HANDLE)_beginthreadex(NULL, 0,


@@ -517,7 +529,13 @@ bool wxThreadInternal::Resume()
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_state = STATE_RUNNING;
+    // don't change the state from STATE_EXITED because it's special and means
+    // we are going to terminate without running any user code - if we did it,
+    // the codei n Delete() wouldn't work
+    if ( m_state != STATE_EXITED )
+    {
+        m_state = STATE_RUNNING;
+    }

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -640,18 +658,12 @@ bool wxThread::SetConcurrency(size_t level)
         if ( hModKernel )
         {
             pfnSetProcessAffinityMask = (SETPROCESSAFFINITYMASK)
         if ( hModKernel )
         {
             pfnSetProcessAffinityMask = (SETPROCESSAFFINITYMASK)

-                ::GetProcAddress(hModKernel,
-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520)
-                                 "SetProcessAffinityMask");
-#else
-                                 _T("SetProcessAffinityMask"));
-#endif
+                ::GetProcAddress(hModKernel, "SetProcessAffinityMask");

         }
 
         // we've discovered a MT version of Win9x!
         wxASSERT_MSG( pfnSetProcessAffinityMask,
         }
 
         // we've discovered a MT version of Win9x!
         wxASSERT_MSG( pfnSetProcessAffinityMask,

-                      _T("this system has several CPUs but no "
-                         "SetProcessAffinityMask function?") );
+                      _T("this system has several CPUs but no SetProcessAffinityMask function?") );

     }
 
     if ( !pfnSetProcessAffinityMask )
     }
 
     if ( !pfnSetProcessAffinityMask )


@@ -754,29 +766,44 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
 
     // Delete() is always safe to call, so consider all possible states
 
 
     // Delete() is always safe to call, so consider all possible states
 

-    // has the thread started to run?
-    bool shouldResume = FALSE;
+    // we might need to resume the thread, but we might also not need to cancel
+    // it if it doesn't run yet
+    bool shouldResume = FALSE,
+         shouldCancel = TRUE,
+         isRunning = FALSE;

 
 

+    // check if the thread already started to run

     {
         wxCriticalSectionLocker lock(m_critsect);
 
         if ( m_internal->GetState() == STATE_NEW )
         {
     {
         wxCriticalSectionLocker lock(m_critsect);
 
         if ( m_internal->GetState() == STATE_NEW )
         {

-            // WinThreadStart() will see it and terminate immediately
+            // WinThreadStart() will see it and terminate immediately, no need
+            // to cancel the thread - but we still need to resume it to let it
+            // run

             m_internal->SetState(STATE_EXITED);
 
             m_internal->SetState(STATE_EXITED);
 

-            shouldResume = TRUE;
+            Resume();   // it knows about STATE_EXITED special case
+
+            shouldCancel = FALSE;
+            isRunning = TRUE;
+
+            // shouldResume is correctly set to FALSE here
+        }
+        else
+        {
+            shouldResume = IsPaused();

         }
     }
 
         }
     }
 

-    // is the thread paused?
-    if ( shouldResume || IsPaused() )
+    // resume the thread if it is paused
+    if ( shouldResume )

         Resume();
 
     HANDLE hThread = m_internal->GetHandle();
 
     // does is still run?
         Resume();
 
     HANDLE hThread = m_internal->GetHandle();
 
     // does is still run?

-    if ( IsRunning() )
+    if ( isRunning || IsRunning() )

     {
         if ( IsMain() )
         {
     {
         if ( IsMain() )
         {


@@ -789,6 +816,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         }
 
         // ask the thread to terminate
         }
 
         // ask the thread to terminate

+        if ( shouldCancel )

         {
             wxCriticalSectionLocker lock(m_critsect);
 
         {
             wxCriticalSectionLocker lock(m_critsect);
 


@@ -872,7 +900,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
 
     if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
     {
 
     if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
     {

-        wxLogLastError("GetExitCodeThread");
+        wxLogLastError(wxT("GetExitCodeThread"));

 
         rc = (ExitCode)-1;
     }
 
         rc = (ExitCode)-1;
     }


@@ -881,7 +909,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
     {
         // if the thread exits normally, this is done in WinThreadStart, but in
         // this case it would have been too early because
     {
         // if the thread exits normally, this is done in WinThreadStart, but in
         // this case it would have been too early because

-        // MsgWaitForMultipleObject() would fail if the therad handle was
+        // MsgWaitForMultipleObject() would fail if the thread handle was

         // closed while we were waiting on it, so we must do it here
         delete this;
     }
         // closed while we were waiting on it, so we must do it here
         delete this;
     }


@@ -926,7 +954,9 @@ void wxThread::Exit(ExitCode status)
         delete this;
     }
 
         delete this;
     }
 

-#if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
+#if defined(__VISUALC__) || \
+    (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
+    (defined(__GNUG__) && defined(__MSVCRT__))

     _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);
     _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);


@@ -1013,9 +1043,7 @@ bool wxThreadModule::OnInit()
         // in normal circumstances it will only happen if all other
         // TLS_MINIMUM_AVAILABLE (>= 64) indices are already taken - in other
         // words, this should never happen
         // in normal circumstances it will only happen if all other
         // TLS_MINIMUM_AVAILABLE (>= 64) indices are already taken - in other
         // words, this should never happen

-        wxLogSysError(_("Thread module initialization failed: "
-                        "impossible to allocate index in thread "
-                        "local storage"));
+        wxLogSysError(_("Thread module initialization failed: impossible to allocate index in thread local storage"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -1027,8 +1055,7 @@ bool wxThreadModule::OnInit()
         ::TlsFree(gs_tlsThisThread);
         gs_tlsThisThread = 0xFFFFFFFF;
 
         ::TlsFree(gs_tlsThisThread);
         gs_tlsThisThread = 0xFFFFFFFF;
 

-        wxLogSysError(_("Thread module initialization failed: "
-                        "can not store value in thread local storage"));
+        wxLogSysError(_("Thread module initialization failed: can not store value in thread local storage"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -1048,7 +1075,7 @@ void wxThreadModule::OnExit()
 {
     if ( !::TlsFree(gs_tlsThisThread) )
     {
 {
     if ( !::TlsFree(gs_tlsThisThread) )
     {

-        wxLogLastError("TlsFree failed.");
+        wxLogLastError(wxT("TlsFree failed."));

     }
 
     if ( gs_critsectGui )
     }
 
     if ( gs_critsectGui )


@@ -1153,7 +1180,7 @@ void WXDLLEXPORT wxWakeUpMainThread()
     if ( !::PostThreadMessage(gs_idMainThread, WM_NULL, 0, 0) )
     {
         // should never happen
     if ( !::PostThreadMessage(gs_idMainThread, WM_NULL, 0, 0) )
     {
         // should never happen

-        wxLogLastError("PostThreadMessage(WM_NULL)");
+        wxLogLastError(wxT("PostThreadMessage(WM_NULL)"));

     }
 }
 
     }
 }