X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cce68eaab1559c5c21dd0ce544090cc18dc8398..bbd321ffc2d4e7f9e45c72af9e3f824fa9ccda51:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 0fce7375e4..d491c42b04 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -6,21 +6,26 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #include "wx/utils.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/app.h" + #if wxUSE_GUI + #include "wx/toplevel.h" + #include "wx/font.h" + #endif +#endif + #include "wx/apptrait.h" #if wxUSE_GUI #include "wx/mac/uma.h" - #include "wx/font.h" - #include "wx/toplevel.h" -#else - #include "wx/intl.h" #endif #include @@ -62,34 +67,27 @@ #endif #endif -// --------------------------------------------------------------------------- -// code used in both base and GUI compilation -// --------------------------------------------------------------------------- +#if wxUSE_BASE // our OS version is the same in non GUI and GUI cases -static int DoGetOSVersion(int *majorVsn, int *minorVsn) +wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn) { - long theSystem; - - // are there x-platform conventions ? - + SInt32 theSystem; Gestalt(gestaltSystemVersion, &theSystem); - if (minorVsn != NULL) - *minorVsn = (theSystem & 0xFF); - if (majorVsn != NULL) + if ( majorVsn != NULL ) *majorVsn = (theSystem >> 8); -#ifdef __DARWIN__ - return wxMAC_DARWIN; + if ( minorVsn != NULL ) + *minorVsn = (theSystem & 0xFF); + +#if defined( __DARWIN__ ) + return wxOS_MAC_OSX_DARWIN; #else - return wxMAC; + return wxOS_MAC_OS; #endif } - -#if wxUSE_BASE - // ---------------------------------------------------------------------------- // debugging support // ---------------------------------------------------------------------------- @@ -174,7 +172,7 @@ Boolean IsMetroNubInstalled() kMetroNubUserAPIVersion <= block->apiHiVersion) { // success! - gMetroNubEntry = block; + gMetroNubEntry = block; } } } @@ -325,18 +323,6 @@ bool wxShutdown(wxShutdownFlags wFlags) return false; } -wxPowerType wxGetPowerType() -{ - // TODO - return wxPOWER_UNKNOWN; -} - -wxBatteryState wxGetBatteryState() -{ - // TODO - return wxBATTERY_UNKNOWN_STATE; -} - // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX) wxMemorySize wxGetFreeMemory() { @@ -374,37 +360,22 @@ void wxFlushEvents() // Emit a beeeeeep void wxBell() { +#ifndef __LP64__ SysBeep(30); +#endif } -wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo() -{ - static wxToolkitInfo info; - - info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor); - info.name = _T("wxBase"); - - return info; -} #endif // wxUSE_BASE #if wxUSE_GUI -wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() +wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const { - static wxToolkitInfo info; - - info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor); - info.shortName = _T("mac"); - info.name = _T("wxMac"); + // We suppose that toolkit version is the same as OS version under Mac + wxGetOsVersion(verMaj, verMin); -#ifdef __WXUNIVERSAL__ - info.shortName << _T("univ"); - info.name << _T("/wxUniversal"); -#endif - - return info; + return wxPORT_MAC; } // Reading and writing resources (eg WIN.INI, .Xdefaults) @@ -560,9 +531,12 @@ bool wxCheckForInterrupt(wxWindow *wnd) void wxGetMousePosition( int* x, int* y ) { Point pt; - +#if wxMAC_USE_CORE_GRAPHICS + GetGlobalMouse(&pt); +#else GetMouse( &pt ); LocalToGlobal( &pt ); +#endif *x = pt.h; *y = pt.v; }; @@ -576,21 +550,32 @@ bool wxColourDisplay() // Returns depth of screen int wxDisplayDepth() { + int theDepth = 8; +#if wxMAC_USE_CORE_GRAPHICS + theDepth = (int) CGDisplayBitsPerPixel(CGMainDisplayID()); +#else Rect globRect; SetRect(&globRect, -32760, -32760, 32760, 32760); GDHandle theMaxDevice; - int theDepth = 8; theMaxDevice = GetMaxDevice(&globRect); if (theMaxDevice != NULL) theDepth = (**(**theMaxDevice).gdPMap).pixelSize; - +#endif return theDepth; } // Get size of display void wxDisplaySize(int *width, int *height) { +#if wxMAC_USE_CORE_GRAPHICS + // TODO adapt for multi-displays + CGRect bounds = CGDisplayBounds(CGMainDisplayID()); + if ( width ) + *width = (int)bounds.size.width ; + if ( height ) + *height = (int)bounds.size.height; +#else BitMap screenBits; GetQDGlobalsScreenBits( &screenBits ); @@ -599,6 +584,7 @@ void wxDisplaySize(int *width, int *height) if (height != NULL) *height = screenBits.bounds.bottom - screenBits.bounds.top; +#endif } void wxDisplaySizeMM(int *width, int *height) @@ -616,8 +602,20 @@ void wxDisplaySizeMM(int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height) { +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + HIRect bounds ; + HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal, + &bounds); + if ( x ) + *x = bounds.origin.x; + if ( y ) + *y = bounds.origin.y; + if ( width ) + *width = bounds.size.width; + if ( height ) + *height = bounds.size.height; +#else Rect r; - GetAvailableWindowPositioningBounds( GetMainDevice() , &r ); if ( x ) *x = r.left; @@ -627,6 +625,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) *width = r.right - r.left; if ( height ) *height = r.bottom - r.top; +#endif } wxWindow* wxFindWindowAtPoint(const wxPoint& pt) @@ -744,7 +743,7 @@ void wxMacWakeUp() } if ( err == noErr ) { - + if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) ) return; s_wakeupEvent.SetCurrentTime(); @@ -822,19 +821,24 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in // Control Access Support // ---------------------------------------------------------------------------- +IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxObject ) + +wxMacControl::wxMacControl() +{ + Init(); +} + wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl ) { Init(); m_peer = peer; m_isRootControl = isRootControl; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); } wxMacControl::wxMacControl( wxWindow* peer , ControlRef control ) { Init(); m_peer = peer; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); m_controlRef = control; } @@ -842,7 +846,6 @@ wxMacControl::wxMacControl( wxWindow* peer , WXWidget control ) { Init(); m_peer = peer; - m_isCompositing = peer->MacGetTopLevelWindow()->MacUsesCompositing(); m_controlRef = (ControlRef) control; } @@ -855,17 +858,20 @@ void wxMacControl::Init() m_peer = NULL; m_controlRef = NULL; m_needsFocusRect = false; - m_isCompositing = false; m_isRootControl = false; } void wxMacControl::Dispose() { - ::DisposeControl( m_controlRef ); + wxASSERT_MSG( m_controlRef != NULL , wxT("Control Handle already NULL, Dispose called twice ?") ); + wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") ); + + // we cannot check the ref count here anymore, as autorelease objects might delete their refs later + CFRelease(m_controlRef); m_controlRef = NULL; } -void wxMacControl::SetReference( SInt32 data ) +void wxMacControl::SetReference( URefCon data ) { SetControlReference( m_controlRef , data ); } @@ -1059,7 +1065,11 @@ void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum ) short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ) { +#ifndef __LP64__ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers ); +#else + return 0; +#endif } void wxMacControl::SetActionProc( ControlActionUPP actionProc ) @@ -1103,72 +1113,28 @@ bool wxMacControl::IsActive() const 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 } -#if TARGET_API_MAC_OSX bool wxMacControl::GetNeedsDisplay() const { -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - return HIViewGetNeedsDisplay( m_controlRef ); - } - else -#endif - { - if ( !IsVisible() ) - return false; - - Rect controlBounds; - GetControlBounds( m_controlRef, &controlBounds ); - RgnHandle rgn = NewRgn(); - GetWindowRegion ( GetControlOwner( m_controlRef ) , kWindowUpdateRgn , rgn ); - Boolean intersect = RectInRgn ( &controlBounds , rgn ); - DisposeRgn( rgn ); - - return intersect; - } + return HIViewGetNeedsDisplay( m_controlRef ); } -#endif void wxMacControl::SetNeedsDisplay( RgnHandle where ) { if ( !IsVisible() ) return; -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - HIViewSetNeedsDisplayInRegion( m_controlRef , where , true ); - } - else -#endif - { - Rect controlBounds; - GetControlBounds( m_controlRef, &controlBounds ); - RgnHandle update = NewRgn(); - CopyRgn( where , update ); - OffsetRgn( update , controlBounds.left , controlBounds.top ); - InvalWindowRgn( GetControlOwner( m_controlRef) , update ); - } + HIViewSetNeedsDisplayInRegion( m_controlRef , where , true ); } void wxMacControl::SetNeedsDisplay( Rect* where ) @@ -1176,133 +1142,41 @@ void wxMacControl::SetNeedsDisplay( Rect* where ) if ( !IsVisible() ) return; -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) + if ( where != NULL ) { - if ( where != NULL ) - { - RgnHandle update = NewRgn(); - RectRgn( update , where ); - HIViewSetNeedsDisplayInRegion( m_controlRef , update , true ); - DisposeRgn( update ); - } - else - HIViewSetNeedsDisplay( m_controlRef , true ); + RgnHandle update = NewRgn(); + RectRgn( update , where ); + HIViewSetNeedsDisplayInRegion( m_controlRef , update , true ); + DisposeRgn( update ); } else -#endif - { - Rect controlBounds; - - GetControlBounds( m_controlRef, &controlBounds ); - if ( where ) - { - Rect whereLocal = *where; - OffsetRect( &whereLocal , controlBounds.left , controlBounds.top ); - SectRect( &controlBounds , &whereLocal, &controlBounds ); - } - - InvalWindowRect( GetControlOwner( m_controlRef) , &controlBounds ); - } + HIViewSetNeedsDisplay( m_controlRef , true ); } void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to ) { -#if TARGET_API_MAC_OSX - if ( from->m_peer->MacGetTopLevelWindow()->MacUsesCompositing() ) - { - HIPoint hiPoint; + 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; - } - else -#endif - { - Rect fromRect, toRect; - - GetControlBounds( from->m_controlRef , &fromRect ); - GetControlBounds( to->m_controlRef , &toRect ); - if ( from->m_isRootControl ) - fromRect.left = fromRect.top = 0; - if ( to->m_isRootControl ) - toRect.left = toRect.top = 0; - - pt->x = pt->x + fromRect.left - toRect.left; - pt->y = pt->y + fromRect.top - toRect.top; - } + 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; } void wxMacControl::SetRect( Rect *r ) { -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { //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 ); // eventuall we might have to do a SetVisibility( false , true ); // before and a SetVisibility( true , true ); after - } - else -#endif - { - bool vis = IsVisible(); - if ( vis ) - { - Rect former; - GetControlBounds( m_controlRef , &former ); - InvalWindowRect( GetControlOwner( m_controlRef ) , &former ); - } - - Rect controlBounds = *r; - - // since the rect passed in is always (even in non-compositing) relative - // to the (native) parent, we have to adjust to window relative here - wxMacControl* parent = m_peer->GetParent()->GetPeer(); - if ( !parent->m_isRootControl ) - { - Rect superRect; - GetControlBounds( parent->m_controlRef , &superRect ); - OffsetRect( &controlBounds , superRect.left , superRect.top ); - } - - SetControlBounds( m_controlRef , &controlBounds ); - if ( vis ) - InvalWindowRect( GetControlOwner( m_controlRef ) , &controlBounds ); - } } void wxMacControl::GetRect( Rect *r ) { GetControlBounds( m_controlRef , r ); - if ( !m_isCompositing ) - { - // correct the case of the root control - if ( m_isRootControl ) - { - WindowRef wr = GetControlOwner( m_controlRef ); - GetWindowBounds( wr , kWindowContentRgn , r ); - r->right -= r->left; - r->bottom -= r->top; - r->left = 0; - r->top = 0; - } - else - { - wxMacControl* parent = m_peer->GetParent()->GetPeer(); - if ( !parent->m_isRootControl ) - { - Rect superRect; - GetControlBounds( parent->m_controlRef , &superRect ); - OffsetRect( r , -superRect.left , -superRect.top ); - } - } - } } void wxMacControl::GetRectInWindowCoords( Rect *r ) @@ -1337,18 +1211,6 @@ void wxMacControl::GetFeatures( UInt32 * features ) OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region ) { OSStatus err = GetControlRegion( m_controlRef , partCode , region ); - if ( !m_isCompositing ) - { - if ( !m_isRootControl ) - { - Rect r; - - GetControlBounds(m_controlRef, &r ); - if ( !EmptyRgn( region ) ) - OffsetRgn( region , -r.left , -r.top ); - } - } - return err; } @@ -1398,44 +1260,24 @@ void wxMacControl::ScrollRect( wxRect *r , int dx , int dy ) { wxASSERT( r != NULL ); -#if TARGET_API_MAC_OSX - if ( m_isCompositing ) - { - HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height); - HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ); - } - else -#endif - { - Rect bounds; - - GetControlBounds( m_controlRef , &bounds ); - bounds.left += r->x; - bounds.top += r->y; - bounds.bottom = bounds.top + r->height; - bounds.right = bounds.left + r->width; - wxMacWindowClipper clip( m_peer ); - RgnHandle updateRgn = NewRgn(); - ::ScrollRect( &bounds , dx , dy , updateRgn ); - InvalWindowRgn( GetControlOwner( m_controlRef ) , updateRgn ); - DisposeRgn( updateRgn ); - } + HIRect scrollarea = CGRectMake( r->x , r->y , r->width , r->height); + HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy ); } OSType wxMacCreator = 'WXMC'; OSType wxMacControlProperty = 'MCCT'; -void wxMacControl::SetReferenceInNativeControl() +void wxMacControl::SetReferenceInNativeControl() { void * data = this; verify_noerr( SetControlProperty ( m_controlRef , wxMacCreator,wxMacControlProperty, sizeof(data), &data ) ); } -wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) +wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) { wxMacControl* ctl = NULL; - UInt32 actualSize; + ByteCount actualSize; if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) , &actualSize , &ctl ) == noErr ) { @@ -1451,13 +1293,15 @@ wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) // basing on DataBrowserItemIDs // +IMPLEMENT_ABSTRACT_CLASS( wxMacDataBrowserControl , wxMacControl ) + pascal void wxMacDataBrowserControl::DataBrowserItemNotificationProc( ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData ) { - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { ctl->ItemNotification(itemID, message, itemData); @@ -1472,8 +1316,7 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc( Boolean changeValue ) { OSStatus err = errDataBrowserPropertyNotSupported; - - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { err = ctl->GetSetItemData(itemID, property, itemData, changeValue); @@ -1482,12 +1325,12 @@ pascal OSStatus wxMacDataBrowserControl::DataBrowserGetSetItemDataProc( } pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc( - ControlRef browser, - DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) + ControlRef browser, + DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) { - wxMacDataBrowserControl* ctl = dynamic_cast( wxMacControl::GetReferenceFromNativeControl( browser ) ); + wxMacDataBrowserControl* ctl = wxDynamicCast(wxMacControl::GetReferenceFromNativeControl( browser ), wxMacDataBrowserControl); if ( ctl != 0 ) { return ctl->CompareItems(itemOneID, itemTwoID, sortProperty); @@ -1500,7 +1343,7 @@ DataBrowserItemNotificationUPP gDataBrowserItemNotificationUPP = NULL; DataBrowserItemCompareUPP gDataBrowserItemCompareUPP = NULL; wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style) : wxMacControl( peer ) -{ +{ Rect bounds = wxMacGetBoundsForControl( peer, pos, size ); OSStatus err = ::CreateDataBrowserControl( MAC_WXHWND(peer->MacGetTopLevelWindowRef()), @@ -1534,17 +1377,17 @@ wxMacDataBrowserControl::wxMacDataBrowserControl( wxWindow* peer, const wxPoint& OSStatus wxMacDataBrowserControl::GetItemCount( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - UInt32 *numItems) const + ItemCount *numItems) const { - return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); + return GetDataBrowserItemCount( m_controlRef, container, recurse, state, numItems ); } OSStatus wxMacDataBrowserControl::GetItems( DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, - Handle items) const + Handle items) const { - return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); + return GetDataBrowserItems( m_controlRef, container, recurse, state, items ); } OSStatus wxMacDataBrowserControl::SetSelectionFlags( DataBrowserSelectionFlags options ) @@ -1558,6 +1401,17 @@ OSStatus wxMacDataBrowserControl::AddColumn( DataBrowserListViewColumnDesc *colu return AddDataBrowserListViewColumn( m_controlRef, columnDesc, position ); } +OSStatus wxMacDataBrowserControl::GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ){ + return GetDataBrowserTableViewColumnProperty( m_controlRef, position, id ); +} + +OSStatus wxMacDataBrowserControl::RemoveColumn( DataBrowserTableViewColumnIndex position ) +{ + DataBrowserTableViewColumnID id; + GetColumnIDFromIndex( position, &id ); + return RemoveDataBrowserTableViewColumn( m_controlRef, id ); +} + OSStatus wxMacDataBrowserControl::AutoSizeColumns() { return AutoSizeDataBrowserListViewColumns(m_controlRef); @@ -1588,7 +1442,7 @@ OSStatus wxMacDataBrowserControl::SetCallbacks(const DataBrowserCallbacks *callb return SetDataBrowserCallbacks( m_controlRef, callbacks ); } -OSStatus wxMacDataBrowserControl::UpdateItems( +OSStatus wxMacDataBrowserControl::UpdateItems( DataBrowserItemID container, UInt32 numItems, const DataBrowserItemID *items, @@ -1652,166 +1506,253 @@ OSStatus wxMacDataBrowserControl::GetItemRow( DataBrowserItemID item, DataBrowse return GetDataBrowserTableViewItemRow( m_controlRef, item, row ); } -OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) +OSStatus wxMacDataBrowserControl::SetDefaultRowHeight( UInt16 height ) { - return SetDataBrowserTableViewRowHeight( m_controlRef , height ); + return SetDataBrowserTableViewRowHeight( m_controlRef , height ); } -OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const +OSStatus wxMacDataBrowserControl::GetDefaultRowHeight( UInt16 * height ) const { - return GetDataBrowserTableViewRowHeight( m_controlRef, height ); + return GetDataBrowserTableViewRowHeight( m_controlRef, height ); } - -OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) + +OSStatus wxMacDataBrowserControl::SetRowHeight( DataBrowserItemID item , UInt16 height) { return SetDataBrowserTableViewItemRowHeight( m_controlRef, item , height ); } -OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const +OSStatus wxMacDataBrowserControl::GetRowHeight( DataBrowserItemID item , UInt16 *height) const { return GetDataBrowserTableViewItemRowHeight( m_controlRef, item , height); } -OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const { return GetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) +OSStatus wxMacDataBrowserControl::SetColumnWidth( DataBrowserPropertyID column , UInt16 width ) { return SetDataBrowserTableViewNamedColumnWidth( m_controlRef , column , width ); } -OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const +OSStatus wxMacDataBrowserControl::GetDefaultColumnWidth( UInt16 *width ) const { return GetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) +OSStatus wxMacDataBrowserControl::SetDefaultColumnWidth( UInt16 width ) { return SetDataBrowserTableViewColumnWidth( m_controlRef , width ); } -OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const +OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const { return GetDataBrowserTableViewColumnCount( m_controlRef, numColumns); } -OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, - UInt32 *position) const +OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, + DataBrowserTableViewColumnIndex *position) const { return GetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, UInt32 position) +OSStatus wxMacDataBrowserControl::SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position) { return SetDataBrowserTableViewColumnPosition( m_controlRef , column , position); } -OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const +OSStatus wxMacDataBrowserControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const { return GetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) +OSStatus wxMacDataBrowserControl::SetScrollPosition( UInt32 top , UInt32 left ) { return SetDataBrowserScrollPosition( m_controlRef , top , left ); } -OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const +OSStatus wxMacDataBrowserControl::GetSortProperty( DataBrowserPropertyID *column ) const { return GetDataBrowserSortProperty( m_controlRef , column ); } -OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) +OSStatus wxMacDataBrowserControl::SetSortProperty( DataBrowserPropertyID column ) { return SetDataBrowserSortProperty( m_controlRef , column ); } - -OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const + +OSStatus wxMacDataBrowserControl::GetSortOrder( DataBrowserSortOrder *order ) const { return GetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) +OSStatus wxMacDataBrowserControl::SetSortOrder( DataBrowserSortOrder order ) { return SetDataBrowserSortOrder( m_controlRef , order ); } -OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags *flags ) const +OSStatus wxMacDataBrowserControl::GetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags *flags ) const { return GetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, - DataBrowserPropertyFlags flags ) +OSStatus wxMacDataBrowserControl::SetPropertyFlags( DataBrowserPropertyID property, + DataBrowserPropertyFlags flags ) { return SetDataBrowserPropertyFlags( m_controlRef , property , flags ); } -OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) const +OSStatus wxMacDataBrowserControl::GetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) const { return GetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, - DataBrowserListViewHeaderDesc *desc ) +OSStatus wxMacDataBrowserControl::SetHeaderDesc( DataBrowserPropertyID property, + DataBrowserListViewHeaderDesc *desc ) { - return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); + return SetDataBrowserListViewHeaderDesc( m_controlRef , property , desc ); } -OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , - Boolean expandableRows ) +OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID property , + Boolean expandableRows ) { return SetDataBrowserListViewDisclosureColumn( m_controlRef, property, expandableRows); } // ============================================================================ -// Higher-level Databrowser +// Higher-level Databrowser // ============================================================================ // // basing on data item objects // wxMacDataItem::wxMacDataItem() -{ +{ + m_data = NULL; + + m_order = 0; + m_colId = kTextColumnId; // for compat with existing wx*ListBox impls. } -wxMacDataItem::~wxMacDataItem() -{ +wxMacDataItem::~wxMacDataItem() +{ } - -bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , - const wxMacDataItem*, - DataBrowserPropertyID property) const + +void wxMacDataItem::SetOrder( SInt32 order ) { - return false; + m_order = order; +} + +SInt32 wxMacDataItem::GetOrder() const +{ + return m_order; +} + +void wxMacDataItem::SetData( void* data) +{ + m_data = data; +} + +void* wxMacDataItem::GetData() const +{ + return m_data; +} + +short wxMacDataItem::GetColumn() +{ + return m_colId; +} + +void wxMacDataItem::SetColumn( short col ) +{ + m_colId = col; } -OSStatus wxMacDataItem::GetSetData(wxMacDataItemBrowserControl *owner , +void wxMacDataItem::SetLabel( const wxString& str) +{ + m_label = str; + m_cfLabel.Assign( str , wxLocale::GetSystemEncoding()); +} + +const wxString& wxMacDataItem::GetLabel() const +{ + return m_label; +} + +bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner , + const wxMacDataItem* rhs, + DataBrowserPropertyID sortProperty) const +{ + const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs); + bool retval = false; + + if ( sortProperty == m_colId ){ + retval = m_label.CmpNoCase( otherItem->m_label) < 0; + } + + else if ( sortProperty == kNumericOrderColumnId ) + retval = m_order < otherItem->m_order; + + return retval; +} + +OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *owner , DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - bool changeValue ) + bool changeValue ) { - return errDataBrowserPropertyNotSupported; + OSStatus err = errDataBrowserPropertyNotSupported; + if ( !changeValue ) + { + if ( property == m_colId ){ + err = ::SetDataBrowserItemDataText( itemData, m_cfLabel ); + err = noErr; + } + else if ( property == kNumericOrderColumnId ){ + err = ::SetDataBrowserItemDataValue( itemData, m_order ); + err = noErr; + } + else{ + } + } + else + { + switch (property) + { + // no editable props here + default: + break; + } + } + + return err; } -void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner , +void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemNotification message, DataBrowserItemDataRef itemData ) const { } +IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl ) -wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) : +wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style) : wxMacDataBrowserControl( peer, pos, size, style ) -{ +{ m_suppressSelection = false; + m_sortOrder = SortOrder_None; + m_clientDataItemsType = wxClientData_None; } - -wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) + +wxMacDataItem* wxMacDataItemBrowserControl::CreateItem() +{ + return new wxMacDataItem(); +} + +wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) { m_former = browser->SuppressSelection(true); m_browser = browser; @@ -1830,18 +1771,18 @@ bool wxMacDataItemBrowserControl::SuppressSelection( bool suppress ) return former; } -Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID, - DataBrowserItemID itemTwoID, - DataBrowserPropertyID sortProperty) +Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) { wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID; wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID; return CompareItems( itemOne , itemTwo , sortProperty ); } -Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne, - const wxMacDataItem* itemTwo, - DataBrowserPropertyID sortProperty) +Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne, + const wxMacDataItem* itemTwo, + DataBrowserPropertyID sortProperty) { Boolean retval = false; if ( itemOne != NULL ) @@ -1853,7 +1794,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { wxMacDataItem* item = (wxMacDataItem*) itemID; return GetSetItemData(item, property, itemData , changeValue ); @@ -1863,7 +1804,7 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( wxMacDataItem* item, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, - Boolean changeValue ) + Boolean changeValue ) { OSStatus err = errDataBrowserPropertyNotSupported; switch( property ) @@ -1874,10 +1815,12 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( // right now default behaviour on these break; default : - if ( item != NULL ) + + if ( item != NULL ){ err = item->GetSetData( this, property , itemData , changeValue ); + } break; - + } return err; } @@ -1885,36 +1828,43 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData( void wxMacDataItemBrowserControl::ItemNotification( DataBrowserItemID itemID, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { - wxMacDataItem* item = (wxMacDataItem*) itemID; + wxMacDataItem* item = (wxMacDataItem*) itemID; ItemNotification( item , message, itemData); } void wxMacDataItemBrowserControl::ItemNotification( const wxMacDataItem* item, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData) + DataBrowserItemDataRef itemData) { if (item != NULL) item->Notification( this, message, itemData); } -unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state) const +unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, + bool recurse , DataBrowserItemState state) const { - UInt32 numItems = 0; - verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, - recurse, state, &numItems ) ); + ItemCount numItems = 0; + verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, + recurse, state, &numItems ) ); return numItems; } -void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container, - bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const +unsigned int wxMacDataItemBrowserControl::GetSelectedItemCount( const wxMacDataItem* container, + bool recurse ) const +{ + return GetItemCount( container, recurse, kDataBrowserItemIsSelected ); + +} + +void wxMacDataItemBrowserControl::GetItems(const wxMacDataItem* container, + bool recurse , DataBrowserItemState state, wxArrayMacDataItemPtr &items) const { Handle handle = NewHandle(0); - verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container , - recurse , state, handle) ); + verify_noerr( wxMacDataBrowserControl::GetItems( (DataBrowserItemID)container , + recurse , state, handle) ); int itemCount = GetHandleSize(handle)/sizeof(DataBrowserItemID); HLock( handle ); @@ -1940,17 +1890,17 @@ wxMacDataItem* wxMacDataItemBrowserControl::GetItemFromLine(unsigned int n) con DataBrowserItemID id; OSStatus err = GetItemID( (DataBrowserTableViewRowIndex) n , &id); wxASSERT( err == noErr); - return (wxMacDataItem*) id; + return (wxMacDataItem*) id; } -void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item , DataBrowserPropertyID property) const { - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, + verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty /* notSorted */, property ) ); } -void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, +void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray , DataBrowserPropertyID property) const { unsigned int noItems = itemArray.GetCount(); @@ -1958,66 +1908,129 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems, + verify_noerr( wxMacDataBrowserControl::UpdateItems((DataBrowserItemID)container, noItems, items, kDataBrowserItemNoProperty /* notSorted */, property ) ); delete [] items; } +void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType, + const wxString& title, SInt16 just, int defaultWidth) +{ + DataBrowserListViewColumnDesc columnDesc; + columnDesc.headerBtnDesc.titleOffset = 0; + columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; + + columnDesc.headerBtnDesc.btnFontStyle.flags = + kControlUseFontMask | kControlUseJustMask; + + columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlContentTextOnly; + columnDesc.headerBtnDesc.btnFontStyle.just = just; + columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; + columnDesc.headerBtnDesc.btnFontStyle.style = normal; + + // TODO: Why is m_font not defined when we enter wxLC_LIST mode, but is + // defined for other modes? + wxFontEncoding enc; + if ( m_font.Ok() ) + enc = m_font.GetEncoding(); + else + enc = wxLocale::GetSystemEncoding(); + wxMacCFStringHolder cfTitle; + cfTitle.Assign( title, enc ); + columnDesc.headerBtnDesc.titleString = cfTitle; + + columnDesc.headerBtnDesc.minimumWidth = 0; + columnDesc.headerBtnDesc.maximumWidth = 30000; + + columnDesc.propertyDesc.propertyID = (kMinColumnId + colId); + columnDesc.propertyDesc.propertyType = colType; + columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn; +#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; +#endif +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton; +#endif + + verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ); + + if (defaultWidth > 0){ + SetColumnWidth(colId, defaultWidth); + } + +} + +void wxMacDataItemBrowserControl::SetColumnWidth(int colId, int width) +{ + DataBrowserPropertyID id; + GetColumnIDFromIndex(colId, &id); + verify_noerr( wxMacDataBrowserControl::SetColumnWidth(id, width)); +} + +int wxMacDataItemBrowserControl::GetColumnWidth(int colId) +{ + DataBrowserPropertyID id; + GetColumnIDFromIndex(colId, &id); + UInt16 result; + verify_noerr( wxMacDataBrowserControl::GetColumnWidth(id, &result)); + return result; +} + void wxMacDataItemBrowserControl::AddItem(wxMacDataItem *container, wxMacDataItem *item) { - verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, 1, (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ) ); } -void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray ) +void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray ) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems, + verify_noerr( wxMacDataBrowserControl::AddItems( (DataBrowserItemID)container, noItems, (DataBrowserItemID*) items, kDataBrowserItemNoProperty ) ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) +void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) { - OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, - (UInt32*) &item, kDataBrowserItemNoProperty ); + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, + (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray) +void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &itemArray) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; for ( unsigned int i = 0; i < noItems; ++i ) items[i] = (DataBrowserItemID) itemArray[i]; - OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, - (UInt32*) items, kDataBrowserItemNoProperty ); + OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, + (DataBrowserItemID*) items, kDataBrowserItemNoProperty ); verify_noerr( err ); delete [] items; } -void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) +void wxMacDataItemBrowserControl::RemoveAllItems(wxMacDataItem *container) { OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 0 , NULL , kDataBrowserItemNoProperty ); verify_noerr( err ); } -void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItem(wxMacDataItem* item , DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 1, (DataBrowserItemID*) &item, option )); } -void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedAllItems(DataBrowserSetOption option) { verify_noerr(wxMacDataBrowserControl::SetSelectedItems( 0 , NULL , option )); } -void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) +void wxMacDataItemBrowserControl::SetSelectedItems(wxArrayMacDataItemPtr &itemArray , DataBrowserSetOption option) { unsigned int noItems = itemArray.GetCount(); DataBrowserItemID *items = new DataBrowserItemID[noItems]; @@ -2033,17 +2046,224 @@ Boolean wxMacDataItemBrowserControl::IsItemSelected( const wxMacDataItem* item) return wxMacDataBrowserControl::IsItemSelected( (DataBrowserItemID) item); } -void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) +void wxMacDataItemBrowserControl::RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options) { verify_noerr(wxMacDataBrowserControl::RevealItem( (DataBrowserItemID) item, kDataBrowserNoItem , options ) ); } -void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const +void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const +{ + verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); +} + +wxClientDataType wxMacDataItemBrowserControl::GetClientDataType() const +{ + return m_clientDataItemsType; +} +void wxMacDataItemBrowserControl::SetClientDataType(wxClientDataType clientDataItemsType) +{ + m_clientDataItemsType = clientDataItemsType; +} + +unsigned int wxMacDataItemBrowserControl::MacGetCount() const +{ + return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState); +} + +void wxMacDataItemBrowserControl::MacDelete( unsigned int n ) +{ + wxMacDataItem* item = (wxMacDataItem*)GetItemFromLine( n ); + RemoveItem( wxMacDataBrowserRootContainer, item ); +} + +void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxString& text, int column ) +{ + wxMacDataItem* newItem = CreateItem(); + newItem->SetLabel( text ); + if ( column != -1 ) + newItem->SetColumn( kMinColumnId + column ); + + if ( m_sortOrder == SortOrder_None ) + { + // increase the order of the lines to be shifted + unsigned int lines = MacGetCount(); + for ( unsigned int i = n; i < lines; ++i) + { + wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i); + iter->SetOrder( iter->GetOrder() + 1 ); + } + + SInt32 frontLineOrder = 0; + if ( n > 0 ) + { + wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); + } + newItem->SetOrder( frontLineOrder + 1 ); + } + + AddItem( wxMacDataBrowserRootContainer, newItem ); +} + +void wxMacDataItemBrowserControl::MacInsert( unsigned int n, const wxArrayString& items, int column ) +{ + size_t itemsCount = items.GetCount(); + if ( itemsCount == 0 ) + return; + + SInt32 frontLineOrder = 0; + + if ( m_sortOrder == SortOrder_None ) + { + // increase the order of the lines to be shifted + unsigned int lines = MacGetCount(); + for ( unsigned int i = n; i < lines; ++i) + { + wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i); + iter->SetOrder( iter->GetOrder() + itemsCount ); + } + if ( n > 0 ) + { + wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1); + frontLineOrder = iter->GetOrder(); + } + } + + wxArrayMacDataItemPtr ids; + ids.SetCount( itemsCount ); + + for ( unsigned int i = 0; i < itemsCount; ++i ) + { + wxMacDataItem* item = CreateItem(); + item->SetLabel( items[i]); + if ( column != -1 ) + item->SetColumn( kMinColumnId + column ); + + if ( m_sortOrder == SortOrder_None ) + item->SetOrder( frontLineOrder + 1 + i ); + + ids[i] = item; + } + + AddItems( wxMacDataBrowserRootContainer, ids ); +} + +int wxMacDataItemBrowserControl::MacAppend( const wxString& text) +{ + wxMacDataItem* item = CreateItem(); + item->SetLabel( text ); + if ( m_sortOrder == SortOrder_None ) + { + unsigned int lines = MacGetCount(); + if ( lines == 0 ) + item->SetOrder( 1 ); + else + { + wxMacDataItem* frontItem = (wxMacDataItem*) GetItemFromLine(lines-1); + item->SetOrder( frontItem->GetOrder() + 1 ); + } + } + AddItem( wxMacDataBrowserRootContainer, item ); + + return GetLineFromItem(item); +} + +void wxMacDataItemBrowserControl::MacClear() +{ + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + RemoveAllItems(wxMacDataBrowserRootContainer); +} + +void wxMacDataItemBrowserControl::MacDeselectAll() { - verify_noerr(wxMacDataBrowserControl::GetSelectionAnchor( (DataBrowserItemID*) first, (DataBrowserItemID*) last) ); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + SetSelectedAllItems( kDataBrowserItemsRemove ); } - +void wxMacDataItemBrowserControl::MacSetSelection( unsigned int n, bool select, bool multi ) +{ + wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n); + wxMacDataItemBrowserSelectionSuppressor suppressor(this); + + if ( IsItemSelected( item ) != select ) + { + if ( select ) + SetSelectedItem( item, multi ? kDataBrowserItemsAdd : kDataBrowserItemsAssign ); + else + SetSelectedItem( item, kDataBrowserItemsRemove ); + } + + MacScrollTo( n ); +} + +bool wxMacDataItemBrowserControl::MacIsSelected( unsigned int n ) const +{ + wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine(n); + return IsItemSelected( item ); +} + +int wxMacDataItemBrowserControl::MacGetSelection() const +{ + wxMacDataItemPtr first, last; + GetSelectionAnchor( &first, &last ); + + if ( first != NULL ) + { + return GetLineFromItem( first ); + } + + return -1; +} + +int wxMacDataItemBrowserControl::MacGetSelections( wxArrayInt& aSelections ) const +{ + aSelections.Empty(); + wxArrayMacDataItemPtr selectedItems; + GetItems( wxMacDataBrowserRootContainer, false , kDataBrowserItemIsSelected, selectedItems); + + int count = selectedItems.GetCount(); + + for ( int i = 0; i < count; ++i) + { + aSelections.Add(GetLineFromItem(selectedItems[i])); + } + + return count; +} + +void wxMacDataItemBrowserControl::MacSetString( unsigned int n, const wxString& text ) +{ + // as we don't store the strings we only have to issue a redraw + wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n); + item->SetLabel( text ); + UpdateItem( wxMacDataBrowserRootContainer, item , kTextColumnId ); +} + +wxString wxMacDataItemBrowserControl::MacGetString( unsigned int n ) const +{ + wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n ); + return item->GetLabel(); +} + +void wxMacDataItemBrowserControl::MacSetClientData( unsigned int n, void * data) +{ + wxMacDataItem* item = (wxMacDataItem*) GetItemFromLine( n); + item->SetData( data ); + // not displayed, therefore no Update infos to DataBrowser +} + +void * wxMacDataItemBrowserControl::MacGetClientData( unsigned int n) const +{ + wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n ); + return item->GetData(); +} + +void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n ) +{ + RevealItem( GetItemFromLine( n) , kDataBrowserRevealWithoutSelecting ); +} + + // // Tab Control @@ -2121,7 +2341,7 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() wxASSERT_MSG( genericRGBColorSpace != NULL, wxT("couldn't create the generic RGB color space") ); // we opened the profile so it is up to us to close it - CMCloseProfile(genericRGBProfile); + CMCloseProfile(genericRGBProfile); } } } @@ -2130,6 +2350,8 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() } #endif +#ifndef __LP64__ + wxMacPortSaver::wxMacPortSaver( GrafPtr port ) { ::GetPort( &m_port ); @@ -2140,5 +2362,36 @@ wxMacPortSaver::~wxMacPortSaver() { ::SetPort( m_port ); } +#endif + +void wxMacGlobalToLocal( WindowRef window , Point*pt ) +{ +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 + HIPoint p = CGPointMake( pt->h, pt->v ); + HIViewRef contentView ; + // TODO check toolbar offset + HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ; + HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView ); + pt->h = p.x; + pt->v = p.y; +#else + QDGlobalToLocalPoint( GetWindowPort(window), pt ) ; +#endif +} + +void wxMacLocalToGlobal( WindowRef window , Point*pt ) +{ +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4 + HIPoint p = CGPointMake( pt->h, pt->v ); + HIViewRef contentView ; + // TODO check toolbar offset + HIViewFindByID( HIViewGetRoot( window ), kHIViewWindowContentID , &contentView) ; + HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL ); + pt->h = p.x; + pt->v = p.y; +#else + QDLocalToGlobalPoint( GetWindowPort(window), pt ) ; +#endif +} #endif // wxUSE_GUI