fixed mysterious mistakes

[wxWidgets.git] / include / wx / utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 530e38f3099f4f91845cc0c267b4e44e7db5ced6..a8603a3fc84f373589dc4944f6eb61a83278777f 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -21,6 +21,7 @@
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/filefn.h"
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/filefn.h"

+#include "wx/process.h"

 
 #if USE_IOSTREAMH
 #include <iostream.h>
 
 #if USE_IOSTREAMH
 #include <iostream.h>


@@ -96,8 +97,10 @@ int WXDLLEXPORT wxHexToDec(char *buf);
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.

-long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE);
-long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE);
+long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
+                           wxProcess *process = NULL);
+long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
+                           wxProcess *process = NULL);

 
 #define wxSIGTERM 1
 
 
 #define wxSIGTERM 1
 


@@ -179,7 +182,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
     int sync(void);
 };
 

-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS

 #define new WXDEBUG_NEW
 #endif
 
 #define new WXDEBUG_NEW
 #endif
 


@@ -263,7 +266,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
 
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 extern const char* WXDLLEXPORT wxUserResourceStr;
 char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
 #endif
 extern const char* WXDLLEXPORT wxUserResourceStr;
 char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
 #endif