more thread fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -191,14 +191,14 @@ bool wxApp::Initialize()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
int iMsg = 96;
|
int iMsg = 96;
|
||||||
|
|
||||||
// for OLE, enlarge message queue to be as large as possible
|
// for OLE, enlarge message queue to be as large as possible
|
||||||
while (!SetMessageQueue(iMsg) && (iMsg -= 8));
|
while (!SetMessageQueue(iMsg) && (iMsg -= 8));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
DWORD dwOleVer;
|
DWORD dwOleVer;
|
||||||
dwOleVer = CoBuildVersion();
|
dwOleVer = CoBuildVersion();
|
||||||
|
|
||||||
// check the OLE library version
|
// check the OLE library version
|
||||||
if (rmm != HIWORD(dwOleVer))
|
if (rmm != HIWORD(dwOleVer))
|
||||||
{
|
{
|
||||||
@@ -774,7 +774,7 @@ bool wxApp::DoMessage()
|
|||||||
{
|
{
|
||||||
// got WM_QUIT
|
// got WM_QUIT
|
||||||
m_keepGoing = FALSE;
|
m_keepGoing = FALSE;
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
else if ( rc == -1 )
|
else if ( rc == -1 )
|
||||||
@@ -798,7 +798,13 @@ bool wxApp::DoMessage()
|
|||||||
{
|
{
|
||||||
s_hadGuiLock = FALSE;
|
s_hadGuiLock = FALSE;
|
||||||
|
|
||||||
s_aSavedMessages.Add(s_currentMsg);
|
// leave out WM_COMMAND messages: too dangerous, sometimes
|
||||||
|
// the message will be processed twice
|
||||||
|
if ( !wxIsWaitingForThread() ||
|
||||||
|
s_currentMsg.message != WM_COMMAND )
|
||||||
|
{
|
||||||
|
s_aSavedMessages.Add(s_currentMsg);
|
||||||
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user