wxGTK1 : wx/private/eventloopsourcesmanager.h was missing in evtloop.cpp

[wxWidgets.git] / src / os2 / utilsexc.cpp

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f03454c49afd159f3cd979dbff6a2f48146e0b4c..70e7e5a1edf69d70e39e7cdd0ed2d85d030502b0 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilsexec.cpp
+// Name:        src/os2/utilsexec.cpp
 // Purpose:     Various utilities
 // Author:      David Webster
 // Modified by:
 // Created:     10/17/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,23 +12,23 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/log.h"
-
 #include "wx/process.h"
 
 #include "wx/os2/private.h"
 
 #define PURE_32
 #ifndef __EMX__
-#include <upm.h>
-#include <netcons.h>
-#include <netbios.h>
+    #include <upm.h>
+    #ifndef __WATCOMC__
+        #include <netcons.h>
+        #include <netbios.h>
+    #endif
 #endif
 
 #include <ctype.h>
@@ -64,19 +63,17 @@ public:
         DosExit(EXIT_PROCESS, 0);
     }
 
-    HWND                            hWnd;          // window to send wxWM_PROC_TERMINATED to [not used]
-    RESULTCODES                     vResultCodes;
-    wxProcess*                      pHandler;
-    ULONG                           ulExitCode;    // the exit code of the process
-    bool                            bState;        // set to FALSE when the process finishes
+    HWND         hWnd;          // window to send wxWM_PROC_TERMINATED to [not used]
+    RESULTCODES  vResultCodes;
+    wxProcess*   pHandler;
+    ULONG        ulExitCode;    // the exit code of the process
+    bool         bState;        // set to false when the process finishes
 };
 
-static ULONG wxExecuteThread(
-  wxExecuteData*                    pData
-)
+static ULONG wxExecuteThread(wxExecuteData* pData)
 {
-    ULONG                           ulRc;
-    PID                             vPidChild;
+    ULONG ulRc;
+    PID   vPidChild;
 
 //     cout << "Executing thread: " << endl;
 
@@ -88,7 +85,7 @@ static ULONG wxExecuteThread(
                          );
     if (ulRc != NO_ERROR)
     {
-        wxLogLastError("DosWaitChild");
+        wxLogLastError(wxT("DosWaitChild"));
     }
     delete pData;
     return 0;
@@ -96,12 +93,10 @@ static ULONG wxExecuteThread(
 
 // window procedure of a hidden window which is created just to receive
 // the notification message when a process exits
-MRESULT APIENTRY wxExecuteWindowCbk(
-  HWND                              hWnd
-, ULONG                             ulMessage
-, MPARAM                            wParam
-, MPARAM                            lParam
-)
+MRESULT APIENTRY wxExecuteWindowCbk( HWND   hWnd,
+                                     ULONG  ulMessage,
+                                     MPARAM WXUNUSED(wParam),
+                                     MPARAM lParam)
 {
     if (ulMessage == wxWM_PROC_TERMINATED)
     {
@@ -130,13 +125,12 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
-long wxExecute(
-  const wxString&                   rCommand
-, int                               flags
-, wxProcess*                        pHandler
-)
+long wxExecute( const wxString& rCommand,
+                int flags,
+                wxProcess* pHandler,
+                const wxExecuteEnv *env)
 {
-    if (rCommand.IsEmpty())
+    if (rCommand.empty())
     {
 //         cout << "empty command in wxExecute." << endl;
         return 0;
@@ -162,7 +156,7 @@ long wxExecute(
                       ,zArgs
                       ,zEnvs
                       ,&vResultCodes
-                      ,(PSZ)rCommand.c_str()
+                      ,rCommand.c_str()
                      );
     if (rc != NO_ERROR)
     {
@@ -195,7 +189,7 @@ long wxExecute(
                           );
     if (rc != NO_ERROR)
     {
-        wxLogLastError("CreateThread in wxExecute");
+        wxLogLastError(wxT("CreateThread in wxExecute"));
         delete pData;
 
         // the process still started up successfully...
@@ -225,47 +219,27 @@ long wxExecute(
   char**                            ppArgv
 , int                               flags
 , wxProcess*                        pHandler
+, const wxExecuteEnv *env
 )
 {
     wxString                        sCommand;
 
     while (*ppArgv != NULL)
     {
-        sCommand << *ppArgv++ << ' ';
+        wxString                    sArg((wxChar*)(*ppArgv++));
+
+
+        sCommand << sArg.c_str() << ' ';
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
                      ,flags
                      ,pHandler
+                     , env
                     );
 }
 
-bool wxGetFullHostName(
-  wxChar*                           zBuf
-, int                               nMaxSize
-)
+bool wxGetFullHostName( wxChar* zBuf, int nMaxSize)
 {
-#if wxUSE_NET_API
-    char                            zServer[256];
-    char                            zComputer[256];
-    unsigned long                   ulLevel = 0;
-    unsigned char*                  zBuffer = NULL;
-    unsigned long                   ulBuffer = 256;
-    unsigned long*                  pulTotalAvail = NULL;
-
-    NetBios32GetInfo( (const unsigned char*)zServer
-                     ,(const unsigned char*)zComputer
-                     ,ulLevel
-                     ,zBuffer
-                     ,ulBuffer
-                     ,pulTotalAvail
-                    );
-    strncpy(zBuf, zComputer, nMaxSize);
-    zBuf[nMaxSize] = _T('\0');
-#else
-    strcpy(zBuf, "noname");
-#endif
-    return *zBuf ? TRUE : FALSE;
-    return TRUE;
+    return wxGetHostName( zBuf, nMaxSize );
 }
-