X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e330eb461962fc89d1650d912a5a63eb2f0c02d3..80a779275ae04443c568dca919adb26cf6f5002c:/src/mac/carbon/listctrl_mac.cpp diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index 6b9a162f2d..5a3d06a173 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/msw/listctrl.cpp +// Name: src/mac/listctrl_mac.cpp // Purpose: wxListCtrl // Author: Julian Smart // Modified by: Agron Selimaj @@ -26,19 +26,15 @@ #if wxUSE_LISTCTRL +#include "wx/listctrl.h" + #ifndef WX_PRECOMP - #include "wx/app.h" #include "wx/intl.h" - #include "wx/log.h" - #include "wx/settings.h" - #include "wx/dcclient.h" - #include "wx/textctrl.h" #endif #include "wx/mac/uma.h" #include "wx/imaglist.h" -#include "wx/listctrl.h" #include "wx/sysopt.h" #define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic") @@ -120,6 +116,51 @@ WX_DECLARE_EXPORTED_LIST(wxListItem, wxListItemList); #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxListItemList) +// so we can check for column clicks +static const EventTypeSpec eventList[] = +{ + { kEventClassControl, kEventControlHit }, +}; + +static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxMacCarbonEvent cEvent( event ) ; + + ControlRef controlRef ; + cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + + wxListCtrl *window = (wxListCtrl*) data ; + wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, window->GetId() ); + le.SetEventObject( window ); + + switch ( GetEventKind( event ) ) + { + // check if the column was clicked on and fire an event if so + case kEventControlHit : + { + ControlPartCode result = cEvent.GetParameter(kEventParamControlPart, typeControlPartCode) ; + if (result == kControlButtonPart){ + DataBrowserPropertyID col; + GetDataBrowserSortProperty(controlRef, &col); + int column = col - kMinColumnId; + le.m_col = column; + window->GetEventHandler()->ProcessEvent( le ); + } + result = CallNextEventHandler(handler, event); + break; + } + default : + break ; + } + + + return result ; +} + +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler ) + class wxMacListCtrlItem : public wxMacListBoxItem { public: @@ -139,12 +180,6 @@ public: virtual int GetColumnImageValue( unsigned int column ); virtual void SetColumnImageValue( unsigned int column, int imageIndex ); - virtual OSStatus GetSetData( wxMacDataItemBrowserControl *owner , - DataBrowserPropertyID property, - DataBrowserItemDataRef itemData, - bool changeValue ); - - virtual ~wxMacListCtrlItem(); protected: wxListItemList m_rowItems; @@ -159,7 +194,7 @@ public: // create a list item (can be a subclass of wxMacListBoxItem) - virtual wxMacListCtrlItem* CreateItem(); + virtual wxMacDataItem* CreateItem(); virtual void MacInsertItem( unsigned int n, wxListItem* item ); virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item ); @@ -167,7 +202,23 @@ public: virtual void UpdateState(wxMacDataItem* dataItem, wxListItem* item); protected: + // we need to override to provide specialized handling for virtual wxListCtrls + virtual OSStatus GetSetItemData(DataBrowserItemID itemID, + DataBrowserPropertyID property, + DataBrowserItemDataRef itemData, + Boolean changeValue ); + + virtual void ItemNotification( + DataBrowserItemID itemID, + DataBrowserItemNotification message, + DataBrowserItemDataRef itemData); + + virtual Boolean CompareItems(DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty); + wxClientDataType m_clientDataItemsType; + bool m_isVirtual; }; @@ -203,6 +254,8 @@ void wxListCtrl::Init() m_textCtrl = NULL; m_genericImpl = NULL; m_dbImpl = NULL; + m_compareFunc = NULL; + m_compareFuncData = 0; } class wxGenericListCtrlHook : public wxGenericListCtrl @@ -220,6 +273,7 @@ public: { } +protected: virtual wxListItemAttr * OnGetItemAttr(long item) const { return m_nativeListCtrl->OnGetItemAttr(item); @@ -240,7 +294,6 @@ public: return m_nativeListCtrl->OnGetItemText(item, column); } -protected: wxListCtrl* m_nativeListCtrl; }; @@ -260,7 +313,7 @@ bool wxListCtrl::Create(wxWindow *parent, // Also, use generic list control in VIRTUAL mode. if ( (wxSystemOptions::HasOption( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) && (wxSystemOptions::GetOptionInt( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) == 1)) || - (style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) || (style & wxLC_VIRTUAL)) + (style & wxLC_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) /* || (style & wxLC_VIRTUAL) */ ) { m_macIsUserPane = true; @@ -278,8 +331,12 @@ bool wxListCtrl::Create(wxWindow *parent, return false; m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style ); m_peer = m_dbImpl; - + MacPostControlCreate( pos, size ); + + InstallControlEventHandler( m_peer->GetControlRef() , GetwxMacListCtrlEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, + (EventHandlerRef *)&m_macListCtrlEventHandler); } return true; @@ -705,6 +762,7 @@ void wxListCtrl::SetItemTextColour( long item, const wxColour &col ) if (m_genericImpl) { m_genericImpl->SetItemTextColour(item, col); + return; } wxListItem info; @@ -845,6 +903,18 @@ 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 ) + { + long count = m_dbImpl->MacGetCount() ; + for ( long line = item + 1 ; line < count; line++ ) + { + wxMacDataItem* id = m_dbImpl->GetItemFromLine(line); + if ( m_dbImpl->IsItemSelected(id ) ) + return line; + } + return -1; + } + return 0; } @@ -972,7 +1042,7 @@ bool wxListCtrl::DeleteAllColumns() m_dbImpl->GetColumnCount(&cols); for (UInt32 col = 0; col < cols; col++) { - DeleteColumn(col); + DeleteColumn(col); } } @@ -1047,7 +1117,7 @@ bool wxListCtrl::EnsureVisible(long item) m_dbImpl->RevealItem(dataItem, kDataBrowserRevealWithoutSelecting); } - return false; + return true; } // Find an item whose label matches this string, starting from the item after 'start' @@ -1186,7 +1256,6 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item) type = kDataBrowserIconAndTextType; } - fprintf(stderr, "Flush is %d\n", item.GetAlign()); SInt16 just = teFlushDefault; if (item.GetMask() & wxLIST_MASK_FORMAT) { @@ -1199,15 +1268,18 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item) } m_dbImpl->InsertColumn(col, type, item.GetText(), just, item.GetWidth()); + // set/remove options based on the wxListCtrl type. + DataBrowserTableViewColumnID id; + m_dbImpl->GetColumnIDFromIndex(col, &id); + DataBrowserPropertyFlags flags; + verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags)); if (GetWindowStyleFlag() & wxLC_EDIT_LABELS) - { - DataBrowserTableViewColumnID id; - m_dbImpl->GetColumnIDFromIndex(col, &id); - DataBrowserPropertyFlags flags; - verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags)); flags |= kDataBrowserPropertyIsEditable; - verify_noerr(m_dbImpl->SetPropertyFlags(id, flags)); + + if (GetWindowStyleFlag() & wxLC_VIRTUAL){ + flags &= ~kDataBrowserListViewSortableColumn; } + verify_noerr(m_dbImpl->SetPropertyFlags(id, flags)); } return col; @@ -1253,6 +1325,12 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data) { if (m_genericImpl) return m_genericImpl->SortItems(fn, data); + + if (m_dbImpl) + { + m_compareFunc = fn; + m_compareFuncData = data; + } return true; } @@ -1305,6 +1383,22 @@ void wxListCtrl::SetItemCount(long count) return; } + if (m_dbImpl) + { + // we need to temporarily disable the new item creation notification + // procedure to speed things up + // FIXME: Even this doesn't seem to help much... + DataBrowserCallbacks callbacks; + DataBrowserItemNotificationUPP itemUPP; + GetDataBrowserCallbacks(m_dbImpl->GetControlRef(), &callbacks); + itemUPP = callbacks.u.v1.itemNotificationCallback; + callbacks.u.v1.itemNotificationCallback = 0; + m_dbImpl->SetCallbacks(&callbacks); + ::AddDataBrowserItems(m_dbImpl->GetControlRef(), kDataBrowserNoItem, + count, NULL, kDataBrowserItemNoProperty); + callbacks.u.v1.itemNotificationCallback = itemUPP; + m_dbImpl->SetCallbacks(&callbacks); + } m_count = count; } @@ -1377,7 +1471,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , bool trigger = false; wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); - bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL; + bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0; event.SetEventObject( list ); event.m_itemIndex = owner->GetLineFromItem( this ) ; @@ -1434,6 +1528,10 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer { OSStatus err = noErr; m_clientDataItemsType = wxClientData_None; + m_isVirtual = false; + + if ( style & wxLC_VIRTUAL ) + m_isVirtual = true; DataBrowserSelectionFlags options = kDataBrowserDragSelect; if ( style & wxLC_SINGLE_SEL ) @@ -1457,24 +1555,23 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer if ( style & wxLC_LIST || style & wxLC_NO_HEADER ) verify_noerr( SetHeaderButtonHeight( 0 ) ); - SetDataBrowserSortProperty( m_controlRef , kMinColumnId ); + if ( m_isVirtual ) + SetSortProperty( kMinColumnId - 1 ); + else + SetSortProperty( kMinColumnId ); if ( style & wxLC_SORT_ASCENDING ) { m_sortOrder = SortOrder_Text_Ascending; - SetDataBrowserSortProperty( m_controlRef , kMinColumnId ); - SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing); + SetSortOrder( kDataBrowserOrderIncreasing ); } else if ( style & wxLC_SORT_DESCENDING ) { m_sortOrder = SortOrder_Text_Descending; - SetDataBrowserSortProperty( m_controlRef , kMinColumnId ); - SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderDecreasing); + SetSortOrder( kDataBrowserOrderDecreasing ); } else { m_sortOrder = SortOrder_None; - SetDataBrowserSortProperty( m_controlRef , kMinColumnId); - SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing); } if ( style & wxLC_VRULES ) @@ -1484,11 +1581,254 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer #endif } - verify_noerr( AutoSizeColumns() ); verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) ); err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true ); } +OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemID, + DataBrowserPropertyID property, + DataBrowserItemDataRef itemData, + Boolean changeValue ) +{ + wxString text; + int imgIndex = -1; + short listColumn = property - kMinColumnId; + + OSStatus err = errDataBrowserPropertyNotSupported; + wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); + wxMacListCtrlItem* lcItem; + + if (listColumn >= 0) + { + if (!m_isVirtual) + { + lcItem = (wxMacListCtrlItem*) itemID; + if (lcItem->HasColumnInfo(listColumn)){ + wxListItem* item = lcItem->GetColumnInfo(listColumn); + if (item->GetMask() & wxLIST_MASK_TEXT) + text = item->GetText(); + if (item->GetMask() & wxLIST_MASK_IMAGE) + imgIndex = item->GetImage(); + } + } + else + { + text = list->OnGetItemText( (long)itemID-1, listColumn ); + imgIndex = list->OnGetItemColumnImage( (long)itemID-1, listColumn ); + } + } + + if ( !changeValue ) + { + switch (property) + { + case kDataBrowserItemIsEditableProperty : + if ( list && list->HasFlag( wxLC_EDIT_LABELS ) ) + { + verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true )); + err = noErr ; + } + break ; + default : + if ( property >= kMinColumnId ) + { + wxMacCFStringHolder cfStr; + + if (text){ + cfStr.Assign( text, wxLocale::GetSystemEncoding() ); + err = ::SetDataBrowserItemDataText( itemData, cfStr ); + err = noErr; + } + + + + if ( imgIndex != -1 ) + { + wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL); + if (imageList && imageList->GetImageCount() > 0){ + wxBitmap bmp = imageList->GetBitmap(imgIndex); + IconRef icon = bmp.GetBitmapData()->GetIconRef(); + ::SetDataBrowserItemDataIcon(itemData, icon); + } + } + + } + break ; + } + + } + else + { + switch (property) + { + default: + if ( property >= kMinColumnId ) + { + short listColumn = property - kMinColumnId; + + // TODO probably send the 'end edit' from here, as we + // can then deal with the veto + CFStringRef sr ; + verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ; + wxMacCFStringHolder cfStr(sr) ;; + if (m_isVirtual) + list->SetItem( (long)itemData-1 , listColumn, cfStr.AsString() ) ; + else + { + if (lcItem) + lcItem->SetColumnTextValue( listColumn, cfStr.AsString() ); + } + err = noErr ; + } + break; + } + } + return err; +} + +void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID, + DataBrowserItemNotification message, + DataBrowserItemDataRef itemData ) +{ + // we want to depend on as little as possible to make sure tear-down of controls is safe + if ( message == kDataBrowserItemRemoved) + { + // make sure MacDelete does the proper teardown. + return; + } + else if ( message == kDataBrowserItemAdded ) + { + // we don't issue events on adding, the item is not really stored in the list yet, so we + // 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() ) + { + 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; + } + + switch (message) + { + case kDataBrowserItemDeselected: + event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED); + if ( !isSingle ) + trigger = IsSelectionSuppressed(); + break; + + case kDataBrowserItemSelected: + trigger = IsSelectionSuppressed(); + break; + + case kDataBrowserItemDoubleClicked: + event.SetEventType( wxEVT_LEFT_DCLICK ); + trigger = true; + break; + + case kDataBrowserEditStarted : + // TODO : how to veto ? + event.SetEventType( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ) ; + trigger = true ; + break ; + + case kDataBrowserEditStopped : + // TODO probably trigger only upon the value store callback, because + // here IIRC we cannot veto + event.SetEventType( wxEVT_COMMAND_LIST_END_LABEL_EDIT ) ; + trigger = true ; + break ; + + default: + break; + } + + if ( trigger ) + { + // direct notification is not always having the listbox GetSelection() having in synch with event + wxPostEvent( list->GetEventHandler(), event ); + } + } +} + +Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneID, + DataBrowserItemID itemTwoID, + DataBrowserPropertyID sortProperty) +{ + + bool retval = false; + wxString itemText; + wxString otherItemText; + int colId = sortProperty - kMinColumnId; + long itemNum = 0; + long otherItemNum = 0; + + wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl ); + + // means we need to + if (colId >= 0) + { + if (!m_isVirtual) + { + wxMacListCtrlItem* item = (wxMacListCtrlItem*)itemOneID; + wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID; + wxListCtrlCompare func = list->GetCompareFunc(); + if (func != NULL && item->HasColumnInfo(colId) && otherItem->HasColumnInfo(colId)) + return func(item->GetColumnInfo(colId)->GetData(), otherItem->GetColumnInfo(colId)->GetData(), list->GetCompareFuncData()) >= 0; + + itemNum = item->GetOrder(); + otherItemNum = otherItem->GetOrder(); + if (item->HasColumnInfo(colId)) + itemText = item->GetColumnInfo(colId)->GetText(); + if (otherItem->HasColumnInfo(colId)) + otherItemText = otherItem->GetColumnInfo(colId)->GetText(); + } + else + { + itemNum = (long)itemOneID; + 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; + } + } + else{ + // fallback for undefined cases + retval = itemOneID < itemTwoID; + } + + return retval; +} + wxMacDataBrowserListCtrlControl::~wxMacDataBrowserListCtrlControl() { } @@ -1561,7 +1901,7 @@ void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* MacSetColumnInfo(n, 0, item); } -wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem() +wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem() { return new wxMacListCtrlItem(); } @@ -1617,19 +1957,10 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) if ( column >= m_rowItems.GetCount() ) { wxListItem* listItem = new wxListItem(*item); - //listItem->SetAlign(item->GetAlign()); - //listItem->SetBackgroundColour(item->GetBackgroundColour()); - //listItem->SetColumn(item->GetColumn()); - //listItem->SetData(item->GetData()); - //listItem->SetFont(item->GetFont()); - //listItem->SetId(GetOrder()); - //listItem->SetImage(item->GetImage()); - //listItem->SetMask(item->GetMask()); - - //listItem->SetText(item->GetText()); m_rowItems.Append( listItem ); } - else{ + else + { wxListItem* listItem = GetColumnInfo( column ); long mask = item->GetMask(); if (mask & wxLIST_MASK_TEXT) @@ -1647,88 +1978,4 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) } } -OSStatus wxMacListCtrlItem::GetSetData( wxMacDataItemBrowserControl *owner , - DataBrowserPropertyID property, - DataBrowserItemDataRef itemData, - bool changeValue ) -{ - - OSStatus err = errDataBrowserPropertyNotSupported; - wxListCtrl* list = wxDynamicCast( owner->GetPeer() , wxListCtrl ); - if ( !changeValue ) - { - switch (property) - { - case kDataBrowserItemIsEditableProperty : - if ( list && list->HasFlag( wxLC_EDIT_LABELS ) ) - { - verify_noerr(SetDataBrowserItemDataBooleanValue( itemData, true )); - err = noErr ; - } - break ; - default : - if ( property >= kMinColumnId ) - { - short listColumn = property - kMinColumnId; - - if (HasColumnInfo(listColumn)) - { - wxListItem* item = GetColumnInfo(listColumn); - wxMacCFStringHolder cfStr; - - if (item->GetText()) - { - cfStr.Assign( item->GetText(), wxLocale::GetSystemEncoding() ); - err = ::SetDataBrowserItemDataText( itemData, cfStr ); - err = noErr; - } - - int imgIndex = item->GetImage(); - if ( (item->GetMask() & wxLIST_MASK_IMAGE) ) - { - wxImageList* imageList = list->GetImageList(wxIMAGE_LIST_SMALL); - if (imageList && imageList->GetImageCount() > 0) - { - wxBitmap bmp = imageList->GetBitmap(imgIndex); - IconRef icon = bmp.GetBitmapData()->GetIconRef(); - ::SetDataBrowserItemDataIcon(itemData, icon); - } - } - - } - } - break ; - } - } - else - { - switch (property) - { - default: - if ( property >= kMinColumnId ) - { - short listColumn = property - kMinColumnId; - - if (HasColumnInfo(listColumn)) - { - // TODO probably send the 'end edit' from here, as we - // can then deal with the veto - CFStringRef sr ; - verify_noerr( GetDataBrowserItemDataText( itemData , &sr ) ) ; - wxMacCFStringHolder cfStr(sr) ;; - list->SetItem( owner->GetLineFromItem(this) , listColumn, cfStr.AsString() ) ; - err = noErr ; - } - } - break; - } - } - - // don't duplicate the numeric order column handling - if (err == errDataBrowserPropertyNotSupported) - err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue); - - return err; -} - #endif // wxUSE_LISTCTRL