AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wxExecute() for console programs (process messagse for the hidden window, don't hang)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-09-08 00:40:57 +00:00
parent b42ea279ce
commit 45d5a0c6d8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/utilsexc.cpp
View File

@ -33,9 +33,9 @@
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
#if wxUSE_GUI // See 'dirty hack' below.
#include "wx/frame.h"
#endif
#if wxUSE_GUI // See 'dirty hack' below.
#include "wx/frame.h"
#endif
#endif
#ifdef __WIN32__
@ -262,7 +262,7 @@ private:
// thread function for the thread monitoring the process termination
static DWORD __stdcall wxExecuteThread(void *arg)
{
wxExecuteData *data = (wxExecuteData*)arg;
wxExecuteData * const data = (wxExecuteData *)arg;
if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 )
{
@ -293,7 +293,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
{
DestroyWindow(hWnd); // we don't need it any more
wxExecuteData *data = (wxExecuteData *)lParam;
wxExecuteData * const data = (wxExecuteData *)lParam;
if ( data->handler )
{
data->handler->OnTerminate((int)data->dwProcessId,
@ -316,7 +316,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
}
else
{
return DefWindowProc(hWnd, message, wParam, lParam);
return ::DefWindowProc(hWnd, message, wParam, lParam);
}
}
@ -899,8 +899,15 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
// real async IO which we don't have for the moment
::Sleep(50);
#if wxUSE_GUI
// repaint the GUI
wxYield();
#else // !GUI
// dispatch the messages to the hidden window so that it could
// process the wxWM_PROC_TERMINATED notification
MSG msg;
::PeekMessage(&msg, hwnd, 0, 0, PM_REMOVE);
#endif // GUI/!GUI
}
#if wxUSE_GUI