X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc813e6c7ef8a9a26c035b004b512e1aa1b0bf3f..bd235295fb3b35fdb29326084b87893cf5432eb5:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index b38d9489f6..de0608121e 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -18,34 +18,19 @@ #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" -#include "wx/spinctrl.h" -#include "wx/choice.h" - -#include "wx/weakref.h" -#include "wx/vector.h" #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/settings.h" #include "wx/log.h" - #include "wx/icon.h" #include "wx/crt.h" #endif -const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; - - -bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) -{ - return (left.GetID() == right.GetID() ); -} +#include "wx/spinctrl.h" +#include "wx/choice.h" +#include "wx/imaglist.h" -#ifdef __WXDEBUG__ -void wxDataViewItem::Print(const wxString& text) const -{ - wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id)); -} -#endif +const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; // --------------------------------------------------------- // wxDataViewModelNotifier @@ -235,7 +220,7 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier ) } int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int column, bool ascending ) + unsigned int column, bool ascending ) const { // sort branches before leaves bool item1_is_container = IsContainer(item1); @@ -289,7 +274,7 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem if (dt1.IsEarlierThan(dt2)) return 1; if (dt2.IsEarlierThan(dt1)) - return -11; + return -1; } // items must be different @@ -318,11 +303,7 @@ wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) unsigned int i; for (i = 1; i < initial_size+1; i++) m_hash.Add( wxUIntToPtr(i) ); - m_lastIndex = initial_size + 1; -} - -wxDataViewIndexListModel::~wxDataViewIndexListModel() -{ + m_nextFreeID = initial_size + 1; } void wxDataViewIndexListModel::Reset( unsigned int new_size ) @@ -336,7 +317,8 @@ void wxDataViewIndexListModel::Reset( unsigned int new_size ) unsigned int i; for (i = 1; i < new_size+1; i++) m_hash.Add( wxUIntToPtr(i) ); - m_lastIndex = new_size + 1; + + m_nextFreeID = new_size + 1; wxDataViewModel::Cleared(); } @@ -345,17 +327,22 @@ void wxDataViewIndexListModel::RowPrepended() { m_ordered = false; - unsigned int id = m_lastIndex++; + unsigned int id = m_nextFreeID; + m_nextFreeID++; + m_hash.Insert( wxUIntToPtr(id), 0 ); wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); + } void wxDataViewIndexListModel::RowInserted( unsigned int before ) { m_ordered = false; - unsigned int id = m_lastIndex++; + unsigned int id = m_nextFreeID; + m_nextFreeID++; + m_hash.Insert( wxUIntToPtr(id), before ); wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); @@ -363,7 +350,9 @@ void wxDataViewIndexListModel::RowInserted( unsigned int before ) void wxDataViewIndexListModel::RowAppended() { - unsigned int id = m_lastIndex++; + unsigned int id = m_nextFreeID; + m_nextFreeID++; + m_hash.Add( wxUIntToPtr(id) ); wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); @@ -411,10 +400,7 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const { if (m_ordered) - { - unsigned int pos = wxPtrToUInt( item.GetID() ); - return pos-1; - } + return wxPtrToUInt(item.GetID())-1; // assert for not found return (unsigned int) m_hash.Index( item.GetID() ); @@ -434,12 +420,12 @@ bool wxDataViewIndexListModel::HasDefaultCompare() const int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int WXUNUSED(column), - bool ascending) + bool ascending) const { if (m_ordered) { - unsigned int pos1 = wxPtrToUInt(item1.GetID()); - unsigned int pos2 = wxPtrToUInt(item2.GetID()); + unsigned int pos1 = wxPtrToUInt(item1.GetID()); // -1 not needed here + unsigned int pos2 = wxPtrToUInt(item2.GetID()); // -1 not needed here if (ascending) return pos1 - pos2; @@ -453,37 +439,6 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, return GetRow(item2) - GetRow(item1); } -void wxDataViewIndexListModel::GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const -{ - GetValueByRow( variant, GetRow(item), col ); -} - -bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) -{ - return SetValueByRow( variant, GetRow(item), col ); -} - -bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) -{ - return GetAttrByRow( GetRow(item), col, attr ); -} - -wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const -{ - return wxDataViewItem(0); -} - -bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const -{ - // only the invisible root item has children - if (!item.IsOk()) - return true; - - return false; -} - unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { if (item.IsOk()) @@ -502,50 +457,48 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size ) { - m_lastIndex = initial_size-1; -} - -wxDataViewVirtualListModel::~wxDataViewVirtualListModel() -{ + m_size = initial_size; } void wxDataViewVirtualListModel::Reset( unsigned int new_size ) { - m_lastIndex = new_size-1; + m_size = new_size; wxDataViewModel::Cleared(); } void wxDataViewVirtualListModel::RowPrepended() { - m_lastIndex++; - wxDataViewItem item( NULL ); + m_size++; + wxDataViewItem item( wxUIntToPtr(1) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowInserted( unsigned int before ) { - m_lastIndex++; - wxDataViewItem item( wxUIntToPtr(before) ); + m_size++; + wxDataViewItem item( wxUIntToPtr(before+1) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowAppended() { - m_lastIndex++; - wxDataViewItem item( wxUIntToPtr(m_lastIndex) ); + m_size++; + wxDataViewItem item( wxUIntToPtr(m_size) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) { - wxDataViewItem item( wxUIntToPtr(row) ); + m_size--; + wxDataViewItem item( wxUIntToPtr(row+1) ); wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); - m_lastIndex++; } void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) { + m_size -= rows.GetCount(); + wxArrayInt sorted = rows; sorted.Sort( my_sort ); @@ -553,12 +506,10 @@ void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) unsigned int i; for (i = 0; i < sorted.GetCount(); i++) { - wxDataViewItem item( wxUIntToPtr(sorted[i]) ); + wxDataViewItem item( wxUIntToPtr(sorted[i]+1) ); array.Add( item ); } wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); - - m_lastIndex -= rows.GetCount(); } void wxDataViewVirtualListModel::RowChanged( unsigned int row ) @@ -573,12 +524,12 @@ void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const { - return wxPtrToUInt( item.GetID() ); + return wxPtrToUInt( item.GetID() ) -1; } wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const { - return wxDataViewItem( wxUIntToPtr(row) ); + return wxDataViewItem( wxUIntToPtr(row+1) ); } bool wxDataViewVirtualListModel::HasDefaultCompare() const @@ -589,10 +540,10 @@ bool wxDataViewVirtualListModel::HasDefaultCompare() const int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, const wxDataViewItem& item2, unsigned int WXUNUSED(column), - bool ascending) + bool ascending) const { - unsigned int pos1 = wxPtrToUInt(item1.GetID()); - unsigned int pos2 = wxPtrToUInt(item2.GetID()); + unsigned int pos1 = wxPtrToUInt(item1.GetID()); // -1 not needed here + unsigned int pos2 = wxPtrToUInt(item2.GetID()); // -1 not needed here if (ascending) return pos1 - pos2; @@ -600,37 +551,6 @@ int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, return pos2 - pos1; } -void wxDataViewVirtualListModel::GetValue( wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) const -{ - GetValueByRow( variant, GetRow(item), col ); -} - -bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant, - const wxDataViewItem &item, unsigned int col ) -{ - return SetValueByRow( variant, GetRow(item), col ); -} - -bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) -{ - return GetAttrByRow( GetRow(item), col, attr ); -} - -wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const -{ - return wxDataViewItem(0); -} - -bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const -{ - // only the invisible root item has children - if (!item.IsOk()) - return true; - - return false; -} - unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const { return 0; // should we report an error ? @@ -646,13 +566,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject) IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV) -bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two) -{ - if (one.GetText() != two.GetText()) return false; - if (one.IsSameAs(two)) return false; - return true; -} - // --------------------------------------------------------- // wxDataViewRendererBase // --------------------------------------------------------- @@ -690,13 +603,30 @@ public: bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { + wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); + + // Before doing anything we send an event asking if editing of this item is really wanted. + wxDataViewEvent start_event( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, dv_ctrl->GetId() ); + start_event.SetDataViewColumn( GetOwner() ); + start_event.SetModel( dv_ctrl->GetModel() ); + start_event.SetItem( item ); + start_event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( start_event ); + if( !start_event.IsAllowed() ) + return false; + m_item = item; // remember for later unsigned int col = GetOwner()->GetModelColumn(); wxVariant value; - GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); + dv_ctrl->GetModel()->GetValue( value, item, col ); + + m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value ); + + // there might be no editor control for the given item + if(!m_editorCtrl) + return false; - m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); (void) new wxKillRef( m_editorCtrl.get() ); wxDataViewEditorCtrlEvtHandler *handler = @@ -711,18 +641,20 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la #endif // Now we should send Editing Started event - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() ); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, dv_ctrl->GetId() ); event.SetDataViewColumn( GetOwner() ); - event.SetModel( GetOwner()->GetOwner()->GetModel() ); + event.SetModel( dv_ctrl->GetModel() ); event.SetItem( item ); - GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event ); + event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( event ); return true; } void wxDataViewRendererBase::CancelEditing() { - if (!m_editorCtrl) return; + if (!m_editorCtrl) + return; GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); @@ -732,12 +664,15 @@ void wxDataViewRendererBase::CancelEditing() bool wxDataViewRendererBase::FinishEditing() { - if (!m_editorCtrl) return true; + if (!m_editorCtrl) + return true; wxVariant value; GetValueFromEditorCtrl( m_editorCtrl, value ); - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner(); + + dv_ctrl->GetMainWindow()->SetFocus(); m_editorCtrl->Hide(); wxPendingDelete.Append( m_editorCtrl ); @@ -746,19 +681,135 @@ bool wxDataViewRendererBase::FinishEditing() return false; unsigned int col = GetOwner()->GetModelColumn(); - GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col ); - GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col ); + dv_ctrl->GetModel()->ChangeValue(value, m_item, col); // Now we should send Editing Done event - wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() ); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() ); event.SetDataViewColumn( GetOwner() ); - event.SetModel( GetOwner()->GetOwner()->GetModel() ); + event.SetModel( dv_ctrl->GetModel() ); event.SetItem( m_item ); - GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event ); + event.SetEventObject( dv_ctrl ); + dv_ctrl->GetEventHandler()->ProcessEvent( event ); return true; } +// ---------------------------------------------------------------------------- +// wxDataViewCustomRendererBase +// ---------------------------------------------------------------------------- + +void +wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state) +{ + wxCHECK_RET( dc, "no DC to draw on in custom renderer?" ); + + // adjust the rectangle ourselves to account for the alignment + wxRect rectItem = rectCell; + const int align = GetAlignment(); + if ( align != wxDVR_DEFAULT_ALIGNMENT ) + { + const wxSize size = GetSize(); + + // take alignment into account only if there is enough space, otherwise + // show as much contents as possible + // + // notice that many existing renderers (e.g. wxDataViewSpinRenderer) + // return hard-coded size which can be more than they need and if we + // trusted their GetSize() we'd draw the text out of cell bounds + // entirely + + if ( size.x >= 0 && size.x < rectCell.width ) + { + if ( align & wxALIGN_CENTER_HORIZONTAL ) + rectItem.x += (rectCell.width - size.x)/2; + else if ( align & wxALIGN_RIGHT ) + rectItem.x += rectCell.width - size.x; + // else: wxALIGN_LEFT is the default + + rectItem.width = size.x; + } + + if ( size.y >= 0 && size.y < rectCell.height ) + { + if ( align & wxALIGN_CENTER_VERTICAL ) + rectItem.y += (rectCell.height - size.y)/2; + else if ( align & wxALIGN_BOTTOM ) + rectItem.y += rectCell.height - size.y; + // else: wxALIGN_TOP is the default + + rectItem.height = size.y; + } + } + + + // set up the DC attributes + + // override custom foreground with the standard one for the selected items + // because we currently don't allow changing the selection background and + // custom colours may be unreadable on it + wxColour col; + if ( state & wxDATAVIEW_CELL_SELECTED ) + col = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT); + else if ( m_attr.HasColour() ) + col = m_attr.GetColour(); + else // use default foreground + col = GetOwner()->GetOwner()->GetForegroundColour(); + + wxDCTextColourChanger changeFg(*dc, col); + + wxDCFontChanger changeFont(*dc); + if ( m_attr.HasFont() ) + { + wxFont font(dc->GetFont()); + if ( m_attr.GetBold() ) + font.MakeBold(); + if ( m_attr.GetItalic() ) + font.MakeItalic(); + + changeFont.Set(font); + } + + Render(rectItem, dc, state); +} + +void +wxDataViewCustomRendererBase::RenderText(const wxString& text, + int xoffset, + wxRect rect, + wxDC *dc, + int WXUNUSED(state)) +{ + wxRect rectText = rect; + rectText.x += xoffset; + rectText.width -= xoffset; + + // check if we want to ellipsize the text if it doesn't fit + wxString ellipsizedText; + if ( GetEllipsizeMode() != wxELLIPSIZE_NONE ) + { + ellipsizedText = wxControl::Ellipsize + ( + text, + *dc, + GetEllipsizeMode(), + rectText.width, + wxELLIPSIZE_FLAGS_NONE + ); + } + + // get the alignment to use + int align = GetAlignment(); + if ( align == wxDVR_DEFAULT_ALIGNMENT ) + { + // if we don't have an explicit alignment ourselves, use that of the + // column in horizontal direction and default vertical alignment + align = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; + } + + dc->DrawLabel(ellipsizedText.empty() ? text : ellipsizedText, + rectText, align); +} + //----------------------------------------------------------------------------- // wxDataViewEditorCtrlEvtHandler //----------------------------------------------------------------------------- @@ -899,11 +950,11 @@ const wxDataViewModel* wxDataViewCtrlBase::GetModel() const void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) { if (!m_model) return; - + if (!item.IsOk()) return; wxVector parentChain; - + // at first we get all the parents of the selected item wxDataViewItem parent = m_model->GetParent(item); while (parent.IsOk()) @@ -911,7 +962,7 @@ void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item ) parentChain.push_back(parent); parent = m_model->GetParent(parent); } - + // then we expand the parents, starting at the root while (!parentChain.empty()) { @@ -946,7 +997,6 @@ wxDataViewColumn * wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { - wxDataViewColumn *ret = new wxDataViewColumn( label, new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); @@ -1213,23 +1263,31 @@ wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn * IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent ); + +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ); + +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ); + +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_CACHE_HINT, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, wxDataViewEvent ); -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent ) -wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent ) // ------------------------------------- @@ -1300,7 +1358,7 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const // wxDataViewChoiceRenderer // ------------------------------------- -#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__) +#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXOSX_CARBON__) wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : wxDataViewCustomRenderer(wxT("string"), mode, alignment ) @@ -1396,13 +1454,13 @@ wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const { return m_cols[pos]; } - + void wxDataViewListStore::AppendItem( const wxVector &values, wxClientData *data ) { wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); line->m_values = values; m_data.push_back( line ); - + RowAppended(); } @@ -1411,24 +1469,26 @@ void wxDataViewListStore::PrependItem( const wxVector &values, wxClie wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); line->m_values = values; m_data.insert( m_data.begin(), line ); - + RowPrepended(); } -void wxDataViewListStore::InsertItem( unsigned int row, const wxVector &values, wxClientData *data ) +void wxDataViewListStore::InsertItem( unsigned int row, const wxVector &values, + wxClientData *data ) { wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data ); line->m_values = values; m_data.insert( m_data.begin()+row, line ); - + RowInserted( row ); } -void wxDataViewListStore::DeleteItem( unsigned row ) +void wxDataViewListStore::DeleteItem( unsigned int row ) { wxVector::iterator it = m_data.begin() + row; + delete *it; m_data.erase( it ); - + RowDeleted( row ); } @@ -1440,7 +1500,9 @@ void wxDataViewListStore::DeleteAllItems() wxDataViewListStoreLine* line = *it; delete line; } - + + m_data.clear(); + Reset( 0 ); } @@ -1454,7 +1516,7 @@ bool wxDataViewListStore::SetValueByRow( const wxVariant &value, unsigned int ro { wxDataViewListStoreLine *line = m_data[row]; line->m_values[col] = value; - + return true; } @@ -1495,50 +1557,93 @@ bool wxDataViewListCtrl::Create( wxWindow *parent, wxWindowID id, return wxDataViewCtrl::Create( parent, id, pos, size, style, validator ); } -void wxDataViewListCtrl::AppendCol( wxDataViewColumn *column, const wxString &varianttype ) +bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *column, const wxString &varianttype ) { GetStore()->AppendColumn( varianttype ); - AppendColumn( column ); + return wxDataViewCtrl::AppendColumn( column ); } -void wxDataViewListCtrl::PrependCol( wxDataViewColumn *column, const wxString &varianttype ) +bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *column, const wxString &varianttype ) { GetStore()->PrependColumn( varianttype ); - PrependColumn( column ); + return wxDataViewCtrl::PrependColumn( column ); } -void wxDataViewListCtrl::InsertCol( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ) +bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype ) { GetStore()->InsertColumn( pos, varianttype ); - InsertColumn( pos, column ); + return wxDataViewCtrl::InsertColumn( pos, column ); } - -wxDataViewColumn *wxDataViewListCtrl::AppendTextCol( const wxString &label, + +bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *col ) +{ + return PrependColumn( col, "string" ); +} + +bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + return InsertColumn( pos, col, "string" ); +} + +bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *col ) +{ + return AppendColumn( col, "string" ); +} + +wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { GetStore()->AppendColumn( wxT("string") ); - return AppendTextColumn( label, GetStore()->GetColumnCount()-1, mode, width, align, flags ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewTextRenderer( wxT("string"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; } -wxDataViewColumn *wxDataViewListCtrl::AppendToggleCol( const wxString &label, +wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { GetStore()->AppendColumn( wxT("bool") ); - return AppendToggleColumn( label, GetStore()->GetColumnCount()-1, mode, width, align, flags ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewToggleRenderer( wxT("bool"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; } -wxDataViewColumn *wxDataViewListCtrl::AppendProgressCol( const wxString &label, +wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { GetStore()->AppendColumn( wxT("long") ); - return AppendProgressColumn( label, GetStore()->GetColumnCount()-1, mode, width, align, flags ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; } -wxDataViewColumn *wxDataViewListCtrl::AppendIconTextCol( const wxString &label, +wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label, wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { GetStore()->AppendColumn( wxT("wxDataViewIconText") ); - return AppendIconTextColumn( label, GetStore()->GetColumnCount()-1, mode, width, align, flags ); + + wxDataViewColumn *ret = new wxDataViewColumn( label, + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), + GetStore()->GetColumnCount()-1, width, align, flags ); + + wxDataViewCtrl::AppendColumn( ret ); + + return ret; } void wxDataViewListCtrl::OnSize( wxSizeEvent &event ) @@ -1605,9 +1710,6 @@ wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Append( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } @@ -1621,20 +1723,28 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent, new wxDataViewTreeStoreNode( parent_node, text, icon, data ); parent_node->GetChildren().Insert( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } wxDataViewItem -wxDataViewTreeStore::InsertItem(const wxDataViewItem& WXUNUSED(parent), - const wxDataViewItem& WXUNUSED(previous), - const wxString& WXUNUSED(text), - const wxIcon& WXUNUSED(icon), - wxClientData * WXUNUSED(data)) +wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + wxClientData *data) { - return wxDataViewItem(0); + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *previous_node = FindNode( previous ); + int pos = parent_node->GetChildren().IndexOf( previous_node ); + if (pos == wxNOT_FOUND) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *node = + new wxDataViewTreeStoreNode( parent_node, text, icon, data ); + parent_node->GetChildren().Insert( (size_t) pos, node ); + + return node->GetItem(); } wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent, @@ -1648,9 +1758,6 @@ wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& pare new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); parent_node->GetChildren().Insert( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } @@ -1668,21 +1775,37 @@ wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent, new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); parent_node->GetChildren().Append( node ); - // notify control - ItemAdded( parent, node->GetItem() ); - return node->GetItem(); } wxDataViewItem -wxDataViewTreeStore::InsertContainer(const wxDataViewItem& WXUNUSED(parent), - const wxDataViewItem& WXUNUSED(previous), - const wxString& WXUNUSED(text), - const wxIcon& WXUNUSED(icon), - const wxIcon& WXUNUSED(expanded), - wxClientData * WXUNUSED(data)) +wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent, + const wxDataViewItem& previous, + const wxString& text, + const wxIcon& icon, + const wxIcon& expanded, + wxClientData * data) { - return wxDataViewItem(0); + wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent ); + if (!parent_node) return wxDataViewItem(0); + + wxDataViewTreeStoreNode *previous_node = FindNode( previous ); + int pos = parent_node->GetChildren().IndexOf( previous_node ); + if (pos == wxNOT_FOUND) return wxDataViewItem(0); + + wxDataViewTreeStoreContainerNode *node = + new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data ); + parent_node->GetChildren().Insert( (size_t) pos, node ); + + return node->GetItem(); +} + +bool wxDataViewTreeStore::IsContainer( const wxDataViewItem& item ) const +{ + wxDataViewTreeStoreNode *node = FindNode( item ); + if (!node) return false; + + return node->IsContainer(); } wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const @@ -1715,9 +1838,6 @@ void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxStrin if (!node) return; node->SetText( text ); - - // notify control - ValueChanged( item, 0 ); } wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const @@ -1734,9 +1854,6 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon if (!node) return; node->SetIcon( icon ); - - // notify control - ValueChanged( item, 0 ); } const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const @@ -1753,9 +1870,6 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const if (!node) return; node->SetExpandedIcon( icon ); - - // notify control - ValueChanged( item, 0 ); } const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const @@ -1772,9 +1886,6 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData if (!node) return; node->SetData( data ); - - // notify control? only sensible when sorting on client data - // ValueChanged( item, 0 ); } wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) const @@ -1798,9 +1909,6 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item ) if (!node) return; parent_node->GetChildren().DeleteObject( node ); - - // notify control - ItemDeleted( parent_item, item ); } void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) @@ -1808,23 +1916,12 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item ) wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); if (!node) return; - wxDataViewItemArray array; - wxDataViewTreeStoreNodeList::iterator iter; - for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) - { - wxDataViewTreeStoreNode* child = *iter; - array.Add( child->GetItem() ); - } - node->GetChildren().clear(); - - // notify control - ItemsDeleted( item, array ); } void wxDataViewTreeStore::DeleteAllItems() { - // TODO + DeleteChildren(m_root); } void @@ -1884,14 +1981,6 @@ wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) cons return parent->GetItem(); } -bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const -{ - wxDataViewTreeStoreNode *node = FindNode( item ); - if (!node) return false; - - return node->IsContainer(); -} - unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { wxDataViewTreeStoreContainerNode *node = FindContainerNode( item ); @@ -1908,7 +1997,7 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat } int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, - unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) + unsigned int WXUNUSED(column), bool WXUNUSED(ascending) ) const { wxDataViewTreeStoreNode *node1 = FindNode( item1 ); wxDataViewTreeStoreNode *node2 = FindNode( item2 ); @@ -1927,13 +2016,13 @@ int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewI return 0; } - if (node1->IsContainer() && !!node2->IsContainer()) - return 1; - - if (node2->IsContainer() && !!node1->IsContainer()) + if (node1->IsContainer() && !node2->IsContainer()) return -1; - return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 ); + if (node2->IsContainer() && !node1->IsContainer()) + return 1; + + return parent1->GetChildren().IndexOf( node1 ) - parent2->GetChildren().IndexOf( node2 ); } wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const @@ -1969,40 +2058,38 @@ BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl) EVT_SIZE( wxDataViewTreeCtrl::OnSize ) END_EVENT_TABLE() -wxDataViewTreeCtrl::wxDataViewTreeCtrl() +wxDataViewTreeCtrl::~wxDataViewTreeCtrl() { - m_imageList = NULL; + delete m_imageList; } -wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id, +bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - m_imageList = NULL; - Create( parent, id, pos, size, style, validator ); + if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) ) + return false; + // create the standard model and a column in the tree wxDataViewTreeStore *store = new wxDataViewTreeStore; AssociateModel( store ); store->DecRef(); - AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1); -} - -wxDataViewTreeCtrl::~wxDataViewTreeCtrl() -{ - if (m_imageList) - delete m_imageList; -} + AppendIconTextColumn + ( + wxString(), // no label (header is not shown anyhow) + 0, // the only model column + wxDATAVIEW_CELL_EDITABLE, + -1, // default width + wxALIGN_NOT, // and alignment + 0 // not resizeable + ); -bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) -{ - return wxDataViewCtrl::Create( parent, id, pos, size, style, validator ); + return true; } void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist ) { - if (m_imageList) - delete m_imageList; + delete m_imageList; m_imageList = imagelist; } @@ -2014,7 +2101,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->AppendItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()->AppendItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, @@ -2024,7 +2115,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->PrependItem( parent, text, icon, data ); + wxDataViewItem res = GetStore()->PrependItem( parent, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous, @@ -2034,7 +2129,11 @@ wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, con if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - return GetStore()->InsertItem( parent, previous, text, icon, data ); + wxDataViewItem res = GetStore()->InsertItem( parent, previous, text, icon, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent, @@ -2048,7 +2147,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& paren if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->PrependContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->PrependContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent, @@ -2062,7 +2165,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->AppendContainer( parent, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->AppendContainer( parent, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; } wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous, @@ -2076,7 +2183,71 @@ wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); + wxDataViewItem res = GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); + + GetStore()->ItemAdded( parent, res ); + + return res; +} + +void wxDataViewTreeCtrl::SetItemText( const wxDataViewItem& item, const wxString &text ) +{ + GetStore()->SetItemText(item,text); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + GetStore()->SetItemIcon(item,icon); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon ) +{ + GetStore()->SetItemExpandedIcon(item,icon); + + // notify control + GetStore()->ValueChanged( item, 0 ); +} + +void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item ) +{ + wxDataViewItem parent_item = GetStore()->GetParent( item ); + + GetStore()->DeleteItem(item); + + // notify control + GetStore()->ItemDeleted( parent_item, item ); +} + +void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item ) +{ + wxDataViewTreeStoreContainerNode *node = GetStore()->FindContainerNode( item ); + if (!node) return; + + wxDataViewItemArray array; + wxDataViewTreeStoreNodeList::iterator iter; + for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++) + { + wxDataViewTreeStoreNode* child = *iter; + array.Add( child->GetItem() ); + } + + GetStore()->DeleteChildren( item ); + + // notify control + GetStore()->ItemsDeleted( item, array ); +} + +void wxDataViewTreeCtrl::DeleteAllItems() +{ + GetStore()->DeleteAllItems(); + + GetStore()->Cleared(); } void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) @@ -2087,6 +2258,7 @@ void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) if (!container) return; container->SetExpanded( true ); + GetStore()->ItemChanged( event.GetItem() ); } @@ -2098,6 +2270,7 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) if (!container) return; container->SetExpanded( false ); + GetStore()->ItemChanged( event.GetItem() ); }