SN: Fixed inlcudes for EMX, commented out lines like "cout << something;"
(If you want them in the code, please also include iostream.h). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0629823585
commit
9aab8b2009
@ -26,12 +26,18 @@
|
|||||||
#include "wx/os2/private.h"
|
#include "wx/os2/private.h"
|
||||||
|
|
||||||
#define PURE_32
|
#define PURE_32
|
||||||
|
#ifndef __EMX__
|
||||||
#include <upm.h>
|
#include <upm.h>
|
||||||
#include <netcons.h>
|
#include <netcons.h>
|
||||||
#include <netbios.h>
|
#include <netbios.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#ifdef __EMX__
|
||||||
|
#include <dirent.h>
|
||||||
|
#else
|
||||||
#include <direct.h>
|
#include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
@ -42,6 +48,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
|
||||||
// this message is sent when the process we're waiting for terminates
|
// this message is sent when the process we're waiting for terminates
|
||||||
#define wxWM_PROC_TERMINATED (WM_USER + 10000)
|
#define wxWM_PROC_TERMINATED (WM_USER + 10000)
|
||||||
|
|
||||||
@ -55,7 +62,7 @@ struct wxExecuteData
|
|||||||
public:
|
public:
|
||||||
~wxExecuteData()
|
~wxExecuteData()
|
||||||
{
|
{
|
||||||
cout << "Closing thread: " << endl;
|
// cout << "Closing thread: " << endl;
|
||||||
DosExit(EXIT_PROCESS, 0);
|
DosExit(EXIT_PROCESS, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,7 +80,7 @@ static ULONG wxExecuteThread(
|
|||||||
ULONG ulRc;
|
ULONG ulRc;
|
||||||
PID vPidChild;
|
PID vPidChild;
|
||||||
|
|
||||||
cout << "Executing thread: " << endl;
|
// cout << "Executing thread: " << endl;
|
||||||
|
|
||||||
ulRc = ::DosWaitChild( DCWA_PROCESSTREE
|
ulRc = ::DosWaitChild( DCWA_PROCESSTREE
|
||||||
,DCWW_NOWAIT
|
,DCWW_NOWAIT
|
||||||
@ -135,7 +142,7 @@ long wxExecute(
|
|||||||
{
|
{
|
||||||
if (rCommand.IsEmpty())
|
if (rCommand.IsEmpty())
|
||||||
{
|
{
|
||||||
cout << "empty command in wxExecute." << endl;
|
// cout << "empty command in wxExecute." << endl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,7 +175,7 @@ long wxExecute(
|
|||||||
wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
|
wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
cout << "Executing: " << rCommand.c_str() << endl;
|
// cout << "Executing: " << rCommand.c_str() << endl;
|
||||||
// Alloc data
|
// Alloc data
|
||||||
wxExecuteData* pData = new wxExecuteData;
|
wxExecuteData* pData = new wxExecuteData;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user