Updated to new PyCrust

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index f234da74566aafab7c5d7154d2e14f432e5ca34a..56c404aa9972d5348a9ea22f2af82de740b1c99b 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -27,10 +27,8 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#ifndef __DARWIN__
-#  include "morefile.h"
-#  include "moreextr.h"
-#endif
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"

 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X


@@ -320,7 +318,6 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
   return (wxBusyCursorCount > 0);
 }
 

-#ifndef __DARWIN__

 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)
 wxString wxMacFindFolder( short                                        vol,
                                                                 OSType                                 folderType,
                                                                 Boolean                                createFolder)


@@ -339,7 +336,6 @@ wxString wxMacFindFolder( short                                     vol,
        }
        return strDir ;
 }
        }
        return strDir ;
 }

-#endif

 
 #ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
 
 #ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)


@@ -349,7 +345,6 @@ char *wxGetUserHome (const wxString& user)
 }
 #endif
 
 }
 #endif
 

-#ifndef __DARWIN__

 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )


@@ -383,7 +378,6 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
 
     return err == noErr ;
 }

-#endif

 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.