X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..223d09f6b523aac674ef9b72a883dfa8d37c5d4e:/src/msw/utilsexc.cpp diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 0c566962da..d287d7fad2 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -28,7 +28,10 @@ #endif #include "wx/log.h" + +#ifdef __WIN32__ #include "wx/process.h" +#endif #include "wx/msw/private.h" @@ -106,14 +109,13 @@ static DWORD wxExecuteThread(wxExecuteData *data) } wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE, - _T("process should have terminated") ); + wxT("process should have terminated") ); // send a message indicating process termination to the window SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data); return 0; } -#endif // window procedure of a hidden window which is created just to receive // the notification message when a process exits @@ -146,12 +148,13 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message, return 0; } +#endif extern wxChar wxPanelClassName[]; long wxExecute(const wxString& command, bool sync, wxProcess *handler) { - wxCHECK_MSG( !!command, 0, _T("empty command in wxExecute") ); + wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") ); #if defined(__WIN32__) && !defined(__TWIN32__) // the old code is disabled because we really need a process handle @@ -247,7 +250,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) // termination HWND hwnd = ::CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL, (HMENU)NULL, wxGetInstance(), 0); - wxASSERT_MSG( hwnd, _T("can't create a hidden window for wxExecute") ); + wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") ); FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk, wxGetInstance()); @@ -262,7 +265,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler) data->state = sync; if ( sync ) { - wxASSERT_MSG( !handler, _T("wxProcess param ignored for sync execution") ); + wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") ); data->handler = NULL; }