Add some version checks to help compiling on OSX.

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

diff --git a/src/cocoa/utilsexc.mm b/src/cocoa/utilsexc.mm
index a6fa6e499a4e32b3171918b7771795eb2e984b35..7df71bf3213d29827a551352e37fd5fd2efb5170 100644 (file)
--- a/src/cocoa/utilsexc.mm
+++ b/src/cocoa/utilsexc.mm
@@ -6,29 +6,33 @@
 // Created:     2004-10-05
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Created:     2004-10-05
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 // Notes:       This code may be useful on platforms other than Darwin.
 //              On Darwin we share the CoreFoundation code with wxMac.
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 // Notes:       This code may be useful on platforms other than Darwin.
 //              On Darwin we share the CoreFoundation code with wxMac.
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/utils.h"

 #endif
 #endif

+

 #include "wx/unix/execute.h"
 
 #if 0
 
 #include "wx/unix/execute.h"
 
 #if 0
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "wx/utils.h"
+#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>
 


@@ -42,14 +46,14 @@
 class wxPipeInputStream : public wxInputStream
 {
 public:
 class wxPipeInputStream : public wxInputStream
 {
 public:

-    wxPipeInputStream(NSPipe* thePipe) : 
+    wxPipeInputStream(NSPipe* thePipe) :

             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForReading])
     {
     }
 
     ~wxPipeInputStream()
             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForReading])
     {
     }
 
     ~wxPipeInputStream()

-    {  
+    {

         [m_thePipe release];
     }
 
         [m_thePipe release];
     }
 


@@ -60,23 +64,23 @@ protected:
         memcpy(buffer, [theData bytes], [theData length]);
         return [theData length];
     }
         memcpy(buffer, [theData bytes], [theData length]);
         return [theData length];
     }

-    
-    
-    NSPipe*            m_thePipe;
-    NSFileHandle*      m_theHandle;
+
+
+    NSPipe* m_thePipe;
+    NSFileHandle* m_theHandle;

 };
 
 class wxPipeOutputStream : public wxOutputStream
 {
 public:
 };
 
 class wxPipeOutputStream : public wxOutputStream
 {
 public:

-    wxPipeOutputStream(NSPipe* thePipe) : 
+    wxPipeOutputStream(NSPipe* thePipe) :

             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForWriting])
     {
     }
 
     ~wxPipeOutputStream()
             m_thePipe(thePipe),
             m_theHandle([m_thePipe fileHandleForWriting])
     {
     }
 
     ~wxPipeOutputStream()

-    {  
+    {

         [m_thePipe release];
     }
 
         [m_thePipe release];
     }
 


@@ -84,14 +88,14 @@ protected:
 
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize)
     {
 
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize)
     {

-        NSData* theData = [NSData dataWithBytesNoCopy:(void*)buffer 
+        NSData* theData = [NSData dataWithBytesNoCopy:(void*)buffer

                                   length:bufsize];
         [m_theHandle writeData:theData];
         return bufsize;
     }
                                   length:bufsize];
         [m_theHandle writeData:theData];
         return bufsize;
     }

-        
-    NSPipe*            m_thePipe;
-    NSFileHandle*      m_theHandle;
+
+    NSPipe* m_thePipe;
+    NSFileHandle* m_theHandle;

 };
 
 @interface wxTaskHandler : NSObject
 };
 
 @interface wxTaskHandler : NSObject


@@ -102,92 +106,94 @@ 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
 

--(id)init:(void*)handle processIdentifier:(long)pid 
+-(id)init:(void*)handle processIdentifier:(long)pid

 {
     self = [super init];
 {
     self = [super init];

-    
+

     m_handle = handle;
     m_pid = pid;
 
     m_handle = handle;
     m_pid = pid;
 

-    [[NSNotificationCenter defaultCenter] addObserver:self 
-            selector:@selector(termHandler:) 
-            name:NSTaskDidTerminateNotification 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+            selector:@selector(termHandler:)
+            name:NSTaskDidTerminateNotification

             object:nil];
     return self;
 }
 
             object:nil];
     return self;
 }
 

-- (void)termHandler:(NSNotification *)aNotification 
+- (void)termHandler:(NSNotification *)aNotification

 {
     NSTask* theTask = [aNotification object];
 {
     NSTask* theTask = [aNotification object];

-    
+

     if ([theTask processIdentifier] == m_pid)
     {
     if ([theTask processIdentifier] == m_pid)
     {

-        ((wxProcess*)m_handle)->OnTerminate([theTask processIdentifier], 
+        ((wxProcess*)m_handle)->OnTerminate([theTask processIdentifier],

                           [theTask terminationStatus]);
                           [theTask terminationStatus]);

-        
+

         [self release];
     }
 }
 
 @end
         [self release];
     }
 }
 
 @end

+WX_IMPLEMENT_GET_OBJC_CLASS(wxTaskHandler,NSObject)

 
 

-long wxExecute(const wxString& command, 
-                int sync, 
-                wxProcess *handle)
+long wxExecute(const wxString& command,
+               int sync,
+               wxProcess *handle,
+               const wxExecuteEnv *env)

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

-    
+

     if (handle && handle->IsRedirected())
     {
         NSPipe* theStdinPipe = [[NSPipe alloc] init];
         NSPipe* theStderrPipe = [[NSPipe alloc] init];
         NSPipe* theStdoutPipe = [[NSPipe alloc] init];
     if (handle && handle->IsRedirected())
     {
         NSPipe* theStdinPipe = [[NSPipe alloc] init];
         NSPipe* theStderrPipe = [[NSPipe alloc] init];
         NSPipe* theStdoutPipe = [[NSPipe alloc] init];

-    
+

         [theTask setStandardInput:theStdinPipe];
         [theTask setStandardError:theStderrPipe];
         [theTask setStandardOutput:theStdoutPipe];
         [theTask setStandardInput:theStdinPipe];
         [theTask setStandardError:theStderrPipe];
         [theTask setStandardOutput:theStdoutPipe];

-        
+

         handle->SetPipeStreams(new wxPipeInputStream(theStdoutPipe),
                                new wxPipeOutputStream(theStdinPipe),
                                new wxPipeInputStream(theStderrPipe) );
     }
         handle->SetPipeStreams(new wxPipeInputStream(theStdoutPipe),
                                new wxPipeOutputStream(theStdinPipe),
                                new wxPipeInputStream(theStderrPipe) );
     }

-    
-    NSArray* theQuoteArguments = 
+
+    NSArray* theQuoteArguments =

         [wxNSStringWithWxString(command) componentsSeparatedByString:@"\""];
         [wxNSStringWithWxString(command) componentsSeparatedByString:@"\""];

-        
-    NSMutableArray* theSeperatedArguments = 
+
+    NSMutableArray* theSeparatedArguments =

         [NSMutableArray arrayWithCapacity:10];
         [NSMutableArray arrayWithCapacity:10];

-        
+

     for (unsigned i = 0; i < [theQuoteArguments count]; ++i)
     {
     for (unsigned i = 0; i < [theQuoteArguments count]; ++i)
     {

-        [theSeperatedArguments addObjectsFromArray:
+        [theSeparatedArguments addObjectsFromArray:

             [[theQuoteArguments objectAtIndex:i] componentsSeparatedByString:@" "]
         ];
             [[theQuoteArguments objectAtIndex:i] componentsSeparatedByString:@" "]
         ];

-        
+

         if(++i < [theQuoteArguments count])
         if(++i < [theQuoteArguments count])

-            [theSeperatedArguments addObject:[theQuoteArguments objectAtIndex:i]];
+            [theSeparatedArguments addObject:[theQuoteArguments objectAtIndex:i]];

     }
     }

-    
-    [theTask setLaunchPath:[theSeperatedArguments objectAtIndex:0]];
-    [theTask setArguments:theSeperatedArguments];
+
+    [theTask setLaunchPath:[theSeparatedArguments objectAtIndex:0]];
+    [theTask setArguments:theSeparatedArguments];

     [theTask launch];
     [theTask launch];

-    
+

     if(sync & wxEXEC_ASYNC)
     {
     if(sync & wxEXEC_ASYNC)
     {

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

                               processIdentifier:[theTask processIdentifier]];
                               processIdentifier:[theTask processIdentifier]];

-                                
+

         return 0;
     }
     else
     {
         [theTask waitUntilExit];
         return 0;
     }
     else
     {
         [theTask waitUntilExit];

-        
+

         return [theTask terminationStatus];
         return [theTask terminationStatus];

-    }                      
+    }

 }
 #endif //0
 }
 #endif //0

-