X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7e1b01eb55e59e555860c7ce181f176b8bbf4e2..d7cff34d1f6a2088edcfce3ea5934cdfc6658eb4:/src/mac/carbon/utils.cpp?ds=sidebyside

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 95efb40dbb..2e2ffd6c4a 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -29,6 +29,11 @@
 #include "MoreFiles.h"
 #include "MoreFilesExtras.h"
 
+#ifndef __DARWIN__
+#include <Threads.h>
+#include <Sound.h>
+#endif
+
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
@@ -106,12 +111,25 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )
 {
     // TODO
     return 0;
 }
 
+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
+// set the env var name to the given value, return TRUE on success
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
 //
 // Execute a program in an Interactive Shell
 //
@@ -190,11 +208,22 @@ void wxBell()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-	long theSystem ;
-  Gestalt(gestaltSystemVersion, &theSystem) ;
-  *minorVsn = (theSystem & 0xFF ) ;
-  *majorVsn = (theSystem >> 8 ) ; // are there x-platform conventions ?
-  return wxMACINTOSH;
+    long theSystem ;
+    
+    // are there x-platform conventions ?
+
+    Gestalt(gestaltSystemVersion, &theSystem) ;
+    if (minorVsn != NULL) {
+	*minorVsn = (theSystem & 0xFF ) ;
+    }
+    if (majorVsn != NULL) {
+	*majorVsn = (theSystem >> 8 ) ;
+    }
+#ifdef __DARWIN__
+    return wxMAC_DARWIN;
+#else
+    return wxMAC;
+#endif
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
@@ -454,3 +483,14 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 }
+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+