X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85e5bb6a953e5dffd5c52d907b4ca0767a544bcc..78cd9c69eb3f4c158fe10ce49325d57ec05d1306:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 4b924ef900..2adea13020 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -17,496 +17,470 @@
 
 #if wxUSE_DATAVIEWCTRL
 
+#include "wx/dataview.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/object.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/image.h"
-#include "wx/dataview.h"
-
-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
-
-// ---------------------------------------------------------
-// wxDataViewListModel
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
-wxDataViewListModel::wxDataViewListModel()
-{
-    m_viewingColumns.DeleteContents( true );
-    m_notifiers.DeleteContents( true );
-}
 
-wxDataViewListModel::~wxDataViewListModel()
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 {
+    return (left.GetID() == right.GetID() );
 }
 
-bool wxDataViewListModel::RowAppended()
-{
-    bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowAppended())
-            ret = false;
-        node = node->GetNext();
-    }
-
-    return ret;
-}
-
-bool wxDataViewListModel::RowPrepended()
-{
-    bool ret = true;
+// ---------------------------------------------------------
+// wxDataViewModel
+// ---------------------------------------------------------
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowPrepended())
-            ret = false;
-        node = node->GetNext();
-    }
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataViewModelNotifiers);
 
-    return ret;
-}
-
-bool wxDataViewListModel::RowInserted( size_t before )
+wxDataViewModel::wxDataViewModel()
 {
-    bool ret = true;
-
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowInserted(before))
-            ret = false;
-        node = node->GetNext();
-    }
-
-    return ret;
+    m_notifiers.DeleteContents( true );
 }
 
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowDeleted( row ))
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemAdded( parent, item ))
             ret = false;
-        node = node->GetNext();
     }
 
     return ret;
 }
 
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowChanged( row ))
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemDeleted( parent, item ))
             ret = false;
-        node = node->GetNext();
     }
 
     return ret;
 }
 
-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )
 {
     bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->ValueChanged( col, row ))
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemChanged( item ))
             ret = false;
-        node = node->GetNext();
     }
 
     return ret;
 }
 
-bool wxDataViewListModel::RowsReordered( size_t *new_order )
+bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col )
 {
     bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowsReordered( new_order ))
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ValueChanged( item, col ))
             ret = false;
-        node = node->GetNext();
     }
 
     return ret;
 }
 
-bool wxDataViewListModel::Cleared()
+bool wxDataViewModel::Cleared()
 {
     bool ret = true;
 
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;
         if (!notifier->Cleared())
             ret = false;
-        node = node->GetNext();
     }
 
     return ret;
 }
 
-void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column )
-{
-    m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
-}
-
-void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
+void wxDataViewModel::Resort()
 {
-    wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
     {
-        wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
-
-        if (tmp->m_viewColumn == column)
-        {
-            m_viewingColumns.DeleteObject( tmp );
-            return;
-        }
-
-        node = node->GetNext();
+        wxDataViewModelNotifier* notifier = *iter;
+        notifier->Resort();
     }
 }
 
-void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
 {
-    m_notifiers.Append( notifier );
+    m_notifiers.push_back( notifier );
     notifier->SetOwner( this );
 }
 
-void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
 {
     m_notifiers.DeleteObject( notifier );
 }
 
-// ---------------------------------------------------------
-// wxDataViewSortedListModelNotifier
-// ---------------------------------------------------------
-
-class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                              unsigned int column, bool ascending )
 {
-public:
-    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
-    { m_model = model; }
+    // sort branches before leaves
+    bool item1_is_container = IsContainer(item1);
+    bool item2_is_container = IsContainer(item2);
 
-    virtual bool RowAppended() { return true; }
-    virtual bool RowPrepended()  { return true; }
-    virtual bool RowInserted( size_t WXUNUSED(before) )  { return true; }
-    virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; }
-    virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; }
-    virtual bool ValueChanged( size_t col, size_t row )
-         { return m_model->ChildValueChanged( col, row); }
-    virtual bool RowsReordered( size_t *WXUNUSED(new_order) ) { return true; }
-    virtual bool Cleared() { return true; }
+    if (item1_is_container && !item2_is_container)
+        return 1;
+    if (item2_is_container && !item1_is_container)
+        return -1;
 
-    wxDataViewSortedListModel *m_model;
-};
+    wxVariant value1,value2;
+    GetValue( value1, item1, column );
+    GetValue( value2, item2, column );
 
-// ---------------------------------------------------------
-// wxDataViewSortedListModel compare function
-// ---------------------------------------------------------
+    if (!ascending)
+    {
+        wxVariant temp = value1;
+        value1 = value2;
+        value2 = temp;
+    }
 
-int wxCALLBACK wxDataViewListModelSortedDefaultCompare
-      (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
-{
-    wxVariant value1,value2;
-    model->GetValue( value1, col, row1 );
-    model->GetValue( value2, col, row2 );
     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();
         wxString str2 = value2.GetString();
-        return str1.Cmp( str2 );
-    }
+        int res = str1.Cmp( str2 );
+        if (res) return res;
+    } else
     if (value1.GetType() == wxT("long"))
     {
         long l1 = value1.GetLong();
         long l2 = value2.GetLong();
-        return l1-l2;
-    }
+        long res = l1-l2;
+        if (res) return res;
+    } else
     if (value1.GetType() == wxT("double"))
     {
         double d1 = value1.GetDouble();
         double d2 = value2.GetDouble();
-        if (d1 == d2) return 0;
         if (d1 < d2) return 1;
-        return -1;
-    }
+        if (d1 > d2) return -1;
+    } else
     if (value1.GetType() == wxT("datetime"))
     {
         wxDateTime dt1 = value1.GetDateTime();
         wxDateTime dt2 = value2.GetDateTime();
-        if (dt1.IsEqualTo(dt2)) return 0;
         if (dt1.IsEarlierThan(dt2)) return 1;
-        return -1;
+        if (dt2.IsEarlierThan(dt1)) return -11;
     }
 
-    return 0;
-}
+    // items must be different
+    unsigned long litem1 = (unsigned long) item1.GetID();
+    unsigned long litem2 = (unsigned long) item2.GetID();
 
-static wxDataViewListModelCompare   s_CmpFunc;
-static wxDataViewListModel         *s_CmpModel;
-static size_t                       s_CmpCol;
+    if (!ascending)
+        return litem2-litem2;
 
-int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
-{
-    return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+    return litem1-litem2;
 }
 
 // ---------------------------------------------------------
-// wxDataViewSortedListModel
+// wxDataViewIndexListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
-
-wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
-  m_array( wxDataViewIntermediateCmp )
+wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
 {
-    m_child = child;
-    s_CmpCol = 0;
-    s_CmpModel = child;
-    s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
-
-    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
-    m_child->AddNotifier( m_notifierOnChild );
-
-    Resort();
+    // build initial index
+    unsigned int i;
+    for (i = 1; i < initial_size+1; i++)
+        m_hash.Add( (void*) i );
+    m_lastIndex = initial_size + 1;
 }
 
-wxDataViewSortedListModel::~wxDataViewSortedListModel()
+wxDataViewIndexListModel::~wxDataViewIndexListModel()
 {
-    m_child->RemoveNotifier( m_notifierOnChild );
 }
 
-void wxDataViewSortedListModel::Resort()
+void wxDataViewIndexListModel::RowPrepended()
 {
-    m_array.Clear();
-    size_t n = m_child->GetNumberOfRows();
-    size_t i;
-    for (i = 0; i < n; i++)
-        m_array.Add( i );
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, 0 );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
 }
 
-#if 0
-static void Dump( wxDataViewListModel *model, size_t col )
+void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
-    size_t n = model->GetNumberOfRows();
-    size_t i;
-    for (i = 0; i < n; i++)
-    {
-        wxVariant variant;
-        model->GetValue( variant, col, i );
-        wxString tmp;
-        tmp = variant.GetString();
-        wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
-    }
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, before );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
 }
-#endif
 
-bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+void wxDataViewIndexListModel::RowAppended()
 {
-    size_t i;
-    size_t len = m_array.GetCount();
+    unsigned int id = m_lastIndex++;
+    m_hash.Add( (void*) id );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
+}
 
-    // Remove and readd sorted. Find out at which
-    // position it was and where it ended.
-    size_t start_pos = 0,end_pos = 0;
-    for (i = 0; i < len; i++)
-        if (m_array[i] == row)
-        {
-            start_pos = i;
-            break;
-        }
-    m_array.RemoveAt( start_pos );
-    m_array.Add( row );
-
-    for (i = 0; i < len; i++)
-        if (m_array[i] == row)
-        {
-            end_pos = i;
-            break;
-        }
+void wxDataViewIndexListModel::RowDeleted( unsigned int row )
+{
+    wxDataViewItem item( m_hash[row] );
+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+    m_hash.RemoveAt( row );
+}
 
-    if (end_pos == start_pos)
-        return wxDataViewListModel::ValueChanged( col, start_pos );
+void wxDataViewIndexListModel::RowChanged( unsigned int row )
+{
+    wxDataViewModel::ItemChanged( GetItem(row) );
+}
 
-    // Create an array where order[old] -> new_pos, so that
-    // if nothing changed order[0] -> 0 etc.
-    size_t *order = new size_t[ len ];
-    // Fill up initial values.
-    for (i = 0; i < len; i++)
-        order[i] = i;
+void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col )
+{
+    wxDataViewModel::ValueChanged( GetItem(row), col );
+}
 
-    if (start_pos < end_pos)
-    {
-        for (i = start_pos; i < end_pos; i++)
-            order[i] = order[i+1];
-        order[end_pos] = start_pos;
-    }
-    else
-    {
-        for (i = end_pos; i > start_pos; i--)
-            order[i] = order[i-1];
-        order[start_pos] = end_pos;
-    }
+unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
+{
+    // assert for not found
+    return (unsigned int) m_hash.Index( item.GetID() );
+}
 
-    wxDataViewListModel::RowsReordered( order );
+wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
+{
+    wxASSERT( row < m_hash.GetCount() );
+    return wxDataViewItem( m_hash[row] );
+}
 
-    delete [] order;
+int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
+                                      const wxDataViewItem& item2,
+                                      unsigned int WXUNUSED(column),
+                                      bool ascending)
+{
+    if (ascending)
+        return GetRow(item1) - GetRow(item2);
 
-    return true;
+    return GetRow(item2) - GetRow(item1);
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfRows()
+void wxDataViewIndexListModel::GetValue( wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col ) const
 {
-    return m_array.GetCount();
+    GetValue( variant, GetRow(item), col );
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfCols()
+bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col )
 {
-    return m_child->GetNumberOfCols();
+    return SetValue( variant, GetRow(item), col );
 }
 
-wxString wxDataViewSortedListModel::GetColType( size_t col )
+wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
 {
-    return m_child->GetColType( col );
+    return wxDataViewItem(0);
 }
 
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
+bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
 {
-    size_t child_row = m_array[row];
-    m_child->GetValue( variant, col, child_row );
+    // only the invisible root item has children
+    if (!item.IsOk())
+        return true;
+
+    return false;
 }
 
-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
 {
-    size_t child_row = m_array[row];
-    bool ret = m_child->SetValue( variant, col, child_row );
+    if (item.IsOk())
+        return 0;
 
-    // Resort in ::ChildValueChanged() which gets reported back.
+    children = m_hash;
 
-    return ret;
+    return m_hash.GetCount();
 }
 
-bool wxDataViewSortedListModel::RowAppended()
-{
-    // you can only append
-    bool ret = m_child->RowAppended();
+//-----------------------------------------------------------------------------
+// wxDataViewIconText
+//-----------------------------------------------------------------------------
 
-    // report RowInsrted
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
 
-    return ret;
-}
+IMPLEMENT_VARIANT_OBJECT(wxDataViewIconText)
 
-bool wxDataViewSortedListModel::RowPrepended()
+bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
 {
-    // you can only append
-    bool ret = m_child->RowAppended();
+    if (one.GetText() != two.GetText()) return false;
+    if (one.IsSameAs(two)) return false;
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewRendererBase
+// ---------------------------------------------------------
 
-    // report RowInsrted
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
-    return ret;
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )
+{
+    m_variantType = varianttype;
+    m_editorCtrl = NULL;
 }
 
-bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
-    // you can only append
-    bool ret = m_child->RowAppended();
-
-    // report different RowInsrted
-
-    return ret;
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 
-bool wxDataViewSortedListModel::RowDeleted( size_t row )
+bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
-    size_t child_row = m_array[row];
+    m_item = item; // remember for later
 
-    bool ret = m_child->RowDeleted( child_row );
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
-    // Do nothing here as the change in the
-    // child model will be reported back.
+    m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
 
-    return ret;
+    wxDataViewEditorCtrlEvtHandler *handler =
+        new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
+
+    m_editorCtrl->PushEventHandler( handler );
+
+#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+    handler->SetFocusOnIdle();
+#else
+    m_editorCtrl->SetFocus();
+#endif
+
+    // Now we should send Editing Started event
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() );
+    event.SetDataViewColumn( GetOwner() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
+    return true;
 }
 
-bool wxDataViewSortedListModel::RowChanged( size_t row )
+void wxDataViewRendererBase::CancelEditing()
 {
-    size_t child_row = m_array[row];
-    bool ret = m_child->RowChanged( child_row );
+    wxPendingDelete.Append( m_editorCtrl );
 
-    // Do nothing here as the change in the
-    // child model will be reported back.
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
-    return ret;
+    // m_editorCtrl->PopEventHandler( true );
 }
 
-bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewRendererBase::FinishEditing()
 {
-    size_t child_row = m_array[row];
-    bool ret = m_child->ValueChanged( col, child_row );
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );
 
-    // Do nothing here as the change in the
-    // child model will be reported back.
+    wxPendingDelete.Append( m_editorCtrl );
 
-    return ret;
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+
+    if (!Validate(value))
+        return false;
+
+    unsigned int col = GetOwner()->GetModelColumn();
+    GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
+
+    // m_editorCtrl->PopEventHandler( true );
+
+    // Now we should send Editing Done event
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
+    event.SetDataViewColumn( GetOwner() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( m_item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
+    return true;
 }
 
-bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+//-----------------------------------------------------------------------------
+// wxDataViewEditorCtrlEvtHandler
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
+    EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
+    EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
+    EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
+END_EVENT_TABLE()
+
+wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
+                                wxControl *editorCtrl,
+                                wxDataViewRenderer *owner )
 {
-    // We sort them ourselves.
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
 
-    return false;
+    m_finished = false;
 }
 
-bool wxDataViewSortedListModel::Cleared()
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
 {
-    bool ret = m_child->Cleared();
-
-    wxDataViewListModel::Cleared();
+    if (m_focusOnIdle)
+    {
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();
+    }
 
-    return ret;
+    event.Skip();
 }
 
-// ---------------------------------------------------------
-// wxDataViewCellBase
-// ---------------------------------------------------------
+void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            m_finished = true;
+            m_owner->FinishEditing();
+            break;
+
+        case WXK_ESCAPE:
+            m_finished = true;
+            m_owner->CancelEditing();
+            break;
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+        default:
+            event.Skip();
+    }
+}
 
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 {
-    m_variantType = varianttype;
-    m_mode = mode;
+    if (!m_finished)
+    {
+        m_finished = true;
+        m_owner->FinishEditing();
+    }
+
+    event.Skip();
 }
 
 // ---------------------------------------------------------
@@ -515,40 +489,61 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
-                                           wxDataViewCell *cell,
-                                           size_t model_column,
-                                           int WXUNUSED(fixed_width),
-                                           wxDataViewColumnSizing WXUNUSED(sizing),
-                                           int flags )
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags))
 {
-    m_cell = cell;
+    m_renderer = renderer;
     m_model_column = model_column;
-    m_flags = flags;
-    m_title = title;
     m_owner = NULL;
-    m_cell->SetOwner( (wxDataViewColumn*) this );
+    m_renderer->SetOwner( (wxDataViewColumn*) this );
+
+    // NOTE: the wxDataViewColumn's ctor must store the width, align, flags
+    //       parameters inside the native control!
 }
 
-wxDataViewColumnBase::~wxDataViewColumnBase()
+wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags) )
 {
-    if (m_cell)
-        delete m_cell;
+    m_renderer = renderer;
+    m_model_column = model_column;
+    m_bitmap = bitmap;
+    m_owner = NULL;
+    m_renderer->SetOwner( (wxDataViewColumn*) this );
+}
 
-    if (GetOwner())
-    {
-        GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
-    }
+wxDataViewColumnBase::~wxDataViewColumnBase()
+{
+    if (m_renderer)
+        delete m_renderer;
 }
 
-void wxDataViewColumnBase::SetTitle( const wxString &title )
+int wxDataViewColumnBase::GetFlags() const
 {
-    m_title = title;
+    int ret = 0;
+
+    if (IsSortable())
+        ret |= wxDATAVIEW_COL_SORTABLE;
+    if (IsResizeable())
+        ret |= wxDATAVIEW_COL_RESIZABLE;
+    if (IsHidden())
+        ret |= wxDATAVIEW_COL_HIDDEN;
+
+    return ret;
 }
 
-wxString wxDataViewColumnBase::GetTitle()
+void wxDataViewColumnBase::SetFlags(int flags)
 {
-    return m_title;
+    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
+    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
+    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
 }
 
 // ---------------------------------------------------------
@@ -560,71 +555,206 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
-    m_cols.DeleteContents( true );
+    m_expander_column = 0;
+    m_indent = 8;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
+    if (m_model)
+    {
+        m_model->DecRef();
+        m_model = NULL;
+    }
 }
 
-bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
+bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )
 {
+    if (m_model)
+    {
+        m_model->DecRef();   // discard old model, if any
+    }
+
+    // add our own reference to the new model:
     m_model = model;
+    if (m_model)
+    {
+        m_model->IncRef();
+    }
 
     return true;
 }
 
-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()
 {
     return m_model;
 }
 
-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
+
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    m_cols.Append( (wxObject*) col );
-    col->SetOwner( (wxDataViewCtrl*) this );
-    m_model->AddViewingColumn( col, col->GetModelColumn() );
-    return true;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-size_t wxDataViewCtrlBase::GetNumberOfColumns()
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return m_cols.GetCount();
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return false;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-bool wxDataViewCtrlBase::ClearColumns()
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return false;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return (wxDataViewColumn*) m_cols[ pos ];
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
 }
 
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+bool
+wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+
 #endif
+