X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba7eb0a5a74280222fb2ad584b65195ac70cd956..d835f05e11b928b56ecdf9dc305069044dede118:/src/mac/carbon/utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 1a71c0c784..9c4bc2c8ce 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.
-// #pragma implementation
 // #pragma implementation "utils.h"
 #endif
 
@@ -27,7 +26,15 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifndef __UNIX__
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"
+
+#ifndef __DARWIN__
+#include <Threads.h>
+#include <Sound.h>
+#endif
+
+#ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 // get full hostname (with domain name if possible)
@@ -104,12 +111,25 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )
 {
     // TODO
     return 0;
 }
 
+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
+// set the env var name to the given value, return TRUE on success
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
 //
 // Execute a program in an Interactive Shell
 //
@@ -119,6 +139,13 @@ bool wxShell(const wxString& command)
     return FALSE;
 }
 
+// Shutdown or reboot the PC 
+bool wxShutdown(wxShutdownFlags wFlags)
+{
+    // TODO
+    return FALSE;
+}
+
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {
@@ -127,11 +154,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)
@@ -144,6 +171,8 @@ void wxFlushEvents()
 {
 }
 
+#if WXWIN_COMPATIBILITY_2_2
+
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
@@ -178,7 +207,10 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
-#endif // !__UNIX__
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
+#endif // !__DARWIN__
 
 // Emit a beeeeeep
 void wxBell()
@@ -188,11 +220,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)
@@ -315,10 +358,9 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-#ifndef __UNIX__
-wxString wxMacFindFolder( short 					vol,
-								 OSType 				folderType,
-								 Boolean 				createFolder)
+wxString wxMacFindFolder( short        vol,
+			  OSType       folderType,
+			  Boolean      createFolder)
 {
 	short 		vRefNum  ;
 	long 		dirID ;
@@ -329,19 +371,52 @@ 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 __UNIX__
+#ifndef __DARWIN__
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
+
+bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+{
+    if ( path.empty() )
+        return FALSE;
+        
+    wxString p = path ;
+    if (p[0] == ':' ) {
+      p = wxGetCwd() + p ;
+    }
+    
+    int pos = p.Find(':') ;
+    if ( pos != wxNOT_FOUND ) {
+      p = p.Mid(1,pos) ;
+    }
+    
+    p = p + ":" ;
+    
+    Str255 volumeName ;
+    XVolumeParam pb ;
+
+    wxMacStringToPascal( p  , volumeName ) ;
+    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
+    if ( err == noErr ) {
+      if ( pTotal ) {
+        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
+      }
+      if ( pFree ) {
+        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
+      }
+    }
+
+    return err == noErr ;
+}
 #endif
 
 // Check whether this window wants to process messages, e.g. Stop button
@@ -386,37 +461,51 @@ int wxDisplayDepth()
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
-	BitMap screenBits;
-	GetQDGlobalsScreenBits( &screenBits );
-
-    *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
-#if TARGET_CARBON
- 	SInt16 mheight ;
- 	GetThemeMenuBarHeight( &mheight ) ;
-     *height -= mheight ;
-#else
-     *height -= LMGetMBarHeight() ;
-#endif
+  wxClientDisplayRect( NULL , NULL , width , height ) ;
 }
 
 void wxDisplaySizeMM(int *width, int *height)
 {
    wxDisplaySize(width, height);
+   // on mac 72 is fixed (at least now ;-)
+   *width *= 25.4 / 72 ;
+   *height *= 25.4 / 72 ;
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
-    // This is supposed to return desktop dimensions minus any window
-    // manager panels, menus, taskbars, etc.  If there is a way to do that
-    // for this platform please fix this function, otherwise it defaults
-    // to the entire desktop.
+  	BitMap screenBits;
+  	GetQDGlobalsScreenBits( &screenBits );
+
     if (x) *x = 0;
     if (y) *y = 0;
-    wxDisplaySize(width, height);
+
+    *width = screenBits.bounds.right - screenBits.bounds.left  ;
+    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+
+   	SInt16 mheight ;
+  #if TARGET_CARBON
+   	GetThemeMenuBarHeight( &mheight ) ;
+  #else
+    mheight = LMGetMBarHeight() ;
+  #endif
+    *height -= mheight ;
+    if ( y )
+      *y = mheight ;
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);
 }
+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+