removed rpmfiles.lst

[wxWidgets.git] / src / mac / utils.cpp

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index e490ce4583ae7f6e934ba46af29eb78a628459e4..41da489e3b0ec377bcf7a42026d39914ab12a335 100644 (file)
--- 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
 
@@ -27,10 +26,8 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef __DARWIN__
-  #include "MoreFiles.h"
-  #include "MoreFilesExtras.h"
-#endif
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
@@ -132,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)
@@ -193,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)
@@ -320,10 +328,9 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-#ifndef __DARWIN__
-wxString wxMacFindFolder( short                                        vol,
-                                                                OSType                                 folderType,
-                                                                Boolean                                createFolder)
+wxString wxMacFindFolder( short        vol,
+                         OSType       folderType,
+                         Boolean      createFolder)
 {
        short           vRefNum  ;
        long            dirID ;
@@ -334,12 +341,11 @@ wxString wxMacFindFolder( short                                   vol,
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {
-                       strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
+                       strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
                }
        }
        return strDir ;
 }
-#endif
 
 #ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
@@ -347,9 +353,7 @@ char *wxGetUserHome (const wxString& user)
     // TODO
     return NULL;
 }
-#endif
 
-#ifndef __DARWIN__
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )