X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf9a1615ed0d4a051d6165014c7a0b6636f9ed43..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/mac/carbon/listctrl_mac.cpp?ds=sidebyside diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index 29fe79bd66..e307203d98 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -30,6 +30,7 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/settings.h" #endif #include "wx/mac/uma.h" @@ -38,7 +39,7 @@ #include "wx/sysopt.h" #include "wx/timer.h" -#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic") +#include "wx/hashmap.h" #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxListCtrlStyle ) @@ -102,7 +103,7 @@ wxEND_HANDLERS_TABLE() wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) /* - TODO : Expose more information of a list's layout etc. via appropriate objects (à la NotebookPageInfo) + TODO : Expose more information of a list's layout etc. via appropriate objects (ï¿  la NotebookPageInfo) */ #else IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl) @@ -113,9 +114,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent) -WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList); +WX_DECLARE_HASH_MAP( int, wxListItem*, wxIntegerHash, wxIntegerEqual, wxListItemList ); + #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListItemList) WX_DEFINE_LIST(wxColumnList) // so we can check for column clicks @@ -152,7 +153,7 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler , // FIXME: we can't use the sort property for virtual listctrls // so we need to find a better way to determine which column was clicked... if (!window->IsVirtual()) - window->GetEventHandler()->ProcessEvent( le ); + window->HandleWindowEvent( le ); } result = CallNextEventHandler(handler, event); break; @@ -219,6 +220,7 @@ public: virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item ); virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item ); virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item); + int GetFlags() { return m_flags; } protected: // we need to override to provide specialized handling for virtual wxListCtrls @@ -258,11 +260,11 @@ protected: Rect *maxEditTextRect, Boolean *shrinkToFit); - static pascal Boolean DataBrowserHitTestProc(ControlRef browser, - DataBrowserItemID itemID, - DataBrowserPropertyID property, - const Rect *theRect, - const Rect *mouseRect) { return true; } + static pascal Boolean DataBrowserHitTestProc(ControlRef WXUNUSED(browser), + DataBrowserItemID WXUNUSED(itemID), + DataBrowserPropertyID WXUNUSED(property), + const Rect *WXUNUSED(theRect), + const Rect *WXUNUSED(mouseRect)) { return true; } virtual bool ConfirmEditText(DataBrowserItemID item, DataBrowserPropertyID property, @@ -274,6 +276,7 @@ protected: wxClientDataType m_clientDataItemsType; bool m_isVirtual; + int m_flags; DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListCtrlControl) }; @@ -303,7 +306,7 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event ) if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) ) { - if (m_list->GetEventHandler()->ProcessEvent( event )) + if (m_list->HandleWindowEvent( event )) return true; } return wxEvtHandler::ProcessEvent(event); @@ -505,6 +508,9 @@ void wxListCtrlTextCtrlWrapper::OnKillFocus( wxFocusEvent &event ) BEGIN_EVENT_TABLE(wxListCtrl, wxControl) EVT_LEFT_DOWN(wxListCtrl::OnLeftDown) EVT_LEFT_DCLICK(wxListCtrl::OnDblClick) + EVT_MIDDLE_DOWN(wxListCtrl::OnMiddleDown) + EVT_RIGHT_DOWN(wxListCtrl::OnRightDown) + EVT_CHAR(wxListCtrl::OnChar) END_EVENT_TABLE() // ============================================================================ @@ -614,6 +620,91 @@ void wxListCtrl::OnDblClick(wxMouseEvent& event) event.Skip(); } +#if wxABI_VERSION >= 20801 +void wxListCtrl::OnRightDown(wxMouseEvent& event) +{ + if (m_dbImpl) + FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition()); + event.Skip(); +} + +void wxListCtrl::OnMiddleDown(wxMouseEvent& event) +{ + if (m_dbImpl) + FireMouseEvent(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, event.GetPosition()); + event.Skip(); +} + +void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position) +{ + wxListEvent le( eventType, GetId() ); + le.SetEventObject(this); + le.m_pointDrag = position; + le.m_itemIndex = -1; + + int flags; + long item = HitTest(position, flags); + if (flags & wxLIST_HITTEST_ONITEM) + { + le.m_itemIndex = item; + le.m_item.m_itemId = item; + GetItem(le.m_item); + HandleWindowEvent(le); + } +} + +void wxListCtrl::OnChar(wxKeyEvent& event) +{ + + + if (m_dbImpl) + { + wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() ); + le.SetEventObject(this); + le.m_code = event.GetKeyCode(); + le.m_itemIndex = -1; + + if (m_current == -1) + { + // if m_current isn't set, check if there's been a selection + // made before continuing + m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED); + } + + // We need to determine m_current ourselves when navigation keys + // are used. Note that PAGEUP and PAGEDOWN do not alter the current + // item on native Mac ListCtrl, so we only handle up and down keys. + switch ( event.GetKeyCode() ) + { + case WXK_UP: + if ( m_current > 0 ) + m_current -= 1; + else + m_current = 0; + + break; + + case WXK_DOWN: + if ( m_current < GetItemCount() - 1 ) + m_current += 1; + else + m_current = GetItemCount() - 1; + + break; + } + + if (m_current != -1) + { + le.m_itemIndex = m_current; + le.m_item.m_itemId = m_current; + GetItem(le.m_item); + HandleWindowEvent(le); + } + } + event.Skip(); +} +#endif + bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -650,8 +741,7 @@ bool wxListCtrl::Create(wxWindow *parent, else { m_macIsUserPane = false; - - if ( !wxWindow::Create(parent, id, pos, size, style, name) ) + if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) ) return false; m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style ); m_peer = m_dbImpl; @@ -683,6 +773,18 @@ wxListCtrl::~wxListCtrl() delete m_renameTimer; } +/*static*/ +wxVisualAttributes wxListCtrl::GetClassDefaultAttributes(wxWindowVariant variant) +{ + wxVisualAttributes attr; + + attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); + attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ); + attr.font.MacCreateFromThemeFont(kThemeViewsFont); + + return attr; +} + // ---------------------------------------------------------------------------- // set/get/change style // ---------------------------------------------------------------------------- @@ -743,12 +845,15 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags ) totalWidth += m_dbImpl->GetColumnWidth( column ); } - Boolean vertScrollBar; - GetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), NULL, &vertScrollBar ); - if (totalWidth > width) - SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), true, vertScrollBar ); - else - SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), false, vertScrollBar ); + if ( !(m_dbImpl->GetFlags() & wxHSCROLL) ) + { + Boolean vertScrollBar; + GetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), NULL, &vertScrollBar ); + if (totalWidth > width) + SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), true, vertScrollBar ); + else + SetDataBrowserHasScrollBars( m_dbImpl->GetControlRef(), false, vertScrollBar ); + } } } @@ -875,10 +980,10 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item) { wxFontEncoding enc; if ( m_font.Ok() ) - enc = m_font.GetEncoding(); + enc = GetFont().GetEncoding(); else enc = wxLocale::GetSystemEncoding(); - wxMacCFStringHolder cfTitle; + wxCFStringRef cfTitle; cfTitle.Assign( item.GetText() , enc ); if(columnDesc.titleString) CFRelease(columnDesc.titleString); @@ -888,13 +993,13 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item) if (item.GetMask() & wxLIST_MASK_IMAGE && item.GetImage() != -1 ) { - columnDesc.btnContentInfo.contentType = kControlContentIconRef; wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL); if (imageList && imageList->GetImageCount() > 0 ) { wxBitmap bmp = imageList->GetBitmap( item.GetImage() ); - IconRef icon = bmp.GetBitmapData()->GetIconRef(); + IconRef icon = bmp.GetIconRef(); columnDesc.btnContentInfo.u.iconRef = icon; + columnDesc.btnContentInfo.contentType = kControlContentIconRef; } } @@ -984,6 +1089,10 @@ int wxListCtrl::GetCountPerPage() const if (m_dbImpl) { + UInt16 height = 1; + m_dbImpl->GetDefaultRowHeight( &height ); + if (height > 0) + return GetClientSize().y / height; } return 1; @@ -1007,23 +1116,37 @@ bool wxListCtrl::GetItem(wxListItem& info) const if (m_dbImpl) { if (!IsVirtual()) - m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); - else { - info.SetText( OnGetItemText(info.m_itemId, info.m_col) ); - info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) ); - if (info.GetMask() & wxLIST_MASK_STATE) + if (info.m_itemId >= 0 && info.m_itemId < GetItemCount()) { - if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) - info.SetState(info.GetState() | wxLIST_STATE_SELECTED); + m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); + if (info.GetMask() & wxLIST_MASK_STATE) + { + DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId); + if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), id )) + info.SetState(info.GetState() | wxLIST_STATE_SELECTED); + } } - - wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId ); - if (attrs) + } + else + { + if (info.m_itemId >= 0 && info.m_itemId < GetItemCount()) { - info.SetFont( attrs->GetFont() ); - info.SetBackgroundColour( attrs->GetBackgroundColour() ); - info.SetTextColour( attrs->GetTextColour() ); + info.SetText( OnGetItemText(info.m_itemId, info.m_col) ); + info.SetImage( OnGetItemColumnImage(info.m_itemId, info.m_col) ); + if (info.GetMask() & wxLIST_MASK_STATE) + { + if (IsDataBrowserItemSelected( m_dbImpl->GetControlRef(), info.m_itemId+1 )) + info.SetState(info.GetState() | wxLIST_STATE_SELECTED); + } + + wxListItemAttr* attrs = OnGetItemAttr( info.m_itemId ); + if (attrs) + { + info.SetFont( attrs->GetFont() ); + info.SetBackgroundColour( attrs->GetBackgroundColour() ); + info.SetTextColour( attrs->GetTextColour() ); + } } } } @@ -1107,7 +1230,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) if (m_dbImpl) { DataBrowserSetOption option = kDataBrowserItemsAdd; - if ( stateMask == wxLIST_STATE_SELECTED && state == 0 ) + if ( (stateMask & wxLIST_STATE_SELECTED) && state == 0 ) option = kDataBrowserItemsRemove; if (item == -1) @@ -1135,8 +1258,15 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask) if ( HasFlag(wxLC_VIRTUAL) ) { long itemID = item+1; + bool isSelected = IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), (DataBrowserItemID)itemID ); + bool isSelectedState = (state == wxLIST_STATE_SELECTED); + + // toggle the selection state if wxListInfo state and actual state don't match. + if ( (stateMask & wxLIST_STATE_SELECTED) && isSelected != isSelectedState ) + { SetDataBrowserSelectedItems(m_dbImpl->GetControlRef(), 1, (DataBrowserItemID*)&itemID, option); } + } else { wxListItem info; @@ -1221,7 +1351,7 @@ long wxListCtrl::GetItemData(long item) const } // Sets the item data -bool wxListCtrl::SetItemData(long item, long data) +bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data) { if (m_genericImpl) return m_genericImpl->SetItemData(item, data); @@ -1492,19 +1622,48 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const if (m_genericImpl) return m_genericImpl->GetNextItem(item, geom, state); - if (m_dbImpl && geom == wxLIST_NEXT_ALL && state == wxLIST_STATE_SELECTED ) + // TODO: implement all geometry and state options? + if ( m_dbImpl ) { - long count = m_dbImpl->MacGetCount() ; - for ( long line = item + 1 ; line < count; line++ ) + if ( geom == wxLIST_NEXT_ALL || geom == wxLIST_NEXT_BELOW ) + { + long count = m_dbImpl->MacGetCount() ; + for ( long line = item + 1 ; line < count; line++ ) + { + DataBrowserItemID id = line + 1; + if ( !IsVirtual() ) + id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); + + if ( (state == wxLIST_STATE_DONTCARE ) ) + return line; + + if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) + return line; + } + } + + if ( geom == wxLIST_NEXT_ABOVE ) { - wxMacDataItem* id = m_dbImpl->GetItemFromLine(line); - if ( m_dbImpl->IsItemSelected(id ) ) - return line; + int item2 = item; + if ( item2 == -1 ) + item2 = m_dbImpl->MacGetCount(); + + for ( long line = item2 - 1 ; line >= 0; line-- ) + { + DataBrowserItemID id = line + 1; + if ( !IsVirtual() ) + id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line); + + if ( (state == wxLIST_STATE_DONTCARE ) ) + return line; + + if ( (state & wxLIST_STATE_SELECTED) && IsDataBrowserItemSelected(m_dbImpl->GetControlRef(), id ) ) + return line; + } } - return -1; } - return 0; + return -1; } @@ -1597,7 +1756,7 @@ bool wxListCtrl::DeleteItem(long item) wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() ); event.SetEventObject( this ); event.m_itemIndex = item; - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } return true; @@ -1614,7 +1773,7 @@ bool wxListCtrl::DeleteAllItems() m_dbImpl->MacClear(); wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } return true; } @@ -1688,7 +1847,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass) le.m_col = 0; GetItem( le.m_item ); - if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() ) + if ( GetParent()->HandleWindowEvent( le ) && !le.IsAllowed() ) { // vetoed by user code return NULL; @@ -1702,7 +1861,7 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass) } // End label editing, optionally cancelling the edit -bool wxListCtrl::EndEditLabel(bool cancel) +bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel)) { // TODO: generic impl. doesn't have this method - is it needed for us? if (m_genericImpl) @@ -1883,12 +2042,11 @@ long wxListCtrl::InsertItem(wxListItem& info) info.m_itemId = count; m_dbImpl->MacInsertItem(info.m_itemId, &info ); - wxMacDataItem* dataItem = m_dbImpl->GetItemFromLine(info.m_itemId); - + wxListEvent event( wxEVT_COMMAND_LIST_INSERT_ITEM, GetId() ); event.SetEventObject( this ); event.m_itemIndex = info.m_itemId; - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); return info.m_itemId; } return -1; @@ -2030,7 +2188,7 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data) m_compareFunc = fn; m_compareFuncData = data; SortDataBrowserContainer( m_dbImpl->GetControlRef(), kDataBrowserNoItem, true); - + // we need to do this after each call, else we get a crash from wxPython when // SortItems is called the second time. m_compareFunc = NULL; @@ -2055,7 +2213,7 @@ bool wxListCtrl::OnRenameAccept(long itemEdit, const wxString& value) GetItem( le.m_item ); le.m_item.m_text = value; - return !GetEventHandler()->ProcessEvent( le ) || + return !HandleWindowEvent( le ) || le.IsAllowed(); } @@ -2070,7 +2228,7 @@ void wxListCtrl::OnRenameCancelled(long itemEdit) le.m_itemIndex = itemEdit; GetItem( le.m_item ); - GetEventHandler()->ProcessEvent( le ); + HandleWindowEvent( le ); } // ---------------------------------------------------------------------------- @@ -2152,9 +2310,26 @@ void wxListCtrl::RefreshItem(long item) return; } - wxRect rect; - GetItemRect(item, rect); - RefreshRect(rect); + if (m_dbImpl) + { + DataBrowserItemID id; + + if ( !IsVirtual() ) + { + wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(item); + id = (DataBrowserItemID) thisItem; + } + else + id = item+1; + + m_dbImpl->wxMacDataBrowserControl::UpdateItems + ( + kDataBrowserNoItem, + 1, &id, + kDataBrowserItemNoProperty, // preSortProperty + kDataBrowserNoItem // update all columns + ); + } } void wxListCtrl::RefreshItems(long itemFrom, long itemTo) @@ -2165,14 +2340,35 @@ void wxListCtrl::RefreshItems(long itemFrom, long itemTo) return; } - wxRect rect1, rect2; - GetItemRect(itemFrom, rect1); - GetItemRect(itemTo, rect2); + if (m_dbImpl) + { + const long count = itemTo - itemFrom + 1; + DataBrowserItemID *ids = new DataBrowserItemID[count]; - wxRect rect = rect1; - rect.height = rect2.GetBottom() - rect1.GetTop(); + if ( !IsVirtual() ) + { + for ( long i = 0; i < count; i++ ) + { + wxMacDataItem* thisItem = m_dbImpl->GetItemFromLine(itemFrom+i); + ids[i] = (DataBrowserItemID) thisItem; + } + } + else + { + for ( long i = 0; i < count; i++ ) + ids[i] = itemFrom+i+1; + } - RefreshRect(rect); + m_dbImpl->wxMacDataBrowserControl::UpdateItems + ( + kDataBrowserNoItem, + count, ids, + kDataBrowserItemNoProperty, // preSortProperty + kDataBrowserNoItem // update all columns + ); + + delete[] ids; + } } void wxListCtrl::SetDropTarget( wxDropTarget *dropTarget ) @@ -2198,6 +2394,19 @@ wxDropTarget *wxListCtrl::GetDropTarget() const return NULL; } +#if wxABI_VERSION >= 20801 +void wxListCtrl::SetFocus() +{ + if (m_genericImpl) + { + m_genericImpl->SetFocus(); + return; + } + + wxWindow::SetFocus(); +} +#endif + // wxMac internal data structures wxMacListCtrlItem::~wxMacListCtrlItem() @@ -2206,7 +2415,7 @@ wxMacListCtrlItem::~wxMacListCtrlItem() void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemNotification message, - DataBrowserItemDataRef itemData ) const + DataBrowserItemDataRef WXUNUSED(itemData) ) const { wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl); @@ -2239,10 +2448,8 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , event.SetEventObject( list ); event.m_itemIndex = owner->GetLineFromItem( this ) ; - if ( !list->IsVirtual() ) - { - lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item); - } + event.m_item.m_itemId = event.m_itemIndex; + list->GetItem(event.m_item); switch (message) { @@ -2295,6 +2502,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer OSStatus err = noErr; m_clientDataItemsType = wxClientData_None; m_isVirtual = false; + m_flags = 0; if ( style & wxLC_VIRTUAL ) m_isVirtual = true; @@ -2339,30 +2547,25 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer SetSortProperty( kMinColumnId - 1 ); else SetSortProperty( kMinColumnId ); - if ( style & wxLC_SORT_ASCENDING ) - { - m_sortOrder = SortOrder_Text_Ascending; - SetSortOrder( kDataBrowserOrderIncreasing ); - } - else if ( style & wxLC_SORT_DESCENDING ) + + m_sortOrder = SortOrder_None; + + if ( style & wxLC_SORT_DESCENDING ) { - m_sortOrder = SortOrder_Text_Descending; SetSortOrder( kDataBrowserOrderDecreasing ); } - else + else if ( style & wxLC_SORT_ASCENDING ) { - m_sortOrder = SortOrder_None; + SetSortOrder( kDataBrowserOrderIncreasing ); } if ( style & wxLC_VRULES ) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 verify_noerr( DataBrowserChangeAttributes(m_controlRef, kDataBrowserAttributeListViewDrawColumnDividers, kDataBrowserAttributeNone) ); -#endif } verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) ); - err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true ); + verify_noerr( SetHasScrollBars( (style & wxHSCROLL) != 0 , true ) ); } pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc( @@ -2384,11 +2587,11 @@ pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc( } bool wxMacDataBrowserListCtrlControl::ConfirmEditText( - DataBrowserItemID itemID, - DataBrowserPropertyID property, - CFStringRef theString, - Rect *maxEditTextRect, - Boolean *shrinkToFit) + DataBrowserItemID WXUNUSED(itemID), + DataBrowserPropertyID WXUNUSED(property), + CFStringRef WXUNUSED(theString), + Rect *WXUNUSED(maxEditTextRect), + Boolean *WXUNUSED(shrinkToFit)) { return false; } @@ -2447,7 +2650,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemState itemState, - const Rect *itemRect, + const Rect *WXUNUSED(itemRect), SInt16 gdDepth, Boolean colorDevice) { @@ -2487,17 +2690,21 @@ void wxMacDataBrowserListCtrlControl::DrawItem( } else { - text = list->OnGetItemText( (long)itemID-1, listColumn ); - imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn ); - wxListItemAttr* attrs = list->OnGetItemAttr( (long)itemID-1 ); - if (attrs) + long itemNum = (long)itemID-1; + if (itemNum >= 0 && itemNum < list->GetItemCount()) { - if (attrs->HasBackgroundColour()) - bgColor = attrs->GetBackgroundColour(); - if (attrs->HasTextColour()) - color = attrs->GetTextColour(); - if (attrs->HasFont()) - font = attrs->GetFont(); + text = list->OnGetItemText( itemNum, listColumn ); + imgIndex = list->OnGetItemColumnImage( itemNum, listColumn ); + wxListItemAttr* attrs = list->OnGetItemAttr( itemNum ); + if (attrs) + { + if (attrs->HasBackgroundColour()) + bgColor = attrs->GetBackgroundColour(); + if (attrs->HasTextColour()) + color = attrs->GetTextColour(); + if (attrs->HasFont()) + font = attrs->GetFont(); + } } } } @@ -2506,12 +2713,10 @@ void wxMacDataBrowserListCtrlControl::DrawItem( if (bgColor == wxNullColour) bgColor = listBgColor; - wxFont listFont = list->GetFont(); - if (font == wxNullFont) - font = listFont; + if (!font.Ok()) + font = list->GetFont(); - wxMacCFStringHolder cfString; - cfString.Assign( text, wxLocale::GetSystemEncoding() ); + wxCFStringRef cfString( text, wxLocale::GetSystemEncoding() ); Rect enclosingRect; CGRect enclosingCGRect, iconCGRect, textCGRect; @@ -2536,6 +2741,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( enclosingRect.right - enclosingRect.left, enclosingRect.bottom - enclosingRect.top); + bool hasFocus = (wxWindow::FindFocus() == list); active = IsControlActive(GetControlRef()); // don't paint the background over the vertical rule line @@ -2549,14 +2755,21 @@ void wxMacDataBrowserListCtrlControl::DrawItem( GetThemeDrawingState(&savedState); - GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor); - GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor); - + if (active && hasFocus) + { + GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor); + GetThemeTextColor(kThemeTextColorWhite, gdDepth, colorDevice, &labelColor); + } + else + { + GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &backgroundColor); + GetThemeTextColor(kThemeTextColorBlack, gdDepth, colorDevice, &labelColor); + } CGContextSaveGState(context); - CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX, - (float)backgroundColor.green / (float)USHRT_MAX, - (float)backgroundColor.blue / (float)USHRT_MAX, 1.0); + CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX, + (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX, + (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0); CGContextFillRect(context, enclosingCGRect); CGContextRestoreGState(context); @@ -2565,18 +2778,18 @@ void wxMacDataBrowserListCtrlControl::DrawItem( { if (color.Ok()) - labelColor = MAC_WXCOLORREF( color.GetPixel() ); + color.GetRGBColor(&labelColor); else if (list->GetTextColour().Ok()) - labelColor = MAC_WXCOLORREF( list->GetTextColour().GetPixel() ); + list->GetTextColour().GetRGBColor(&labelColor); if (bgColor.Ok()) { - backgroundColor = MAC_WXCOLORREF( bgColor.GetPixel() ); + bgColor.GetRGBColor(&backgroundColor); CGContextSaveGState(context); - CGContextSetRGBFillColor(context, (float)backgroundColor.red / (float)USHRT_MAX, - (float)backgroundColor.green / (float)USHRT_MAX, - (float)backgroundColor.blue / (float)USHRT_MAX, 1.0); + CGContextSetRGBFillColor(context, (CGFloat)backgroundColor.red / (CGFloat)USHRT_MAX, + (CGFloat)backgroundColor.green / (CGFloat)USHRT_MAX, + (CGFloat)backgroundColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0); CGContextFillRect(context, enclosingCGRect); CGContextRestoreGState(context); @@ -2590,7 +2803,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL); if (imageList && imageList->GetImageCount() > 0){ wxBitmap bmp = imageList->GetBitmap(imgIndex); - IconRef icon = bmp.GetBitmapData()->GetIconRef(); + IconRef icon = bmp.GetIconRef(); CGContextSaveGState(context); CGContextTranslateCTM(context, 0,iconCGRect.origin.y + CGRectGetMaxY(iconCGRect)); @@ -2604,19 +2817,36 @@ void wxMacDataBrowserListCtrlControl::DrawItem( } HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft; - UInt16 fontID = kThemeViewsFont; - - if (font.Ok()) + HIThemeTextInfo info; + bool setup = false; +#if wxMAC_USE_CORE_TEXT + if ( UMAGetSystemVersion() >= 0x1050 ) { - if (font.GetFamily() != wxFONTFAMILY_DEFAULT) - fontID = font.MacGetThemeFontID(); - -// FIXME: replace these with CG or ATSUI calls so we can remove this #ifndef. -#ifndef __LP64__ - ::TextSize( (short)(font.MacGetFontSize()) ) ; - ::TextFace( font.MacGetFontStyle() ) ; + info.version = kHIThemeTextInfoVersionOne; + info.fontID = kThemeViewsFont; + if (font.Ok()) + { + info.fontID = kThemeSpecifiedFont; + info.font = (CTFontRef) font.MacGetCTFont(); + setup = true; + } + } #endif +#if wxMAC_USE_ATSU_TEXT + if ( !setup ) + { + info.version = kHIThemeTextInfoVersionZero; + info.fontID = kThemeViewsFont; + + if (font.Ok()) + { + info.fontID = font.MacGetThemeFontID(); + + ::TextSize( (short)(font.MacGetFontSize()) ) ; + ::TextFace( font.MacGetFontStyle() ) ; + } } +#endif wxListItem item; list->GetColumn(listColumn, item); @@ -2633,10 +2863,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( } } - HIThemeTextInfo info; - info.version = kHIThemeTextInfoVersionZero; info.state = active ? kThemeStateActive : kThemeStateInactive; - info.fontID = fontID; info.horizontalFlushness = hFlush; info.verticalFlushness = kHIThemeTextVerticalFlushCenter; info.options = kHIThemeTextBoxOptionNone; @@ -2644,16 +2871,18 @@ void wxMacDataBrowserListCtrlControl::DrawItem( info.truncationMaxLines = 1; CGContextSaveGState(context); - CGContextSetRGBFillColor (context, (float)labelColor.red / (float)USHRT_MAX, - (float)labelColor.green / (float)USHRT_MAX, - (float)labelColor.blue / (float)USHRT_MAX, 1.0); + CGContextSetRGBFillColor (context, (CGFloat)labelColor.red / (CGFloat)USHRT_MAX, + (CGFloat)labelColor.green / (CGFloat)USHRT_MAX, + (CGFloat)labelColor.blue / (CGFloat)USHRT_MAX, (CGFloat) 1.0); HIThemeDrawTextBox(cfString, &textCGRect, &info, context, kHIThemeOrientationNormal); CGContextRestoreGState(context); +#ifndef __LP64__ if (savedState != NULL) SetThemeDrawingState(savedState, true); +#endif } OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID, @@ -2667,7 +2896,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI OSStatus err = errDataBrowserPropertyNotSupported; wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); - wxMacListCtrlItem* lcItem; + wxMacListCtrlItem* lcItem = NULL; if (listColumn >= 0) { @@ -2684,8 +2913,12 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI } else { - text = list->OnGetItemText( (long)itemID-1, listColumn ); - imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn ); + long itemNum = (long)itemID-1; + if (itemNum >= 0 && itemNum < list->GetItemCount()) + { + text = list->OnGetItemText( itemNum, listColumn ); + imgIndex = list->OnGetItemColumnImage( itemNum, listColumn ); + } } } @@ -2703,10 +2936,8 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI default : if ( property >= kMinColumnId ) { - wxMacCFStringHolder cfStr; - - if (text){ - cfStr.Assign( text, wxLocale::GetSystemEncoding() ); + if (!text.IsEmpty()){ + wxCFStringRef cfStr( text, wxLocale::GetSystemEncoding() ); err = ::SetDataBrowserItemDataText( itemData, cfStr ); err = noErr; } @@ -2718,7 +2949,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL); if (imageList && imageList->GetImageCount() > 0){ wxBitmap bmp = imageList->GetBitmap(imgIndex); - IconRef icon = bmp.GetBitmapData()->GetIconRef(); + IconRef icon = bmp.GetIconRef(); ::SetDataBrowserItemDataIcon(itemData, icon); } } @@ -2741,7 +2972,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI // can then deal with the veto CFStringRef sr ; verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ; - wxMacCFStringHolder cfStr(sr) ;; + wxCFStringRef cfStr(sr) ;; if (m_isVirtual) list->SetItem( (long)itemData-1 , listColumn, cfStr.AsString() ) ; else @@ -2759,7 +2990,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, DataBrowserItemNotification message, - DataBrowserItemDataRef itemData ) + DataBrowserItemDataRef WXUNUSED(itemData) ) { // we want to depend on as little as possible to make sure tear-down of controls is safe if ( message == kDataBrowserItemRemoved) @@ -2780,7 +3011,6 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, bool trigger = false; wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); - bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0; event.SetEventObject( list ); if ( !list->IsVirtual() ) @@ -2788,21 +3018,21 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, DataBrowserTableViewRowIndex result = 0; verify_noerr( GetItemRow( itemID, &result ) ) ; event.m_itemIndex = result; - - if (event.m_itemIndex >= 0) - MacGetColumnInfo(event.m_itemIndex,0,event.m_item); } else { event.m_itemIndex = (long)itemID-1; } + event.m_item.m_itemId = event.m_itemIndex; + list->GetItem(event.m_item); switch (message) { case kDataBrowserItemDeselected: event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED); - if ( !isSingle ) - trigger = !IsSelectionSuppressed(); + // as the generic implementation is also triggering this + // event for single selection, we do the same (different than listbox) + trigger = !IsSelectionSuppressed(); break; case kDataBrowserItemSelected: @@ -2848,10 +3078,16 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI bool retval = false; wxString itemText; wxString otherItemText; + long itemOrder; + long otherItemOrder; + int colId = sortProperty - kMinColumnId; wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); + DataBrowserSortOrder sort; + verify_noerr(GetSortOrder(&sort)); + if (colId >= 0) { if (!m_isVirtual) @@ -2859,6 +3095,9 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID; wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID; + itemOrder = item->GetOrder(); + otherItemOrder = item->GetOrder(); + wxListCtrlCompare func = list->GetCompareFunc(); if (func != NULL) { @@ -2867,39 +3106,30 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI if (item && item->HasColumnInfo(0)) item1 = item->GetColumnInfo(0)->GetData(); if (otherItem && otherItem->HasColumnInfo(0)) - item2 = otherItem->GetColumnInfo(0)->GetData(); - + item2 = otherItem->GetColumnInfo(0)->GetData(); + if (item1 > -1 && item2 > -1) { int result = func(item1, item2, list->GetCompareFuncData()); - return result >= 0; + if (sort == kDataBrowserOrderIncreasing) + return result >= 0; + else + return result < 0; } } - if (item->HasColumnInfo(colId)) - itemText = item->GetColumnInfo(colId)->GetText(); - if (otherItem->HasColumnInfo(colId)) - otherItemText = otherItem->GetColumnInfo(colId)->GetText(); + + // we can't use the native control's sorting abilities, so just + // sort by item id. + return itemOrder < otherItemOrder; } else { long itemNum = (long)itemOneID; long otherItemNum = (long)itemTwoID; - itemText = list->OnGetItemText( itemNum-1, colId ); - otherItemText = list->OnGetItemText( otherItemNum-1, colId ); - } - - DataBrowserSortOrder sort; - verify_noerr(GetSortOrder(&sort)); - - if ( sort == kDataBrowserOrderIncreasing ) - { - retval = itemText.CmpNoCase( otherItemText ) > 0; - } - else if ( sort == kDataBrowserOrderDecreasing ) - { - retval = itemText.CmpNoCase( otherItemText ) < 0; + // virtual listctrls don't support sorting + return itemNum < otherItemNum; } } else{ @@ -2923,12 +3153,13 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem); bool hasInfo = listItem->HasColumnInfo( column ); listItem->SetColumnInfo( column, item ); + listItem->SetOrder(row); UpdateState(dataItem, item); - + wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); - + // NB: When this call was made before a control was completely shown, it would - // update the item prematurely (i.e. no text would be listed) and, on show, + // update the item prematurely (i.e. no text would be listed) and, on show, // only the sorted column would be refreshed, meaning only first column text labels // would be shown. Making sure not to update items until the control is visible // seems to fix this issue. @@ -2945,7 +3176,7 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED); // toggle the selection state if wxListInfo state and actual state don't match. - if ( isSelected != isSelectedState ) + if ( listItem->GetMask() & wxLIST_MASK_STATE && isSelected != isSelectedState ) { DataBrowserSetOption options = kDataBrowserItemsAdd; if (!isSelectedState) @@ -3009,7 +3240,7 @@ wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem() wxMacListCtrlItem::wxMacListCtrlItem() { - m_rowItems = wxListItemList( wxKEY_INTEGER ); + m_rowItems = wxListItemList(); } int wxMacListCtrlItem::GetColumnImageValue( unsigned int column ) @@ -3049,15 +3280,13 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column ) { - wxListItemList::compatibility_iterator node = m_rowItems.Find( column ); - wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") ); - - return node->GetData(); + wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") ); + return m_rowItems[column]; } bool wxMacListCtrlItem::HasColumnInfo( unsigned int column ) { - return m_rowItems.Find( column ) != NULL; + return !(m_rowItems.find( column ) == m_rowItems.end()); } void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) @@ -3066,7 +3295,7 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) if ( !HasColumnInfo(column) ) { wxListItem* listItem = new wxListItem(*item); - m_rowItems.Append( column, listItem ); + m_rowItems[column] = listItem; } else { @@ -3100,3 +3329,4 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) } #endif // wxUSE_LISTCTRL +