X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e96bbb453c4065b2219cbd606a95f069ab04746c..80a779275ae04443c568dca919adb26cf6f5002c:/src/mac/carbon/listctrl_mac.cpp diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index a3dc96b13b..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,31 +116,70 @@ 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: wxMacListCtrlItem(); - + virtual void Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemNotification message, DataBrowserItemDataRef itemData ) const; - + virtual void SetColumnInfo( unsigned int column, wxListItem* item ); virtual wxListItem* GetColumnInfo( unsigned int column ); virtual bool HasColumnInfo( unsigned int column ); - + virtual void SetColumnTextValue( unsigned int column, const wxString& text ); - virtual const wxString& GetColumnTextValue( unsigned int column ); - + virtual const wxString& GetColumnTextValue( unsigned int column ); + 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,19 +194,35 @@ 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 ); virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item ); 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; }; -// TODO: This gives errors, find out why. +// TODO: This gives errors, find out why. //BEGIN_EVENT_TABLE(wxListCtrl, wxControl) // EVT_PAINT(wxListCtrl::OnPaint) //END_EVENT_TABLE() @@ -194,7 +245,7 @@ void wxListCtrl::Init() m_imageListNormal = NULL; m_imageListSmall = NULL; m_imageListState = NULL; - + // keep track of if we created our own image lists, or if they were assigned // to us. m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false; @@ -203,8 +254,50 @@ void wxListCtrl::Init() m_textCtrl = NULL; m_genericImpl = NULL; m_dbImpl = NULL; + m_compareFunc = NULL; + m_compareFuncData = 0; } +class wxGenericListCtrlHook : public wxGenericListCtrl +{ +public: + wxGenericListCtrlHook(wxListCtrl* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) + : wxGenericListCtrl(parent, id, pos, size, style, validator, name), + m_nativeListCtrl(parent) + { + } + +protected: + virtual wxListItemAttr * OnGetItemAttr(long item) const + { + return m_nativeListCtrl->OnGetItemAttr(item); + } + + virtual int OnGetItemImage(long item) const + { + return m_nativeListCtrl->OnGetItemImage(item); + } + + virtual int OnGetItemColumnImage(long item, long column) const + { + return m_nativeListCtrl->OnGetItemColumnImage(item, column); + } + + virtual wxString OnGetItemText(long item, long column) const + { + return m_nativeListCtrl->OnGetItemText(item, column); + } + + wxListCtrl* m_nativeListCtrl; + +}; + bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -217,35 +310,40 @@ bool wxListCtrl::Create(wxWindow *parent, // for now, we'll always use the generic list control for ICON and LIST views, // because they dynamically change the number of columns on resize. // Also, allow the user to set it to use the list ctrl as well. - if ( (wxSystemOptions::HasOption( wxMAC_ALWAYS_USE_GENERIC_LISTCTRL ) + // 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_ICON) || (style & wxLC_SMALL_ICON) || (style & wxLC_LIST) /* || (style & wxLC_VIRTUAL) */ ) { m_macIsUserPane = true; - + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) return false; - m_genericImpl = new wxGenericListCtrl(this, id, pos, size, style, validator, name); + m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name); return true; } - + else { m_macIsUserPane = false; - + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) 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; } wxListCtrl::~wxListCtrl() -{ +{ if (m_ownsImageListNormal) delete m_imageListNormal; if (m_ownsImageListSmall) @@ -289,7 +387,8 @@ void wxListCtrl::SetWindowStyleFlag(long flag) { m_windowStyle = flag; - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetWindowStyleFlag(flag); } @@ -297,9 +396,10 @@ void wxListCtrl::SetWindowStyleFlag(long flag) } } -void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags ){ +void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags ) +{ wxControl::DoSetSize(x, y, width, height, sizeFlags); - + if (m_genericImpl) m_genericImpl->SetSize(x, y, width, height, sizeFlags); } @@ -315,7 +415,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const return m_genericImpl->GetColumn(col, item); bool success = true; - + if ( item.m_mask & wxLIST_MASK_TEXT ) { } @@ -341,7 +441,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item) { if (m_genericImpl) return m_genericImpl->SetColumn(col, item); - + return false; } @@ -349,8 +449,9 @@ int wxListCtrl::GetColumnCount() const { if (m_genericImpl) return m_genericImpl->GetColumnCount(); - - if (m_dbImpl){ + + if (m_dbImpl) + { UInt32 count; m_dbImpl->GetColumnCount(&count); return count; @@ -364,8 +465,9 @@ int wxListCtrl::GetColumnWidth(int col) const { if (m_genericImpl) return m_genericImpl->GetColumnWidth(col); - - if (m_dbImpl){ + + if (m_dbImpl) + { return m_dbImpl->GetColumnWidth(col); } @@ -377,16 +479,30 @@ bool wxListCtrl::SetColumnWidth(int col, int width) { if (m_genericImpl) return m_genericImpl->SetColumnWidth(col, width); - + // TODO: This is setting the width of the first column // to the entire window width; investigate why // this is. - - //if (m_dbImpl){ - // m_dbImpl->SetColumnWidth(col+1, width); - // return true; - //} - + + if (m_dbImpl) + { + int mywidth = width; + if (width == wxLIST_AUTOSIZE || width == wxLIST_AUTOSIZE_USEHEADER) + mywidth = 150; + + if (col == -1) + { + for (int column = 0; column < GetColumnCount(); column++) + { + m_dbImpl->SetColumnWidth(col, mywidth); + } + } + else{ + m_dbImpl->SetColumnWidth(col, mywidth); + } + return true; + } + return false; } @@ -398,10 +514,11 @@ int wxListCtrl::GetCountPerPage() const { if (m_genericImpl) return m_genericImpl->GetCountPerPage(); - - if (m_dbImpl){ + + if (m_dbImpl) + { } - + return 1; } @@ -410,7 +527,7 @@ wxTextCtrl* wxListCtrl::GetEditControl() const { if (m_genericImpl) return m_genericImpl->GetEditControl(); - + return NULL; } @@ -419,7 +536,7 @@ bool wxListCtrl::GetItem(wxListItem& info) const { if (m_genericImpl) return m_genericImpl->GetItem(info); - + if (m_dbImpl) m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info); bool success = true; @@ -462,7 +579,7 @@ int wxListCtrl::GetItemState(long item, long stateMask) const { if (m_genericImpl) return m_genericImpl->GetItemState(item, stateMask); - + wxListItem info; info.m_mask = wxLIST_MASK_STATE; @@ -516,7 +633,7 @@ wxString wxListCtrl::GetItemText(long item) const { if (m_genericImpl) return m_genericImpl->GetItemText(item); - + wxListItem info; info.m_mask = wxLIST_MASK_TEXT; @@ -532,7 +649,7 @@ void wxListCtrl::SetItemText(long item, const wxString& str) { if (m_genericImpl) return m_genericImpl->SetItemText(item, str); - + wxListItem info; info.m_mask = wxLIST_MASK_TEXT; @@ -563,7 +680,7 @@ bool wxListCtrl::SetItemData(long item, long data) { if (m_genericImpl) return m_genericImpl->SetItemData(item, data); - + wxListItem info; info.m_mask = wxLIST_MASK_DATA; @@ -577,10 +694,10 @@ wxRect wxListCtrl::GetViewRect() const { wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST), _T("wxListCtrl::GetViewRect() only works in icon mode") ); - + if (m_genericImpl) return m_genericImpl->GetViewRect(); - + wxRect rect; return rect; } @@ -591,7 +708,7 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const if (m_genericImpl) return m_genericImpl->GetItemRect(item, rect, code); - return true; + return true; } // Gets the item position @@ -622,10 +739,16 @@ int wxListCtrl::GetItemCount() const if (m_dbImpl) return m_dbImpl->MacGetCount(); - + return m_count; } +void wxListCtrl::SetItemSpacing( int spacing, bool isSmall ) +{ + if (m_genericImpl) + m_genericImpl->SetItemSpacing(spacing, isSmall); +} + wxSize wxListCtrl::GetItemSpacing() const { if (m_genericImpl) @@ -636,10 +759,12 @@ wxSize wxListCtrl::GetItemSpacing() const void wxListCtrl::SetItemTextColour( long item, const wxColour &col ) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetItemTextColour(item, col); + return; } - + wxListItem info; info.m_itemId = item; info.SetTextColour( col ); @@ -650,8 +775,9 @@ wxColour wxListCtrl::GetItemTextColour( long item ) const { if (m_genericImpl) return m_genericImpl->GetItemTextColour(item); - - if (m_dbImpl){ + + if (m_dbImpl) + { wxListItem info; if (GetItem(info)) return info.GetTextColour(); @@ -661,11 +787,12 @@ wxColour wxListCtrl::GetItemTextColour( long item ) const void wxListCtrl::SetItemBackgroundColour( long item, const wxColour &col ) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetItemBackgroundColour(item, col); return; } - + wxListItem info; info.m_itemId = item; info.SetBackgroundColour( col ); @@ -676,8 +803,9 @@ wxColour wxListCtrl::GetItemBackgroundColour( long item ) const { if (m_genericImpl) return m_genericImpl->GetItemBackgroundColour(item); - - if (m_dbImpl){ + + if (m_dbImpl) + { wxListItem info; if (GetItem(info)) return info.GetBackgroundColour(); @@ -687,7 +815,8 @@ wxColour wxListCtrl::GetItemBackgroundColour( long item ) const void wxListCtrl::SetItemFont( long item, const wxFont &f ) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetItemFont(item, f); return; } @@ -702,8 +831,9 @@ wxFont wxListCtrl::GetItemFont( long item ) const { if (m_genericImpl) return m_genericImpl->GetItemFont(item); - - if (m_dbImpl){ + + if (m_dbImpl) + { wxListItem info; if (GetItem(info)) return info.GetFont(); @@ -733,16 +863,19 @@ wxColour wxListCtrl::GetTextColour() const // TODO: we need owner drawn list items to customize text color. if (m_dbImpl) return *wxBLACK; + + return wxNullColour; } // Sets the text colour of the listview void wxListCtrl::SetTextColour(const wxColour& col) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetTextColour(col); return; } - + // TODO: if we add owner-drawn item support for DataBrowser, // consider supporting this property } @@ -753,7 +886,7 @@ long wxListCtrl::GetTopItem() const { if (m_genericImpl) return m_genericImpl->GetTopItem(); - + return 0; } @@ -770,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; } @@ -796,12 +941,12 @@ wxImageList *wxListCtrl::GetImageList(int which) const void wxListCtrl::SetImageList(wxImageList *imageList, int which) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetImageList(imageList, which); return; } - int flags = 0; if ( which == wxIMAGE_LIST_NORMAL ) { if (m_ownsImageListNormal) delete m_imageListNormal; @@ -824,7 +969,8 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which) void wxListCtrl::AssignImageList(wxImageList *imageList, int which) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->AssignImageList(imageList, which); return; } @@ -855,14 +1001,15 @@ bool wxListCtrl::DeleteItem(long item) { if (m_genericImpl) return m_genericImpl->DeleteItem(item); - - if (m_dbImpl){ + + if (m_dbImpl) + { m_dbImpl->MacDelete(item); wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ITEM, GetId() ); event.SetEventObject( this ); event.m_itemIndex = item; - GetEventHandler()->ProcessEvent( event ); - + GetEventHandler()->ProcessEvent( event ); + } return true; } @@ -872,12 +1019,13 @@ bool wxListCtrl::DeleteAllItems() { if (m_genericImpl) return m_genericImpl->DeleteAllItems(); - - if (m_dbImpl){ + + if (m_dbImpl) + { m_dbImpl->MacClear(); wxListEvent event( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, GetId() ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + GetEventHandler()->ProcessEvent( event ); } return true; } @@ -887,15 +1035,17 @@ bool wxListCtrl::DeleteAllColumns() { if (m_genericImpl) return m_genericImpl->DeleteAllColumns(); - - if (m_dbImpl){ + + if (m_dbImpl) + { UInt32 cols; m_dbImpl->GetColumnCount(&cols); - for (UInt32 col = 0; col < cols; col++){ + for (UInt32 col = 0; col < cols; col++) + { DeleteColumn(col); - } + } } - + return true; } @@ -904,33 +1054,42 @@ bool wxListCtrl::DeleteColumn(int col) { if (m_genericImpl) return m_genericImpl->DeleteColumn(col); - - if (m_dbImpl){ + + if (m_dbImpl) + { OSStatus err = m_dbImpl->RemoveColumn(col); return err == noErr; } - + return true; } // Clears items, and columns if there are any. void wxListCtrl::ClearAll() { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->ClearAll(); return; } - - DeleteAllItems(); - if ( m_colCount > 0 ) + + if (m_dbImpl) + { + DeleteAllItems(); DeleteAllColumns(); + } } wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass) { if (m_genericImpl) return m_genericImpl->EditLabel(item, textControlClass); - + + if (m_dbImpl) + { + wxMacDataItem* id = m_dbImpl->GetItemFromLine(item); + verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), (DataBrowserItemID)id, kMinColumnId) ); + } return NULL; } @@ -939,10 +1098,11 @@ bool wxListCtrl::EndEditLabel(bool cancel) { // TODO: generic impl. doesn't have this method - is it needed for us? if (m_genericImpl) - return false; // m_genericImpl->EndEditLabel(cancel); - - bool b = true; - return b; + return true; // m_genericImpl->EndEditLabel(cancel); + + if (m_dbImpl) + verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, kMinColumnId) ); + return true; } // Ensures this item is visible @@ -950,11 +1110,14 @@ bool wxListCtrl::EnsureVisible(long item) { if (m_genericImpl) return m_genericImpl->EnsureVisible(item); - - if (m_dbImpl){ + + if (m_dbImpl) + { wxMacDataItem* dataItem = m_dbImpl->GetItemFromLine(item); m_dbImpl->RevealItem(dataItem, kDataBrowserRevealWithoutSelecting); } + + return true; } // Find an item whose label matches this string, starting from the item after 'start' @@ -973,7 +1136,7 @@ long wxListCtrl::FindItem(long start, long data) { if (m_genericImpl) return m_genericImpl->FindItem(start, data); - + long idx = start + 1; long count = GetItemCount(); @@ -1016,13 +1179,19 @@ long wxListCtrl::InsertItem(wxListItem& info) if (m_genericImpl) return m_genericImpl->InsertItem(info); - - if (m_dbImpl){ + + if (m_dbImpl) + { + int count = GetItemCount(); + + if (info.m_itemId > count) + 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 ); + GetEventHandler()->ProcessEvent( event ); } return info.m_itemId; @@ -1045,7 +1214,7 @@ long wxListCtrl::InsertItem(long index, int imageIndex) { if (m_genericImpl) return m_genericImpl->InsertItem(index, imageIndex); - + wxListItem info; info.m_image = imageIndex; info.m_mask = wxLIST_MASK_IMAGE; @@ -1058,7 +1227,7 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex) { if (m_genericImpl) return m_genericImpl->InsertItem(index, label, imageIndex); - + wxListItem info; info.m_image = imageIndex; info.m_text = label; @@ -1072,21 +1241,24 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item) { if (m_genericImpl) return m_genericImpl->InsertColumn(col, item); - - if (m_dbImpl){ - if ( !(item.GetMask() & wxLIST_MASK_WIDTH) ) //item.GetWidth() == 0) - item.SetWidth(300); + + if (m_dbImpl) + { + if ( !(item.GetMask() & wxLIST_MASK_WIDTH) ) + item.SetWidth(150); + DataBrowserPropertyType type = kDataBrowserTextType; wxImageList* imageList = GetImageList(wxIMAGE_LIST_SMALL); - if (imageList && imageList->GetImageCount() > 0){ + if (imageList && imageList->GetImageCount() > 0) + { wxBitmap bmp = imageList->GetBitmap(0); if (bmp.Ok()) type = kDataBrowserIconAndTextType; } - - fprintf(stderr, "Flush is %d\n", item.GetAlign()); + SInt16 just = teFlushDefault; - if (item.GetMask() & wxLIST_MASK_FORMAT){ + if (item.GetMask() & wxLIST_MASK_FORMAT) + { if (item.GetAlign() == wxLIST_FORMAT_LEFT) just = teFlushLeft; else if (item.GetAlign() == wxLIST_FORMAT_CENTER) @@ -1094,9 +1266,22 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item) else if (item.GetAlign() == wxLIST_FORMAT_RIGHT) just = teFlushRight; } - m_dbImpl->InsertColumn(col, type, item.GetText(), just, -1, item.GetWidth()); + 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) + flags |= kDataBrowserPropertyIsEditable; + + if (GetWindowStyleFlag() & wxLC_VIRTUAL){ + flags &= ~kDataBrowserListViewSortableColumn; + } + verify_noerr(m_dbImpl->SetPropertyFlags(id, flags)); } - + return col; } @@ -1127,8 +1312,9 @@ bool wxListCtrl::ScrollList(int dx, int dy) { if (m_genericImpl) return m_genericImpl->ScrollList(dx, dy); - - if (m_dbImpl){ + + if (m_dbImpl) + { m_dbImpl->SetScrollPosition(dx, dy); } return true; @@ -1140,6 +1326,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; } @@ -1185,21 +1377,39 @@ void wxListCtrl::SetItemCount(long count) { wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") ); - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->SetItemCount(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; } void wxListCtrl::RefreshItem(long item) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->RefreshItem(item); return; } - + wxRect rect; GetItemRect(item, rect); RefreshRect(rect); @@ -1207,7 +1417,8 @@ void wxListCtrl::RefreshItem(long item) void wxListCtrl::RefreshItems(long itemFrom, long itemTo) { - if (m_genericImpl){ + if (m_genericImpl) + { m_genericImpl->RefreshItems(itemFrom, itemTo); return; } @@ -1223,7 +1434,7 @@ void wxListCtrl::RefreshItems(long itemFrom, long itemTo) } -// wxMac internal data structures +// wxMac internal data structures wxMacListCtrlItem::~wxMacListCtrlItem() { @@ -1234,7 +1445,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , DataBrowserItemDataRef itemData ) const { - wxMacDataBrowserListControl *lb = dynamic_cast(owner); + wxMacDataBrowserListCtrlControl *lb = dynamic_cast(owner); // we want to depend on as little as possible to make sure tear-down of controls is safe if ( message == kDataBrowserItemRemoved) @@ -1247,36 +1458,38 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , delete this; 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 gettting out now + return ; + } - // TO STEFAN: I'm getting a couple different problems here and I'd appreciate - // if you could take a look at them. - // 1) wxDynamicCast fails during shutdown. This doesn't suprise me, but - // you have similar listbox code, so I'm wondering why this case is different. - // 2) owner->GetLineFromItem( this ) always asserts. - // 3) the !lb->IsSelectionSuppressed code also fails with EXC_BAD_ACCESS - - // To be honest, I think there are casting issues here, but I don't work enough - // in C++ that these things are clear to me, so I'm hoping another pair of eyes - // would help. ;-) - // In any case, I set trigger to false so that these events are not sent. - - // during shutdown, this may fail. wxListCtrl *list = wxDynamicCast( owner->GetPeer() , wxListCtrl ); - if ( list ){ + if ( list ) + { bool trigger = false; - - wxCommandEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); - bool isSingle = list->GetWindowStyle() | wxLC_SINGLE_SEL; + + wxListEvent event( wxEVT_COMMAND_LIST_ITEM_SELECTED, list->GetId() ); + bool isSingle = (list->GetWindowStyle() & wxLC_SINGLE_SEL) != 0; + + event.SetEventObject( list ); + event.m_itemIndex = owner->GetLineFromItem( this ) ; + if ( !list->IsVirtual() ) + { + lb->MacGetColumnInfo(event.m_itemIndex,0,event.m_item); + } + switch (message) { case kDataBrowserItemDeselected: event.SetEventType(wxEVT_COMMAND_LIST_ITEM_DESELECTED); - //if ( !isSingle ) - // trigger = !lb->IsSelectionSuppressed(); + if ( !isSingle ) + trigger = !lb->IsSelectionSuppressed(); break; case kDataBrowserItemSelected: - //trigger = !lb->IsSelectionSuppressed(); + trigger = !lb->IsSelectionSuppressed(); break; case kDataBrowserItemDoubleClicked: @@ -1284,24 +1497,27 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner , 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 ) { - event.SetEventObject( list ); - //if ( list->HasClientObjectData() ) - // event.SetClientObject( (wxClientData*) m_data ); - //else if ( list->HasClientUntypedData() ) - // event.SetClientData( m_data ); - event.SetString( m_label ); - event.SetInt( owner->GetLineFromItem( this ) ); - event.SetExtraLong( !isSingle ? message == kDataBrowserItemSelected : true ); - wxPostEvent( list->GetEventHandler(), event ); - // direct notification is not always having the listbox GetSelection() having in synch with event - // list->GetEventHandler()->ProcessEvent(event); + wxPostEvent( list->GetEventHandler(), event ); } } @@ -1312,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 ) @@ -1320,107 +1540,337 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer } else { - options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection; + options |= kDataBrowserCmdTogglesSelection; } err = SetSelectionFlags( options ); verify_noerr( err ); - // create the numeric order column - DataBrowserListViewColumnDesc columnDesc; - columnDesc.headerBtnDesc.titleOffset = 0; - columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc; - - columnDesc.headerBtnDesc.btnFontStyle.flags = - kControlUseFontMask | kControlUseJustMask; - - columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent; - columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault; - columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont; - columnDesc.headerBtnDesc.btnFontStyle.style = normal; - columnDesc.headerBtnDesc.titleString = NULL; - - columnDesc.headerBtnDesc.minimumWidth = 0; - columnDesc.headerBtnDesc.maximumWidth = 0; - columnDesc.propertyDesc.propertyID = kNumericOrderColumnId; - columnDesc.propertyDesc.propertyType = kDataBrowserPropertyRelevanceRankPart; - columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn; -#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 - columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn; -#endif - - verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) ); - - if ( style & wxLC_LIST ){ + if ( style & wxLC_LIST ) + { InsertColumn(0, kDataBrowserIconAndTextType, wxEmptyString, -1, -1); verify_noerr( AutoSizeColumns() ); - verify_noerr( SetHeaderButtonHeight( 0 ) ); } - SetDataBrowserSortProperty( m_controlRef , kMinColumnId ); + if ( style & wxLC_LIST || style & wxLC_NO_HEADER ) + verify_noerr( SetHeaderButtonHeight( 0 ) ); + + 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 , kNumericOrderColumnId); - SetDataBrowserSortOrder( m_controlRef , kDataBrowserOrderIncreasing); } - verify_noerr( AutoSizeColumns() ); + 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 ); } +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() { } void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item ) -{ +{ wxMacDataItem* dataItem = GetItemFromLine(row); - if (item){ + if (item) + { wxMacListCtrlItem* listItem = dynamic_cast(dataItem); listItem->SetColumnInfo( column, item ); UpdateState(dataItem, item); } } -// apply changes that need to happen immediately, rather than when the +// apply changes that need to happen immediately, rather than when the // databrowser control fires a callback. void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxListItem* listItem) { bool isSelected = IsItemSelected( dataItem ); bool isSelectedState = (listItem->GetState() == wxLIST_STATE_SELECTED); - // toggle the selection state if wxListInfo state and actual state don't match. - if ( isSelected != isSelectedState ){ + // toggle the selection state if wxListInfo state and actual state don't match. + if ( isSelected != isSelectedState ) + { DataBrowserSetOption options = kDataBrowserItemsAdd; if (!isSelectedState) options = kDataBrowserItemsRemove; - fprintf(stderr, "state = %d, db options = %d\n", isSelectedState, options); SetSelectedItem(dataItem, options); } // TODO: Set column width if item width > than current column width } void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item ) -{ +{ wxMacDataItem* dataItem = GetItemFromLine(row); - if (item){ + // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate + //if (item) + { wxMacListCtrlItem* listItem = dynamic_cast(dataItem); wxListItem* oldItem = listItem->GetColumnInfo( column ); - + long mask = item.GetMask(); if ( !mask ) // by default, get everything for backwards compatibility @@ -1441,7 +1891,7 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign item.SetTextColour(oldItem->GetTextColour()); item.SetBackgroundColour(oldItem->GetBackgroundColour()); - item.SetFont(oldItem->GetFont()); + item.SetFont(oldItem->GetFont()); } } @@ -1451,7 +1901,7 @@ void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* MacSetColumnInfo(n, 0, item); } -wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem() +wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem() { return new wxMacListCtrlItem(); } @@ -1482,7 +1932,7 @@ const wxString& wxMacListCtrlItem::GetColumnTextValue( unsigned int column ) void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString& text ) { GetColumnInfo(column)->SetText(text); - + // for compatibility with superclass APIs if ( column == 0 ) SetLabel(text); @@ -1504,21 +1954,13 @@ bool wxMacListCtrlItem::HasColumnInfo( unsigned int column ) void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) { - if ( column >= m_rowItems.GetCount() ){ + 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) @@ -1536,56 +1978,4 @@ void wxMacListCtrlItem::SetColumnInfo( unsigned int column, wxListItem* item ) } } -OSStatus wxMacListCtrlItem::GetSetData( wxMacDataItemBrowserControl *owner , - DataBrowserPropertyID property, - DataBrowserItemDataRef itemData, - bool changeValue ) -{ - OSStatus err = errDataBrowserPropertyNotSupported; - if ( !changeValue ) - { - 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 (imgIndex != -1){ - wxListCtrl* list = wxDynamicCast( owner->GetPeer() , wxListCtrl ); - 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); - } - } - - } - } - } - else - { - switch (property) - { - // no editable props here - default: - break; - } - } - - // don't duplicate the numeric order column handling - if (err == errDataBrowserPropertyNotSupported) - err = wxMacDataItem::GetSetData(owner, property, itemData, changeValue); - - return err; -} - #endif // wxUSE_LISTCTRL