replace 5 copies of size constraining code with one function

[wxWidgets.git] / include / wx / unix / execute.h

diff --git a/include/wx/unix/execute.h b/include/wx/unix/execute.h
index e7fb517afbbdb257adb6e0769057500e3437ce4c..7af0c519775d040194c595f7bd7f4ffb4f40fdfe 100644 (file)
--- a/include/wx/unix/execute.h
+++ b/include/wx/unix/execute.h
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin
 // Author:      Vadim Zeitlin
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_EXECUTE_H
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_EXECUTE_H


@@ -12,7 +12,7 @@
 
 #include "wx/unix/pipe.h"
 
 
 #include "wx/unix/pipe.h"
 

-class wxProcess;
+class WXDLLIMPEXP_BASE wxProcess;

 class wxStreamTempInputBuffer;
 
 // if pid > 0, the execution is async and the data is freed in the callback
 class wxStreamTempInputBuffer;
 
 // if pid > 0, the execution is async and the data is freed in the callback


@@ -65,13 +65,13 @@ struct wxExecuteData
 
 // this function is called when the process terminates from port specific
 // callback function and is common to all ports (src/unix/utilsunx.cpp)
 
 // this function is called when the process terminates from port specific
 // callback function and is common to all ports (src/unix/utilsunx.cpp)

-extern void wxHandleProcessTermination(wxEndProcessData *proc_data);
+extern WXDLLIMPEXP_BASE void wxHandleProcessTermination(wxEndProcessData *proc_data);

 
 // this function is called to associate the port-specific callback with the
 // child process. The return valus is port-specific.
 
 // this function is called to associate the port-specific callback with the
 // child process. The return valus is port-specific.

-extern int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);
+extern WXDLLIMPEXP_CORE int wxAddProcessCallback(wxEndProcessData *proc_data, int fd);

 
 

-#if defined(__DARWIN__) && defined(__WXMAC__)
+#if defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))

 // For ports (e.g. DARWIN) which can add callbacks based on the pid
 extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
 #endif
 // For ports (e.g. DARWIN) which can add callbacks based on the pid
 extern int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid);
 #endif