don't wait for Windows messages in WaitForThread() if we don't dispatch events (should fix the bugs 1523302 and 1650795)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-02 23:12:34 +00:00
parent e570a44b37
commit 535920ff93
3 changed files with 24 additions and 2 deletions

View File

@@ -227,6 +227,13 @@ bool wxGUIAppTraits::DoMessageFromThreadWait()
DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
{
// if we don't have a running event loop, we shouldn't wait for the
// messages as we never remove them from the message queue and so we enter
// an infinite loop as MsgWaitForMultipleObjects() keeps returning
// WAIT_OBJECT_0 + 1
if ( !wxEventLoop::GetActive() )
return DoSimpleWaitForThread(hThread);
return ::MsgWaitForMultipleObjects
(
1, // number of objects to wait for