X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec5d77998a16fbdf328ec689a48449c84f0d4336..4e89ceb11ee28f55050dfc03c69e72cd84f98cdf:/src/mac/utils.cpp diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp index 029f1fa968..4cd5021df4 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 @@ -27,7 +26,15 @@ #include #include -#ifndef __UNIX__ +#include "MoreFiles.h" +#include "MoreFilesExtras.h" + +#ifndef __DARWIN__ +#include +#include +#endif + +#ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X // get full hostname (with domain name if possible) @@ -39,15 +46,35 @@ bool wxGetFullHostName(wxChar *buf, int maxSize) // Get hostname only (without domain name) bool wxGetHostName(char *buf, int maxSize) { - // TODO - return FALSE; + // Gets Chooser name of user by examining a System resource. + + const short kComputerNameID = -16413; + + short oldResFile = CurResFile() ; + UseResFile(0); + StringHandle chooserName = (StringHandle)::GetString(kComputerNameID); + UseResFile(oldResFile); + + if (chooserName && *chooserName) + { + int length = (*chooserName)[0] ; + if ( length + 1 > maxSize ) + { + length = maxSize - 1 ; + } + strncpy( buf , (char*) &(*chooserName)[1] , length ) ; + buf[length] = 0 ; + } + else + buf[0] = 0 ; + + return TRUE; } // Get user ID e.g. jacs bool wxGetUserId(char *buf, int maxSize) { - // TODO - return FALSE; + return wxGetUserName( buf , maxSize ) ; } const wxChar* wxGetHomeDir(wxString *pstr) @@ -56,21 +83,53 @@ const wxChar* wxGetHomeDir(wxString *pstr) return pstr->c_str() ; } - - // Get user name e.g. AUTHOR bool wxGetUserName(char *buf, int maxSize) { - // TODO - return FALSE; + // Gets Chooser name of user by examining a System resource. + + const short kChooserNameID = -16096; + + short oldResFile = CurResFile() ; + UseResFile(0); + StringHandle chooserName = (StringHandle)::GetString(kChooserNameID); + UseResFile(oldResFile); + + if (chooserName && *chooserName) + { + int length = (*chooserName)[0] ; + if ( length + 1 > maxSize ) + { + length = maxSize - 1 ; + } + strncpy( buf , (char*) &(*chooserName)[1] , length ) ; + buf[length] = 0 ; + } + else + buf[0] = 0 ; + + return TRUE; } -int wxKill(long pid, int 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 // @@ -83,13 +142,21 @@ bool wxShell(const wxString& command) // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) long wxGetFreeMemory() { - // TODO - return 0; + return FreeMem() ; +} + +void wxUsleep(unsigned long milliseconds) +{ + clock_t start = clock() ; + do + { + YieldToAnyThread() ; + } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; } void wxSleep(int nSecs) { - // TODO + wxUsleep(1000*nSecs); } // Consume all events until no more left @@ -97,6 +164,8 @@ void wxFlushEvents() { } +#if WXWIN_COMPATIBILITY_2_2 + // Output a debug message, in a system dependent fashion. void wxDebugMsg(const char *fmt ...) { @@ -108,8 +177,10 @@ void wxDebugMsg(const char *fmt ...) va_start(ap, fmt); - // wvsprintf(buffer,fmt,ap) ; - // TODO: output buffer + vsprintf(buffer,fmt,ap) ; + strcat(buffer,";g") ; + c2pstr(buffer) ; + DebugStr((unsigned char*) buffer) ; va_end(ap); } @@ -117,27 +188,47 @@ void wxDebugMsg(const char *fmt ...) // Non-fatal error: pop up message box and (possibly) continue void wxError(const wxString& msg, const wxString& title) { - // TODO + wxSprintf(wxBuffer, wxT("%s\nContinue?"), WXSTRINGCAST msg); + if (wxMessageBox(wxBuffer, title, wxYES_NO) == wxID_NO ) wxExit(); } // Fatal error: pop up message box and abort void wxFatalError(const wxString& msg, const wxString& title) { - // TODO + wxSprintf(wxBuffer, wxT("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg); + wxMessageBox(wxBuffer); + wxExit(); } -#endif // !__UNIX__ + +#endif // WXWIN_COMPATIBILITY_2_2 + +#endif // !__DARWIN__ // Emit a beeeeeep void wxBell() { - // TODO + SysBeep(30); } int wxGetOsVersion(int *majorVsn, int *minorVsn) { - // TODO - return 0; + 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) @@ -260,10 +351,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 ; @@ -274,19 +364,52 @@ wxString wxMacFindFolder( short vol, FSSpec file ; if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr ) { - strDir = wxMacFSSpec2UnixFilename( &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 @@ -365,3 +488,14 @@ 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 +} +