compilation fix for broken OS/2 compiler

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

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 6723ed2ad4432cf16167aa1c8660cffc3372523a..1a71c0c7840173ec28e56c6a1a8418bc9fada85f 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -39,15 +39,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,16 +76,35 @@ 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)
 {
     // TODO
     return 0;
@@ -83,13 +122,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
@@ -108,8 +155,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 +166,33 @@ 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__
 
 // Emit a beeeeeep
 void wxBell()
 {
-    // TODO
+    SysBeep(30);
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-    // TODO
-    return 0;
+       long theSystem ;
+  Gestalt(gestaltSystemVersion, &theSystem) ;
+  *minorVsn = (theSystem & 0xFF ) ;
+  *majorVsn = (theSystem >> 8 ) ; // are there x-platform conventions ?
+  return wxMACINTOSH;
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
@@ -208,7 +263,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
   if (succ)
   {
     *value = (int)strtol(s, NULL, 10);
-    delete[] s; 
+    delete[] s;
     return TRUE;
   }
   else return FALSE;
@@ -239,7 +294,7 @@ void wxEndBusyCursor()
 {
   if (wxBusyCursorCount == 0)
     return;
-    
+
   wxBusyCursorCount --;
   if (wxBusyCursorCount == 0)
   {
@@ -258,7 +313,7 @@ void wxEndBusyCursor()
 bool wxIsBusy()
 {
   return (wxBusyCursorCount > 0);
-}    
+}
 
 #ifndef __UNIX__
 wxString wxMacFindFolder( short                                        vol,
@@ -268,13 +323,13 @@ wxString wxMacFindFolder( short                                   vol,
        short           vRefNum  ;
        long            dirID ;
        wxString strDir ;
-               
+
        if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
        {
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {
-                       strDir = wxMacFSSpec2UnixFilename( &file ) + "/" ;
+                       strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
                }
        }
        return strDir ;
@@ -300,7 +355,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt ;
-    
+
     GetMouse( &pt ) ;
     LocalToGlobal( &pt ) ;
     *x = pt.h ;
@@ -316,7 +371,7 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
-       Rect globRect ; 
+       Rect globRect ;
        SetRect(&globRect, -32760, -32760, 32760, 32760);
        GDHandle        theMaxDevice;
 
@@ -324,7 +379,7 @@ int wxDisplayDepth()
        theMaxDevice = GetMaxDevice(&globRect);
        if (theMaxDevice != nil)
                theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
-               
+
        return theDepth ;
 }
 
@@ -335,7 +390,7 @@ void wxDisplaySize(int *width, int *height)
        GetQDGlobalsScreenBits( &screenBits );
 
     *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    *height = screenBits.bounds.bottom - screenBits.bounds.top ; 
+    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
 #if TARGET_CARBON
        SInt16 mheight ;
        GetThemeMenuBarHeight( &mheight ) ;
@@ -350,6 +405,17 @@ void wxDisplaySizeMM(int *width, int *height)
    wxDisplaySize(width, height);
 }
 
+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.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+}
+
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
     return wxGenericFindWindowAtPoint(pt);