My iconv (GLIBC 2.2) uses char** as the second

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 817138cb63f2d440462b7e347bb721103d613970..6723ed2ad4432cf16167aa1c8660cffc3372523a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -18,6 +18,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"

+#include "wx/mac/uma.h"

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 


@@ -26,7 +27,16 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-// Get full hostname (eg. DoDo.BSn-Germany.crg.de)
+#ifndef __UNIX__
+// defined in unix/utilsunx.cpp for Mac OS X
+
+// get full hostname (with domain name if possible)
+bool wxGetFullHostName(wxChar *buf, int maxSize)
+{
+    return wxGetHostName(buf, maxSize);
+}
+
+// Get hostname only (without domain name)

 bool wxGetHostName(char *buf, int maxSize)
 {
     // TODO
 bool wxGetHostName(char *buf, int maxSize)
 {
     // TODO


@@ -40,6 +50,14 @@ bool wxGetUserId(char *buf, int maxSize)
     return FALSE;
 }
 
     return FALSE;
 }
 

+const wxChar* wxGetHomeDir(wxString *pstr)
+{
+       *pstr = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+       return pstr->c_str() ;
+}
+
+
+

 // Get user name e.g. AUTHOR
 bool wxGetUserName(char *buf, int maxSize)
 {
 // Get user name e.g. AUTHOR
 bool wxGetUserName(char *buf, int maxSize)
 {


@@ -108,6 +126,7 @@ void wxFatalError(const wxString& msg, const wxString& title)
 {
     // TODO
 }
 {
     // TODO
 }

+#endif // !__UNIX__

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -227,7 +246,10 @@ void wxEndBusyCursor()
     if ( gMacStoredActiveCursor )
        ::SetCursor( *gMacStoredActiveCursor ) ;
     else
     if ( gMacStoredActiveCursor )
        ::SetCursor( *gMacStoredActiveCursor ) ;
     else

-       ::SetCursor( &qd.arrow ) ;
+    {
+               Cursor          MacArrow ;
+       ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ;
+    }

        gMacStoredActiveCursor = NULL ;
   }
 }
        gMacStoredActiveCursor = NULL ;
   }
 }


@@ -238,11 +260,34 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }    
 
   return (wxBusyCursorCount > 0);
 }    
 

+#ifndef __UNIX__
+wxString wxMacFindFolder( short                                        vol,
+                                                                OSType                                 folderType,
+                                                                Boolean                                createFolder)
+{
+       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 ) + "/" ;
+               }
+       }
+       return strDir ;
+}
+#endif
+
+#ifndef __UNIX__

 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
     return NULL;
 }

+#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.


@@ -271,23 +316,41 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

-               // get max pixel depth
-               CGrafPtr port ;
-               GetCWMgrPort( &port ) ; 
-               GDHandle maxDevice ;
+       Rect globRect ; 
+       SetRect(&globRect, -32760, -32760, 32760, 32760);
+       GDHandle        theMaxDevice;
+
+       int theDepth = 8;
+       theMaxDevice = GetMaxDevice(&globRect);
+       if (theMaxDevice != nil)
+               theDepth = (**(**theMaxDevice).gdPMap).pixelSize;

                
                

-               maxDevice = GetMaxDevice( &port->portRect ) ;
-               if ( maxDevice )
-                       return (**((**maxDevice).gdPMap)).pixelSize ;
-               else
-                       return 8 ; 
+       return theDepth ;

 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-    *width = qd.screenBits.bounds.right - qd.screenBits.bounds.left  ;
-    *height = qd.screenBits.bounds.bottom - qd.screenBits.bounds.top ; 
-    *height -= LMGetMBarHeight() ;
+       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
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+   wxDisplaySize(width, height);

 }
 
 }
 

+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}