centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index 979ac71cb06214829eabb4e5fe3516bf0bbdb23b..78cbfd0da7e816a3dadb1e97eda4c86fe7e45680 100644 (file)
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utils.cpp
+// Name:        src/mac/classic/utils.cpp
 // Purpose:     Various utilities
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,12 +9,8 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// Note: this is done in utilscmn.cpp now.
-// #pragma implementation "utils.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/apptrait.h"
@@ -343,7 +339,7 @@ extern wxCursor    gMacCurrentCursor ;
 wxCursor        gMacStoredActiveCursor ;
 
 // Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     if (gs_wxBusyCursorCount++ == 0)
     {
@@ -533,7 +529,7 @@ wxChar *wxGetUserHome (const wxString& user)
     return NULL;
 }
 
-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+bool wxGetDiskSpace(const wxString& path, wxDiskspaceSize_t *pTotal, wxDiskspaceSize_t *pFree)
 {
     if ( path.empty() )
         return false;
@@ -557,10 +553,10 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
     OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
     if ( err == noErr ) {
       if ( pTotal ) {
-        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
+        (*pTotal) = wxDiskspaceSize_t( pb.ioVTotalBytes ) ;
       }
       if ( pFree ) {
-        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
+        (*pFree) = wxDiskspaceSize_t( pb.ioVFreeBytes ) ;
       }
     }
 
@@ -1404,4 +1400,3 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
 #endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
 
 #endif // wxUSE_GUI
-