merge with latest sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/utils.cpp

@@ -18,6 +18,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/mac/uma.h"
 
 #include <ctype.h>
 
@@ -26,7 +27,13 @@
 #include <string.h>
 #include <stdarg.h>
 
-// Get full hostname (eg. DoDo.BSn-Germany.crg.de)
+// 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
@@ -227,7 +234,10 @@ void wxEndBusyCursor()
     if ( gMacStoredActiveCursor )
     	::SetCursor( *gMacStoredActiveCursor ) ;
     else
-    	::SetCursor( &qd.arrow ) ;
+    {
+		Cursor 		MacArrow ;
+    	::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ;
+    }
    	gMacStoredActiveCursor = NULL ;
   }
 }
@@ -238,6 +248,25 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }    
 
+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 ;
+}
+
 char *wxGetUserHome (const wxString& user)
 {
     // TODO
@@ -271,23 +300,32 @@ bool wxColourDisplay()
 // 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)
 {
-    *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
 }