X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..61cca9d24ee3f935f2581e3cfb894e46181290e6:/src/mac/carbon/utils.cpp?ds=sidebyside diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 940bdc21bc..6723ed2ad4 100644 --- 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/mac/uma.h" #include @@ -26,7 +27,16 @@ #include #include -// 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 @@ -40,6 +50,14 @@ bool wxGetUserId(char *buf, int maxSize) 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) { @@ -108,6 +126,7 @@ void wxFatalError(const wxString& msg, const wxString& title) { // TODO } +#endif // !__UNIX__ // Emit a beeeeeep void wxBell() @@ -196,7 +215,9 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c } #endif // wxUSE_RESOURCES -static int wxBusyCursorCount = 0; +int wxBusyCursorCount = 0; +extern CursHandle gMacCurrentCursor ; +CursHandle gMacStoredActiveCursor = NULL ; // Set the cursor to the busy cursor for all windows void wxBeginBusyCursor(wxCursor *cursor) @@ -204,7 +225,8 @@ void wxBeginBusyCursor(wxCursor *cursor) wxBusyCursorCount ++; if (wxBusyCursorCount == 1) { - // TODO + gMacStoredActiveCursor = gMacCurrentCursor ; + ::SetCursor( *::GetCursor( watchCursor ) ) ; } else { @@ -221,7 +243,14 @@ void wxEndBusyCursor() wxBusyCursorCount --; if (wxBusyCursorCount == 0) { - // TODO + if ( gMacStoredActiveCursor ) + ::SetCursor( *gMacStoredActiveCursor ) ; + else + { + Cursor MacArrow ; + ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ; + } + gMacStoredActiveCursor = NULL ; } } @@ -231,11 +260,34 @@ bool wxIsBusy() 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; } +#endif // Check whether this window wants to process messages, e.g. Stop button // in long calculations. @@ -247,26 +299,58 @@ bool wxCheckForInterrupt(wxWindow *wnd) void wxGetMousePosition( int* x, int* y ) { - // TODO + Point pt ; + + GetMouse( &pt ) ; + LocalToGlobal( &pt ) ; + *x = pt.h ; + *y = pt.v ; }; // Return TRUE if we have a colour display bool wxColourDisplay() { - // TODO return TRUE; } // Returns depth of screen int wxDisplayDepth() { - // TODO - return 0; + Rect globRect ; + SetRect(&globRect, -32760, -32760, 32760, 32760); + GDHandle theMaxDevice; + + int theDepth = 8; + theMaxDevice = GetMaxDevice(&globRect); + if (theMaxDevice != nil) + theDepth = (**(**theMaxDevice).gdPMap).pixelSize; + + return theDepth ; } // Get size of display void wxDisplaySize(int *width, int *height) { - // TODO + 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); +}