X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e779b609386a67e2ea0ab62d4ed5d6d9d41fc933..b3ff5a475bd437b639278afe6005e9e462d4989f:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index df1f155679..85a38d0b49 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -67,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 // ---------------------------------------------------------------------------- @@ -367,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; + // We suppose that toolkit version is the same as OS version under Mac + wxGetOsVersion(verMaj, verMin); - info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor); - info.shortName = _T("mac"); - info.name = _T("wxMac"); - -#ifdef __WXUNIVERSAL__ - info.shortName << _T("univ"); - info.name << _T("/wxUniversal"); -#endif - - return info; + return wxPORT_MAC; } // Reading and writing resources (eg WIN.INI, .Xdefaults) @@ -553,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; }; @@ -569,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 ); @@ -592,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) @@ -609,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; @@ -620,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) @@ -815,6 +821,13 @@ 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(); @@ -850,11 +863,14 @@ void wxMacControl::Init() void wxMacControl::Dispose() { - ::DisposeControl( m_controlRef ); + 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 ); } @@ -1048,7 +1064,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 ) @@ -1151,7 +1171,7 @@ void wxMacControl::SetRect( Rect *r ) HIViewSetFrame ( m_controlRef , &hir ); // eventuall we might have to do a SetVisibility( false , true ); // before and a SetVisibility( true , true ); after - } +} void wxMacControl::GetRect( Rect *r ) { @@ -1256,7 +1276,7 @@ void wxMacControl::SetReferenceInNativeControl() wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control) { wxMacControl* ctl = NULL; - UInt32 actualSize; + ByteCount actualSize; if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) , &actualSize , &ctl ) == noErr ) { @@ -1272,13 +1292,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); @@ -1293,8 +1315,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); @@ -1308,7 +1329,7 @@ pascal Boolean wxMacDataBrowserControl::DataBrowserCompareProc( 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); @@ -1355,7 +1376,7 @@ 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 ); } @@ -1379,6 +1400,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); @@ -1519,12 +1551,12 @@ OSStatus wxMacDataBrowserControl::GetColumnCount(UInt32* numColumns) const } OSStatus wxMacDataBrowserControl::GetColumnPosition( DataBrowserPropertyID column, - UInt32 *position) const + 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); } @@ -1598,25 +1630,104 @@ OSStatus wxMacDataBrowserControl::SetDisclosureColumn( DataBrowserPropertyID pro wxMacDataItem::wxMacDataItem() { + m_data = NULL; + + m_order = 0; + m_colId = kTextColumnId; // for compat with existing wx*ListBox impls. } wxMacDataItem::~wxMacDataItem() { } +void wxMacDataItem::SetOrder( SInt32 order ) +{ + 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; +} + +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*, - DataBrowserPropertyID property) const + const wxMacDataItem* rhs, + DataBrowserPropertyID sortProperty) const { - return false; + 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 , +OSStatus wxMacDataItem::GetSetData( wxMacDataItemBrowserControl *owner , DataBrowserPropertyID property, DataBrowserItemDataRef itemData, 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 , @@ -1625,11 +1736,19 @@ void wxMacDataItem::Notification(wxMacDataItemBrowserControl *owner , { } +IMPLEMENT_DYNAMIC_CLASS( wxMacDataItemBrowserControl , wxMacDataBrowserControl ) 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; +} + +wxMacDataItem* wxMacDataItemBrowserControl::CreateItem() +{ + return new wxMacDataItem(); } wxMacDataItemBrowserSelectionSuppressor::wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser) @@ -1695,8 +1814,10 @@ 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; } @@ -1724,12 +1845,19 @@ void wxMacDataItemBrowserControl::ItemNotification( unsigned int wxMacDataItemBrowserControl::GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const { - UInt32 numItems = 0; + ItemCount numItems = 0; verify_noerr( wxMacDataBrowserControl::GetItemCount( (DataBrowserItemID)container, recurse, state, &numItems ) ); return numItems; } +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 { @@ -1784,6 +1912,69 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, 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, @@ -1805,7 +1996,7 @@ void wxMacDataItemBrowserControl::AddItems(wxMacDataItem *container, wxArrayMacD void wxMacDataItemBrowserControl::RemoveItem(wxMacDataItem *container, wxMacDataItem* item) { OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, 1, - (UInt32*) &item, kDataBrowserItemNoProperty ); + (DataBrowserItemID*) &item, kDataBrowserItemNoProperty ); verify_noerr( err ); } @@ -1817,7 +2008,7 @@ void wxMacDataItemBrowserControl::RemoveItems(wxMacDataItem *container, wxArrayM items[i] = (DataBrowserItemID) itemArray[i]; OSStatus err = wxMacDataBrowserControl::RemoveItems( (DataBrowserItemID)container, noItems, - (UInt32*) items, kDataBrowserItemNoProperty ); + (DataBrowserItemID*) items, kDataBrowserItemNoProperty ); verify_noerr( err ); delete [] items; } @@ -1864,6 +2055,213 @@ void wxMacDataItemBrowserControl::GetSelectionAnchor( wxMacDataItemPtr* first , 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() +{ + 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 ); +} + // @@ -1951,6 +2349,8 @@ CGColorSpaceRef wxMacGetGenericRGBColorSpace() } #endif +#ifndef __LP64__ + wxMacPortSaver::wxMacPortSaver( GrafPtr port ) { ::GetPort( &m_port ); @@ -1961,5 +2361,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