new file added

[wxWidgets.git] / src / cocoa / utilsexc.mm

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index 20d6e25688e65ce60050234b416ca25db0a7b1a4..7df71bf3213d29827a551352e37fd5fd2efb5170 100644 (file)
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -21,11 +21,18 @@
 
 #if 0
 
 
 #if 0
 

+#ifndef   WX_PRECOMP
+    #if wxUSE_STREAMS
+        #include  "wx/stream.h"
+    #endif // wxUSE_STREAMS
+#endif  //WX_PRECOMP
+

 #include "wx/process.h"
 #include "wx/process.h"

-#include "wx/stream.h"

 
 #include "wx/cocoa/string.h"
 
 
 #include "wx/cocoa/string.h"
 

+#include "wx/cocoa/objc/objc_uniquifying.h"
+

 #import <Foundation/Foundation.h>
 #import <AppKit/NSWorkspace.h>
 
 #import <Foundation/Foundation.h>
 #import <AppKit/NSWorkspace.h>
 


@@ -99,6 +106,7 @@ protected:
 -(id)init:(void*)handle processIdentifier:(long)pid;
 - (void)termHandler:(NSNotification *)aNotification;
 @end
 -(id)init:(void*)handle processIdentifier:(long)pid;
 - (void)termHandler:(NSNotification *)aNotification;
 @end

+WX_DECLARE_GET_OBJC_CLASS(wxTaskHandler,NSObject)

 
 @implementation wxTaskHandler : NSObject
 
 
 @implementation wxTaskHandler : NSObject
 


@@ -130,10 +138,12 @@ protected:
 }
 
 @end
 }
 
 @end

+WX_IMPLEMENT_GET_OBJC_CLASS(wxTaskHandler,NSObject)

 
 long wxExecute(const wxString& command,
                int sync,
 
 long wxExecute(const wxString& command,
                int sync,

-               wxProcess *handle)
+               wxProcess *handle,
+               const wxExecuteEnv *env)

 {
     NSTask* theTask = [[NSTask alloc] init];
 
 {
     NSTask* theTask = [[NSTask alloc] init];
 


@@ -174,7 +184,7 @@ long wxExecute(const wxString& command,
 
     if(sync & wxEXEC_ASYNC)
     {
 
     if(sync & wxEXEC_ASYNC)
     {

-        [[wxTaskHandler alloc]init:handle
+        [[WX_GET_OBJC_CLASS(wxTaskHandler) alloc]init:handle

                               processIdentifier:[theTask processIdentifier]];
 
         return 0;
                               processIdentifier:[theTask processIdentifier]];
 
         return 0;