Make QS_ALLPOSTMESSAGE available everywhere regardless SDK limitations.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b70362998b
commit
261fb04124
@ -138,6 +138,10 @@
|
|||||||
#define LWA_ALPHA 2
|
#define LWA_ALPHA 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef QS_ALLPOSTMESSAGE
|
||||||
|
#define QS_ALLPOSTMESSAGE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The following are required for VC++ 5 when the PSDK is not available.
|
* The following are required for VC++ 5 when the PSDK is not available.
|
||||||
*/
|
*/
|
||||||
|
@ -77,10 +77,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
// For MB_TASKMODAL
|
#include "wx/msw/missing.h"
|
||||||
#ifdef __WXWINCE__
|
|
||||||
#include "wx/msw/wince/missing.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// instead of including <shlwapi.h> which is not part of the core SDK and not
|
// instead of including <shlwapi.h> which is not part of the core SDK and not
|
||||||
// shipped at all with other compilers, we always define the parts of it we
|
// shipped at all with other compilers, we always define the parts of it we
|
||||||
@ -234,20 +231,14 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
|
|||||||
if ( !wxEventLoop::GetActive() )
|
if ( !wxEventLoop::GetActive() )
|
||||||
return DoSimpleWaitForThread(hThread);
|
return DoSimpleWaitForThread(hThread);
|
||||||
|
|
||||||
const DWORD wakeMask =
|
|
||||||
QS_ALLINPUT // return as soon as there are any events
|
|
||||||
#if !defined(__WXWINCE__)
|
|
||||||
| QS_ALLPOSTMESSAGE
|
|
||||||
#endif
|
|
||||||
;
|
|
||||||
|
|
||||||
return ::MsgWaitForMultipleObjects
|
return ::MsgWaitForMultipleObjects
|
||||||
(
|
(
|
||||||
1, // number of objects to wait for
|
1, // number of objects to wait for
|
||||||
(HANDLE *)&hThread, // the objects
|
(HANDLE *)&hThread, // the objects
|
||||||
false, // wait for any objects, not all
|
false, // wait for any objects, not all
|
||||||
INFINITE, // no timeout
|
INFINITE, // no timeout
|
||||||
wakeMask
|
QS_ALLINPUT | // return as soon as there are any events
|
||||||
|
QS_ALLPOSTMESSAGE
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -752,9 +752,6 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(QS_ALLPOSTMESSAGE)
|
|
||||||
#define QS_ALLPOSTMESSAGE 0
|
|
||||||
#endif
|
|
||||||
wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
|
wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
|
||||||
if ( traits )
|
if ( traits )
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user