X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da2b4b7a57f816723ed26dbbeca0549b9ce6735a..51dc95a4c8ccb00741be48f6353749ada3e9f39a:/src/mac/utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 56c404aa99..41da489e3b 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.
-// #pragma implementation
 // #pragma implementation "utils.h"
 #endif
 
@@ -130,11 +129,11 @@ long wxGetFreeMemory()
 
 void wxUsleep(unsigned long milliseconds)
 {
-		clock_t start = clock() ;
-		do 
-		{
-			YieldToAnyThread() ;
-		} while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+    clock_t start = clock() ;
+    do 
+    {
+	YieldToAnyThread() ;
+    } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
 }
 
 void wxSleep(int nSecs)
@@ -191,11 +190,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)
@@ -318,9 +328,9 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-wxString wxMacFindFolder( short 					vol,
-								 OSType 				folderType,
-								 Boolean 				createFolder)
+wxString wxMacFindFolder( short        vol,
+			  OSType       folderType,
+			  Boolean      createFolder)
 {
 	short 		vRefNum  ;
 	long 		dirID ;
@@ -331,7 +341,7 @@ wxString wxMacFindFolder( short 					vol,
 		FSSpec file ;
 		if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
 		{
-			strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
+			strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
 		}
 	}
 	return strDir ;
@@ -343,7 +353,6 @@ char *wxGetUserHome (const wxString& user)
     // TODO
     return NULL;
 }
-#endif
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
@@ -378,6 +387,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
+#endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.