X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2887179b1fa36f13e7686aae3043893735667dca..5b5ea4664162471bb709cf6addaba92936ccd36a:/src/unix/utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index f216487e98..8709321cf1 100644
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -15,6 +15,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 #include "wx/string.h"
 
@@ -39,7 +42,7 @@
 
 #endif // wxUSE_STREAMS
 
-#ifdef __WXBASE__
+#if wxUSE_BASE
 
 #if defined( __MWERKS__ ) && defined(__MACH__)
 #define WXWIN_OS_DESCRIPTION "MacOS X"
@@ -574,6 +577,9 @@ long wxExecute(wxChar **argv,
     {
         ARGS_CLEANUP;
 
+        // save it for WaitForChild() use
+        execData.pid = pid;
+
         // prepare for IO redirection
 
 #if wxUSE_STREAMS
@@ -817,17 +823,6 @@ wxString wxGetOsDescription()
 
 #endif // !__WXMAC__
 
-int wxGetOsVersion(int *verMaj, int *verMin)
-{
-    // we want this function to work even if there is no wxApp
-    wxConsoleAppTraits traitsConsole;
-    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    if ( ! traits )
-        traits = &traitsConsole;
-
-    return traits->GetOSVersion(verMaj, verMin);
-}
-
 unsigned long wxGetProcessId()
 {
     return (unsigned long)getpid();
@@ -1049,7 +1044,7 @@ void wxFatalError( const wxString &msg, const wxString &title )
 
 #endif // WXWIN_COMPATIBILITY_2_2
 
-#endif // __WXBASE__
+#endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
@@ -1171,6 +1166,9 @@ int wxGUIAppTraits::WaitForChild(wxExecuteData& execData)
     }
 }
 
+#endif // wxUSE_GUI
+#if wxUSE_BASE
+
 void wxHandleProcessTermination(wxEndProcessData *proc_data)
 {
     // notify user about termination if required
@@ -1191,5 +1189,5 @@ void wxHandleProcessTermination(wxEndProcessData *proc_data)
     }
 }
 
-#endif // wxUSE_GUI
 
+#endif // wxUSE_BASE