X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/255dcbd7cb274adaedc68a905bfbb31f5796f97e..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/mac/carbon/listctrl_mac.cpp diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index 3b4941dc08..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" @@ -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) @@ -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; @@ -220,7 +221,7 @@ public: 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 virtual OSStatus GetSetItemData(DataBrowserItemID itemID, @@ -259,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, @@ -305,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); @@ -640,7 +641,7 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position) le.SetEventObject(this); le.m_pointDrag = position; le.m_itemIndex = -1; - + int flags; long item = HitTest(position, flags); if (flags & wxLIST_HITTEST_ONITEM) @@ -648,12 +649,14 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position) le.m_itemIndex = item; le.m_item.m_itemId = item; GetItem(le.m_item); - GetEventHandler()->ProcessEvent(le); + HandleWindowEvent(le); } } void wxListCtrl::OnChar(wxKeyEvent& event) { + + if (m_dbImpl) { wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() ); @@ -661,12 +664,41 @@ void wxListCtrl::OnChar(wxKeyEvent& event) 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); - GetEventHandler()->ProcessEvent(le); + HandleWindowEvent(le); } } event.Skip(); @@ -741,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 // ---------------------------------------------------------------------------- @@ -936,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); @@ -949,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; } } @@ -1023,7 +1067,7 @@ bool wxListCtrl::SetColumnWidth(int col, int width) { wxListItem colInfo; GetColumn(col, colInfo); - + colInfo.SetWidth(width); SetColumn(col, colInfo); m_dbImpl->SetColumnWidth(col, mywidth); @@ -1045,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; @@ -1070,7 +1118,15 @@ bool wxListCtrl::GetItem(wxListItem& info) const if (!IsVirtual()) { if (info.m_itemId >= 0 && info.m_itemId < GetItemCount()) + { 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); + } + } } else { @@ -1174,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) @@ -1202,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; @@ -1288,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); @@ -1570,30 +1633,30 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const 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_ALL || geom == wxLIST_NEXT_ABOVE ) + + if ( geom == wxLIST_NEXT_ABOVE ) { int item2 = item; if ( item2 == -1 ) item2 = m_dbImpl->MacGetCount(); - + for ( long line = item2 - 1 ; line >= 0; line-- ) { - DataBrowserItemID id = line + 1; + 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; } @@ -1693,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; @@ -1710,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; } @@ -1784,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; @@ -1798,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) @@ -1979,11 +2042,11 @@ long wxListCtrl::InsertItem(wxListItem& info) info.m_itemId = count; m_dbImpl->MacInsertItem(info.m_itemId, &info ); - + 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; @@ -2125,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; @@ -2150,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(); } @@ -2165,7 +2228,7 @@ void wxListCtrl::OnRenameCancelled(long itemEdit) le.m_itemIndex = itemEdit; GetItem( le.m_item ); - GetEventHandler()->ProcessEvent( le ); + HandleWindowEvent( le ); } // ---------------------------------------------------------------------------- @@ -2247,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) @@ -2260,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 ) @@ -2301,7 +2402,7 @@ void wxListCtrl::SetFocus() m_genericImpl->SetFocus(); return; } - + wxWindow::SetFocus(); } #endif @@ -2314,7 +2415,7 @@ wxMacListCtrlItem::~wxMacListCtrlItem() void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemNotification message, - DataBrowserItemDataRef itemData ) const + DataBrowserItemDataRef WXUNUSED(itemData) ) const { wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(owner, wxMacDataBrowserListCtrlControl); @@ -2446,9 +2547,9 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer SetSortProperty( kMinColumnId - 1 ); else SetSortProperty( kMinColumnId ); - + m_sortOrder = SortOrder_None; - + if ( style & wxLC_SORT_DESCENDING ) { SetSortOrder( kDataBrowserOrderDecreasing ); @@ -2460,9 +2561,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer 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 ) ); @@ -2488,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; } @@ -2551,7 +2650,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemState itemState, - const Rect *itemRect, + const Rect *WXUNUSED(itemRect), SInt16 gdDepth, Boolean colorDevice) { @@ -2614,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; @@ -2657,7 +2754,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem( { GetThemeDrawingState(&savedState); - + if (active && hasFocus) { GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &backgroundColor); @@ -2670,9 +2767,9 @@ void wxMacDataBrowserListCtrlControl::DrawItem( } 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); @@ -2681,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); @@ -2706,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)); @@ -2720,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); @@ -2749,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; @@ -2760,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, @@ -2783,7 +2896,7 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI OSStatus err = errDataBrowserPropertyNotSupported; wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); - wxMacListCtrlItem* lcItem; + wxMacListCtrlItem* lcItem = NULL; if (listColumn >= 0) { @@ -2823,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; } @@ -2838,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); } } @@ -2861,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 @@ -2879,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) @@ -2893,14 +3004,13 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, // avoid asserts by getting out now return ; } - + wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl ); if ( list ) { 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() ) @@ -2920,8 +3030,9 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, { 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: @@ -2969,7 +3080,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI wxString otherItemText; long itemOrder; long otherItemOrder; - + int colId = sortProperty - kMinColumnId; wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); @@ -2986,7 +3097,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI itemOrder = item->GetOrder(); otherItemOrder = item->GetOrder(); - + wxListCtrlCompare func = list->GetCompareFunc(); if (func != NULL) { @@ -2995,8 +3106,8 @@ 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()); @@ -3006,7 +3117,7 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI return result < 0; } } - + // we can't use the native control's sorting abilities, so just // sort by item id. return itemOrder < otherItemOrder; @@ -3044,11 +3155,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign 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. @@ -3065,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) @@ -3170,7 +3281,7 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column ) { wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") ); - return m_rowItems[column]; + return m_rowItems[column]; } bool wxMacListCtrlItem::HasColumnInfo( unsigned int column )