X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ef3d5565e6f1c1a23baa3be7d6a7b42151c616..09981ba7981297056da49ceb0eb85d3ac9fc5f6f:/src/osx/core/utilsexc_base.cpp

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index a969fc223d..e3e9f996bc 100644
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -40,10 +40,67 @@
 // More WX Includes
 #include "wx/filename.h"
 #include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/private.h"
 
 // Default path style
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 
+#if wxUSE_SOCKETS
+// global pointer which lives in the base library, set from the net one (see
+// sockosx.cpp) and used from the GUI code (see utilsexc_cf.cpp) -- ugly but
+// needed hack, see the above-mentioned files for more information
+class wxSocketManager;
+extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF;
+wxSocketManager *wxOSXSocketManagerCF = NULL;
+#endif // wxUSE_SOCKETS
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    // TODO : try to find out ...
+    return false;
+}
+
+#if wxOSX_USE_COCOA_OR_CARBON
+
+// have a fast version for mac code that returns the version as a return value
+
+long UMAGetSystemVersion()
+{
+    static SInt32 sUMASystemVersion = 0 ;
+    if ( sUMASystemVersion == 0 )
+    {
+        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
+    }
+    return sUMASystemVersion ;
+}
+
+// our OS version is the same in non GUI and GUI cases
+wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
+{
+    SInt32 theSystem;
+    Gestalt(gestaltSystemVersion, &theSystem);
+
+    if ( majorVsn != NULL )
+        *majorVsn = (theSystem >> 8);
+
+    if ( minorVsn != NULL )
+        *minorVsn = (theSystem & 0xFF);
+
+    return wxOS_MAC_OSX_DARWIN;
+}
+
+#include <sys/utsname.h>
+
+wxString wxGetOsDescription()
+{
+    struct utsname name;
+    uname(&name);
+    return wxString::Format(wxT("Mac OS X (%s %s %s)"),
+            wxString::FromAscii(name.sysname).c_str(),
+            wxString::FromAscii(name.release).c_str(),
+            wxString::FromAscii(name.machine).c_str());
+}
+
 //===========================================================================
 //  IMPLEMENTATION
 //===========================================================================
@@ -227,3 +284,4 @@ bool wxMacLaunch(char **argv)
     return true ;
 }
 
+#endif // wxOSX_USE_COCOA_OR_CARBON