X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5a9c66398f7a46f8682d1204edd98d09e88b283..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index d03afaae01..cf7d76b624 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -33,18 +33,20 @@ #include #include -#ifdef __DARWIN__ -# include "MoreFilesX.h" -#else -# include "MoreFiles.h" -# include "MoreFilesExtras.h" -#endif +#include "MoreFilesX.h" #ifndef __DARWIN__ #include #include #endif +#if TARGET_API_MAC_OSX +#include +#else +#include +#include +#endif + #include #include #include @@ -80,6 +82,9 @@ static int DoGetOSVersion(int *majorVsn, int *minorVsn) #endif } + +#if wxUSE_BASE + // ---------------------------------------------------------------------------- // debugging support // ---------------------------------------------------------------------------- @@ -220,7 +225,6 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning() #endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400) -#if wxUSE_BASE #ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X @@ -336,24 +340,27 @@ long wxGetFreeMemory() return FreeMem() ; } -void wxUsleep(unsigned long milliseconds) +#ifndef __DARWIN__ + +void wxMicroSleep(unsigned long microseconds) { - // TODO remove if we don't encounter any other problemsy - /* - clock_t start = clock() ; - do - { - YieldToAnyThread() ; - } while( clock() - start < milliseconds / 1000.0 * CLOCKS_PER_SEC ) ; - */ - wxThread::Sleep( milliseconds ) ; + AbsoluteTime wakeup = AddDurationToAbsolute( microseconds * durationMicrosecond , UpTime()); + MPDelayUntil( & wakeup); +} + +void wxMilliSleep(unsigned long milliseconds) +{ + AbsoluteTime wakeup = AddDurationToAbsolute( milliseconds, UpTime()); + MPDelayUntil( & wakeup); } void wxSleep(int nSecs) { - wxUsleep(1000*nSecs); + wxMilliSleep(1000*nSecs); } +#endif + // Consume all events until no more left void wxFlushEvents() { @@ -512,18 +519,12 @@ wxString wxMacFindFolder( short vol, OSType folderType, Boolean createFolder) { - short vRefNum ; - long dirID ; + FSRef fsRef ; wxString strDir ; - if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr) - { - FSSpec file ; - if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr ) - { - strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ; - } - } + if ( FSFindFolder( vol, folderType, createFolder, &fsRef) == noErr) + strDir = wxMacFSRefToPath( &fsRef ) + wxFILE_SEP_PATH ; + return strDir ; } @@ -655,20 +656,28 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree) p = p + wxT(":") ; - 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 ) ; - } + OSErr err = noErr ; + + FSRef fsRef ; + err = wxMacPathToFSRef( p , &fsRef ) ; + if ( noErr == err ) + { + FSVolumeRefNum vRefNum ; + err = FSGetVRefNum( &fsRef , &vRefNum ) ; + if ( noErr == err ) + { + UInt64 freeBytes , totalBytes ; + err = FSGetVInfo( vRefNum , NULL , &freeBytes , &totalBytes ) ; + if ( noErr == err ) + { + if ( pTotal ) + *pTotal = wxLongLong( totalBytes ) ; + if ( pFree ) + *pFree = wxLongLong( freeBytes ) ; + } + } } - + return err == noErr ; } #endif // !__DARWIN__ @@ -1423,12 +1432,23 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in // Control Access Support // ---------------------------------------------------------------------------- -OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) +void wxMacControl::Dispose() +{ + ::DisposeControl( m_controlRef ) ; + m_controlRef = NULL ; +} + +void wxMacControl::SetReference( SInt32 data ) +{ + SetControlReference( m_controlRef , data ) ; +} + +OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const { return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ; } -OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) +OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const { return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ; } @@ -1472,5 +1492,408 @@ void wxMacControl::Flash( ControlPartCode part , UInt32 ticks ) HiliteControl( m_controlRef , kControlNoPart ) ; } +SInt32 wxMacControl::GetValue() const +{ + return ::GetControl32BitValue( m_controlRef ) ; +} + +SInt32 wxMacControl::GetMaximum() const +{ + return ::GetControl32BitMaximum( m_controlRef ) ; +} + +SInt32 wxMacControl::GetMinimum() const +{ + return ::GetControl32BitMinimum( m_controlRef ) ; +} + +void wxMacControl::SetValue( SInt32 v ) +{ + ::SetControl32BitValue( m_controlRef , v ) ; +} + +void wxMacControl::SetMinimum( SInt32 v ) +{ + ::SetControl32BitMinimum( m_controlRef , v ) ; +} + +void wxMacControl::SetMaximum( SInt32 v ) +{ + ::SetControl32BitMaximum( m_controlRef , v ) ; +} + +void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) +{ + ::SetControl32BitMinimum( m_controlRef , minimum ) ; + ::SetControl32BitMaximum( m_controlRef , maximum ) ; + ::SetControl32BitValue( m_controlRef , value ) ; +} + +OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart ) +{ + return SetKeyboardFocus( GetControlOwner( m_controlRef ) , + m_controlRef , focusPart ) ; +} + +bool wxMacControl::HasFocus() const +{ + ControlRef control ; + GetKeyboardFocus( GetUserFocusWindow() , &control ) ; + return control == m_controlRef ; +} + +bool wxMacControl::NeedsFocusRect() const +{ + return false ; +} + +void wxMacControl::VisibilityChanged(bool shown) +{ +} + +void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) +{ + m_font = font ; + ControlFontStyleRec fontStyle; + if ( font.MacGetThemeFontID() != kThemeCurrentPortFont ) + { + switch( font.MacGetThemeFontID() ) + { + case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ; + case 109 /*mini font */ : fontStyle.font = -5 ; break ; + case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ; + default : fontStyle.font = kControlFontBigSystemFont ; break ; + } + fontStyle.flags = kControlUseFontMask ; + } + else + { + fontStyle.font = font.MacGetFontNum() ; + fontStyle.style = font.MacGetFontStyle() ; + fontStyle.size = font.MacGetFontSize() ; + fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ; + } + + fontStyle.just = teJustLeft ; + fontStyle.flags |= kControlUseJustMask ; + if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL ) + fontStyle.just = teJustCenter ; + else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT ) + fontStyle.just = teJustRight ; + + + // we only should do this in case of a non-standard color, as otherwise 'disabled' controls + // won't get grayed out by the system anymore + + if ( foreground != *wxBLACK ) + { + fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ; + fontStyle.flags |= kControlUseForeColorMask ; + } + + ::SetControlFontStyle( m_controlRef , &fontStyle ); +} + +void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) ) +{ + // TODO + // setting up a color proc is not recommended anymore +} + +void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum ) +{ + ::SetControl32BitMinimum( m_controlRef , minimum ) ; + ::SetControl32BitMaximum( m_controlRef , maximum ) ; +} + +short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ) +{ + return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ) ; +} + +void wxMacControl::SetActionProc( ControlActionUPP actionProc ) +{ + SetControlAction( m_controlRef , actionProc ) ; +} + +void wxMacControl::SetViewSize( SInt32 viewSize ) +{ + SetControlViewSize(m_controlRef , viewSize ) ; +} + +SInt32 wxMacControl::GetViewSize() const +{ + return GetControlViewSize( m_controlRef ) ; +} + +bool wxMacControl::IsVisible() const +{ + return IsControlVisible( m_controlRef ) ; +} + +void wxMacControl::SetVisibility( bool visible , bool redraw ) +{ + SetControlVisibility( m_controlRef , visible , redraw ) ; +} + +bool wxMacControl::IsEnabled() const +{ +#if TARGET_API_MAC_OSX + return IsControlEnabled( m_controlRef ) ; +#else + return IsControlActive( m_controlRef ) ; +#endif +} + +bool wxMacControl::IsActive() const +{ + return IsControlActive( m_controlRef ) ; +} + +void wxMacControl::Enable( bool enable ) +{ +#if TARGET_API_MAC_OSX + if ( enable ) + EnableControl( m_controlRef ) ; + else + DisableControl( m_controlRef ) ; +#else + if ( enable ) + ActivateControl( m_controlRef ) ; + else + DeactivateControl( m_controlRef ) ; +#endif +} + +void wxMacControl::SetDrawingEnabled( bool enable ) +{ +#if TARGET_API_MAC_OSX + HIViewSetDrawingEnabled( m_controlRef , enable ) ; +#endif +} + +bool wxMacControl::GetNeedsDisplay() const +{ +#if TARGET_API_MAC_OSX + return HIViewGetNeedsDisplay( m_controlRef ) ; +#else + return false ; +#endif +} + +void wxMacControl::SetNeedsDisplay( bool needsDisplay , RgnHandle where ) +{ +#if TARGET_API_MAC_OSX + if ( where != NULL ) + HIViewSetNeedsDisplayInRegion( m_controlRef , where , needsDisplay ) ; + else + HIViewSetNeedsDisplay( m_controlRef , needsDisplay ) ; +#endif +} + +void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) +{ +#if TARGET_API_MAC_OSX + HIPoint hiPoint ; + hiPoint.x = pt->x ; + hiPoint.y = pt->y ; + HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef ) ; + pt->x = (int)hiPoint.x ; + pt->y = (int)hiPoint.y ; +#endif +} + +void wxMacControl::SetRect( Rect *r ) +{ +#if TARGET_API_MAC_OSX + //A HIRect is actually a CGRect on OSX - which consists of two structures - + //CGPoint and CGSize, which have two floats each + HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } } ; + HIViewSetFrame ( m_controlRef , &hir ) ; +#else + SetControlBounds( m_controlRef , r ) ; +#endif + +} + +void wxMacControl::GetRect( Rect *r ) +{ + GetControlBounds( m_controlRef , r ) ; +} + +void wxMacControl::GetRectInWindowCoords( Rect *r ) +{ + UMAGetControlBoundsInWindowCoords( m_controlRef , r ) ; +} + +void wxMacControl::GetBestRect( Rect *r ) +{ + short baselineoffset ; + GetBestControlRect( m_controlRef , r , &baselineoffset ) ; +} + +void wxMacControl::SetTitle( const wxString &title ) +{ + wxFontEncoding encoding; + + if ( m_font.Ok() ) + encoding = m_font.GetEncoding(); + else + encoding = wxFont::GetDefaultEncoding(); + + UMASetControlTitle( m_controlRef , title , encoding ) ; +} + +void wxMacControl::GetFeatures( UInt32 * features ) +{ + GetControlFeatures( m_controlRef , features ) ; +} + +OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) +{ + return GetControlRegion( m_controlRef , partCode , region ) ; +} + +OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other ) +{ +#if TARGET_API_MAC_OSX + return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow, + (other != NULL) ? other->m_controlRef : NULL) ; +#else + return 0 ; +#endif +} + + +#if TARGET_API_MAC_OSX +// SetNeedsDisplay would not invalidate the children +static void InvalidateControlAndChildren( HIViewRef control ) +{ + HIViewSetNeedsDisplay( control , true ) ; + UInt16 childrenCount = 0 ; + OSStatus err = CountSubControls( control , &childrenCount ) ; + if ( err == errControlIsNotEmbedder ) + return ; + wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; + + for ( UInt16 i = childrenCount ; i >=1 ; --i ) + { + HIViewRef child ; + err = GetIndexedSubControl( control , i , & child ) ; + if ( err == errControlIsNotEmbedder ) + return ; + InvalidateControlAndChildren( child ) ; + } +} +#endif + +void wxMacControl::InvalidateWithChildren() +{ +#if TARGET_API_MAC_OSX + InvalidateControlAndChildren( m_controlRef ) ; +#endif +} + +void wxMacControl::ScrollRect( const wxRect &r , int dx , int dy ) +{ +#if TARGET_API_MAC_OSX + HIRect scrollarea = CGRectMake( r.x , r.y , r.width , r.height) ; + HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ) ; +#endif +} + + +// SetNeedsDisplay would not invalidate the children + +// +// Databrowser +// + +OSStatus wxMacControl::SetSelectionFlags( DataBrowserSelectionFlags options ) +{ + return SetDataBrowserSelectionFlags( m_controlRef , options ) ; +} + +OSStatus wxMacControl::AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc, + DataBrowserTableViewColumnIndex position ) +{ + return AddDataBrowserListViewColumn( m_controlRef , columnDesc, position ) ; +} + +OSStatus wxMacControl::AutoSizeListViewColumns() +{ + return AutoSizeDataBrowserListViewColumns(m_controlRef) ; +} + +OSStatus wxMacControl::SetHasScrollBars( bool horiz , bool vert ) +{ + return SetDataBrowserHasScrollBars( m_controlRef , horiz , vert ) ; +} + +OSStatus wxMacControl::SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle ) +{ + return SetDataBrowserTableViewHiliteStyle( m_controlRef , hiliteStyle ) ; +} + +OSStatus wxMacControl::SetListViewHeaderBtnHeight(UInt16 height) +{ + return SetDataBrowserListViewHeaderBtnHeight( m_controlRef ,height ) ; +} + +OSStatus wxMacControl::SetCallbacks(const DataBrowserCallbacks * callbacks) +{ + return SetDataBrowserCallbacks( m_controlRef , callbacks ) ; +} + +OSStatus wxMacControl::UpdateItems( DataBrowserItemID container, UInt32 numItems, + const DataBrowserItemID* items, + DataBrowserPropertyID preSortProperty, + DataBrowserPropertyID propertyID ) +{ + return UpdateDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty, propertyID ) ; +} + +bool wxMacControl::IsItemSelected( DataBrowserItemID item ) +{ + return IsDataBrowserItemSelected( m_controlRef , item ) ; +} + +OSStatus wxMacControl::AddItems( DataBrowserItemID container, UInt32 numItems, + const DataBrowserItemID* items, + DataBrowserPropertyID preSortProperty ) +{ + return AddDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ; +} + +OSStatus wxMacControl::RemoveItems( DataBrowserItemID container, UInt32 numItems, + const DataBrowserItemID* items, + DataBrowserPropertyID preSortProperty ) +{ + return RemoveDataBrowserItems( m_controlRef , container, numItems, items, preSortProperty ) ; +} + +OSStatus wxMacControl::RevealItem( DataBrowserItemID item, + DataBrowserPropertyID propertyID, + DataBrowserRevealOptions options ) +{ + return RevealDataBrowserItem( m_controlRef , item , propertyID , options ) ; +} + +OSStatus wxMacControl::SetSelectedItems(UInt32 numItems, + const DataBrowserItemID * items, + DataBrowserSetOption operation ) +{ + return SetDataBrowserSelectedItems( m_controlRef , numItems , items, operation ) ; +} + +// +// Tab Control +// + +OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable ) +{ + return ::SetTabEnabled( m_controlRef , tabNo , enable ) ; +} + #endif // wxUSE_GUI