X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/241cb04bd821f0810ef5dfdfd4b085a506f98402..81e9dec6f59b5955d54087e1726098d38a26f03b:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 28191f6789..ab02b8e824 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -15,30 +15,23 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_DATAVIEWCTRL
 
-#include "wx/object.h"
 #include "wx/dataview.h"
-#include "wx/log.h"
-#include "wx/image.h"
 
-// --------------------------------------------------------- 
-// wxDataViewModel
-// --------------------------------------------------------- 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
-// --------------------------------------------------------- 
-// wxDataViewListModel
-// --------------------------------------------------------- 
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
+// ---------------------------------------------------------
+// wxDataViewListModel
+// ---------------------------------------------------------
 
 wxDataViewListModel::wxDataViewListModel()
 {
-    m_viewingColumns.DeleteContents( true );
     m_notifiers.DeleteContents( true );
 }
 
@@ -50,7 +43,7 @@ bool wxDataViewListModel::RowAppended()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -58,7 +51,7 @@ bool wxDataViewListModel::RowAppended()
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
@@ -66,7 +59,7 @@ bool wxDataViewListModel::RowPrepended()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -74,15 +67,15 @@ bool wxDataViewListModel::RowPrepended()
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -90,15 +83,15 @@ bool wxDataViewListModel::RowInserted( size_t before )
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -106,15 +99,15 @@ bool wxDataViewListModel::RowDeleted( size_t row )
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -122,15 +115,15 @@ bool wxDataViewListModel::RowChanged( size_t row )
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -138,46 +131,40 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
             ret = false;
         node = node->GetNext();
     }
-    
+
     return ret;
 }
 
-bool wxDataViewListModel::Cleared()
+bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->Cleared())
+        if (!notifier->RowsReordered( new_order ))
             ret = false;
         node = node->GetNext();
     }
-        
+
     return ret;
 }
 
-void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column )
+bool wxDataViewListModel::Cleared()
 {
-    m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
-}
+    bool ret = true;
 
-void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
-{
-    wxNode *node = m_viewingColumns.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
-        
-        if (tmp->m_viewColumn == column)
-        {
-            m_viewingColumns.DeleteObject( tmp );
-            return;
-        }
-    
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->Cleared())
+            ret = false;
         node = node->GetNext();
     }
+
+    return ret;
 }
 
 void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
@@ -191,15 +178,53 @@ void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier
     m_notifiers.DeleteObject( notifier );
 }
 
-// --------------------------------------------------------- 
-// wxDataViewSortedListModel
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewSortedListModelNotifier
+// ---------------------------------------------------------
+
+class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
+        { m_model = model; }
+        
+    virtual bool RowAppended()
+        { return m_model->ChildRowAppended(); }
+
+    virtual bool RowPrepended()
+        { return m_model->ChildRowPrepended(); }
+
+    virtual bool RowInserted( unsigned int before )
+        { return m_model->ChildRowInserted( before ); }
+
+    virtual bool RowDeleted( unsigned int row )
+        { return m_model->ChildRowDeleted( row ); }
+
+    virtual bool RowChanged( unsigned int row )
+        { return m_model->ChildRowChanged( row ); }
+
+    virtual bool ValueChanged( unsigned int col, unsigned int row )
+        { return m_model->ChildValueChanged( col, row); }
+
+    virtual bool RowsReordered( unsigned int *new_order )
+        { return m_model->ChildRowsReordered( new_order ); }
+
+    virtual bool Cleared()
+        { return m_model->ChildCleared(); }
+
+    wxDataViewSortedListModel *m_model;
+};
+
+// ---------------------------------------------------------
+// wxDataViewSortedListModel compare function
+// ---------------------------------------------------------
 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
-      (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
+      (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
 {
-    wxVariant value1 = model->GetValue( col, row1 );
-    wxVariant value2 = model->GetValue( col, row2 );
+    wxVariant value1,value2;
+    model->GetValue( value1, col, row1 );
+    model->GetValue( value2, col, row2 );
     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();
@@ -232,68 +257,377 @@ int wxCALLBACK wxDataViewListModelSortedDefaultCompare
     return 0;
 }
 
+int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
+      (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+{
+    return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
+}
+
 static wxDataViewListModelCompare   s_CmpFunc;
 static wxDataViewListModel         *s_CmpModel;
-static size_t                       s_CmpCol;
+static unsigned int                 s_CmpCol;
 
-int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
+int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
 {
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
+// ---------------------------------------------------------
+// wxDataViewSortedListModel
+// ---------------------------------------------------------
 
 wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
   m_array( wxDataViewIntermediateCmp )
 {
     m_child = child;
-    s_CmpCol = 0;
-    s_CmpModel = child;
-    s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
     
-    Resort();    
+    m_ascending = true;
+
+    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+    m_child->AddNotifier( m_notifierOnChild );
+    
+    m_child->IncRef();
+
+    Resort();
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
+    DetachChild();
+}
+
+void wxDataViewSortedListModel::DetachChild()
+{
+    if (m_child)
+    {
+        m_child->RemoveNotifier( m_notifierOnChild );
+        m_child->DecRef();
+    }
+    
+    m_child = NULL;
+}
+
+// FIXME
+void wxDataViewSortedListModel::InitStatics()
+{
+    s_CmpCol = 0;
+    s_CmpModel = m_child;
+    if (m_ascending)
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+    else
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
 }
 
 void wxDataViewSortedListModel::Resort()
 {
+    InitStatics();
+    
+    if (!m_child) return;
+    
+    unsigned int n = m_child->GetRowCount();
+    
+    unsigned int i;
+    if (n != m_array.GetCount())
+    {
+        // probably sorted for the first time -> no reordered
+        // -- just create index and leave
+        m_array.Clear();
+        for (i = 0; i < n; i++)
+            m_array.Add( i );
+        return;
+    }
+    
+    unsigned int *old_array = new unsigned int[ n ];
+
+    for (i = 0; i < n; i++)
+        old_array[i] = m_array[ i ];
+    
     m_array.Clear();
-    size_t n = m_child->GetNumberOfRows();
-    size_t i;
     for (i = 0; i < n; i++)
         m_array.Add( i );
+
+    unsigned int *order = new unsigned int[ n ];
+       
+    for (i = 0; i < n; i++)
+    {
+        unsigned int new_value = m_array[i];
+        
+        unsigned int old_pos;
+        for (old_pos = 0; old_pos < n; old_pos++)
+            if (old_array[old_pos] == new_value)
+                break;
+        order[i] = old_pos;
+    }
+    
+    delete [] old_array;
+    
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;
+}
+
+#if 0
+static void Dump( wxDataViewListModel *model, unsigned int col )
+{
+    unsigned int n = model->GetRowCount();
+    unsigned int 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() );
+    }
 }
+#endif
 
-size_t wxDataViewSortedListModel::GetNumberOfRows()
+bool wxDataViewSortedListModel::ChildRowAppended()
 {
-    return m_child->GetNumberOfRows();
+    // no need to fix up array
+
+    unsigned int len = m_array.GetCount();
+
+    unsigned int pos = m_array.Add( len );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfCols()
+bool wxDataViewSortedListModel::ChildRowPrepended()
 {
-    return m_child->GetNumberOfCols();
+    // fix up array
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        m_array[i] = value+1;
+    }
+
+    unsigned int pos = m_array.Add( 0 );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+{
+    // fix up array
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        if (value >= before)
+           m_array[i] = value+1;
+    }
+
+    unsigned int pos = m_array.Add( before );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+{
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    int pos = -1;
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        if (value == row)
+        {
+            // delete later
+            pos = (int) i;
+        }
+        else
+        {
+            // Fix up array
+            if (value > row)
+                m_array[i] = value-1;
+        }
+    }
+
+    if (pos == -1)
+        return false; // we should probably assert
+
+    // remove
+    m_array.RemoveAt( (unsigned int) pos );
+
+    return wxDataViewListModel::RowDeleted( (unsigned int) pos);
 }
 
-wxString wxDataViewSortedListModel::GetColType( size_t col )
+bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row )
 {
-    return m_child->GetColType( col );
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+
+    // Remove and readd sorted. Find out at which
+    // position it was and where it ended.
+    unsigned int 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;
+        }
+
+    if (end_pos == start_pos)
+        return wxDataViewListModel::RowChanged( start_pos );
+
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    unsigned int *order = new unsigned int[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    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;
+    }
+
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;
+
+    return true;
 }
 
-wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row )
+bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
 {
-    size_t child_row = m_array[row];
-    return m_child->GetValue( col, child_row );
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+
+    // Remove and readd sorted. Find out at which
+    // position it was and where it ended.
+    unsigned int 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;
+        }
+
+    if (end_pos == start_pos)
+        return wxDataViewListModel::ValueChanged( col, start_pos );
+
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    unsigned int *order = new unsigned int[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    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;
+    }
+
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;
+
+    return true;
 }
 
-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
 {
-    size_t child_row = m_array[row];
+    // Nothing needs to be done. If the sort criteria
+    // of this list don't change, the order of the
+    // items of the child list isn't relevant.
+    return true;
+}
+
+bool wxDataViewSortedListModel::ChildCleared()
+{
+    return wxDataViewListModel::Cleared();
+}
+
+unsigned int wxDataViewSortedListModel::GetRowCount() const
+{
+    if (!m_child) return 0;
+    
+    return m_child->GetRowCount();
+}
+
+unsigned int wxDataViewSortedListModel::GetColumnCount() const
+{
+    if (!m_child) return 0;
+    
+    return m_child->GetColumnCount();
+}
+
+wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const
+{
+    return m_child->GetColumnType( col );
+}
+
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
+{
+    unsigned int child_row = m_array[row];
+    m_child->GetValue( variant, col, child_row );
+}
+
+bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row )
+{
+    unsigned int child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );
-    // resort in ::ValueChanged()
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
@@ -301,9 +635,10 @@ bool wxDataViewSortedListModel::RowAppended()
 {
     // you can only append
     bool ret = m_child->RowAppended();
-    
-    // report RowInsrted
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
@@ -311,115 +646,316 @@ bool wxDataViewSortedListModel::RowPrepended()
 {
     // you can only append
     bool ret = m_child->RowAppended();
-    
-    // report RowInsrted
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowInserted( size_t before )
+bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
 {
     // you can only append
     bool ret = m_child->RowAppended();
-    
-    // report different RowInsrted
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowDeleted( size_t row )
+bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
 {
-    size_t child_row = m_array[row];
-    
+    unsigned int child_row = m_array[row];
+
     bool ret = m_child->RowDeleted( child_row );
-    
-    wxDataViewListModel::RowDeleted( row );
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowChanged( size_t row )
+bool wxDataViewSortedListModel::RowChanged( unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );
-    
-    // report delete old pos, inserted new pos
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
-bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );
-    
-    // Do nothing if not the sorted col..
-    // report delete old pos, inserted new pos
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
+bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
+{
+    // We sort them ourselves.
+
+    return false;
+}
+
 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();
-    
-    wxDataViewListModel::Cleared();
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+
     return ret;
 }
 
-// --------------------------------------------------------- 
-// wxDataViewCellBase
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewRendererBase
+// ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_mode = mode;
+    m_editorCtrl = NULL;
+    m_row = (unsigned int) -1;
 }
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+}
+
+bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+{
+    m_row = row; // remember for later
+                                     
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row );
+    
+    m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     
-// --------------------------------------------------------- 
+    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
+
+    return true;
+}
+
+void wxDataViewRendererBase::CancelEditing()
+{
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    // m_editorCtrl->PopEventHandler( true );
+}
+
+bool wxDataViewRendererBase::FinishEditing()
+{
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );
+
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    if (!Validate(value))
+        return false;
+        
+    unsigned int col = GetOwner()->GetModelColumn();
+    GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
+    
+    // m_editorCtrl->PopEventHandler( true );
+    
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// 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 )
+{
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
+
+    m_finished = false;
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
+{
+    if (m_focusOnIdle)
+    {
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();
+    }
+    
+    event.Skip();
+}
+
+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;
+
+        default:
+            event.Skip();
+    }
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
+{
+    if (!m_finished)
+    {
+        m_finished = true;
+        m_owner->FinishEditing();
+    }
+
+    event.Skip();
+}
+
+// ---------------------------------------------------------
 // wxDataViewColumnBase
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
-wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, 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(const wxBitmap& bitmap,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags) ) 
+{
+    m_renderer = renderer;
+    m_model_column = model_column;
+    m_bitmap = bitmap;
+    m_owner = NULL;
+    m_renderer->SetOwner( (wxDataViewColumn*) this );
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {
-    if (m_cell)
-        delete m_cell;
-        
-    if (GetOwner())
-    {
-        GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
-    }
+    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);
 }
 
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewEventListModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+    wxDataViewEventListModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; }
+    
+    bool SendEvent( wxEventType event_type, unsigned int row = 0, unsigned int col = 0 )
+    {
+        wxDataViewEvent event( event_type, m_ctrl->GetId() );
+        event.SetEventObject( m_ctrl );
+        event.SetModel( m_ctrl->GetModel() );
+        event.SetRow( row );
+        event.SetColumn( col );
+        m_ctrl->GetEventHandler()->ProcessEvent( event );
+        return true;
+    }
+
+    virtual bool RowAppended()  { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED ); }
+    virtual bool RowPrepended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED ); }
+    virtual bool RowInserted( unsigned int before )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED, before ); }
+    virtual bool RowDeleted( unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED, row ); }
+    virtual bool RowChanged( unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED, row ); }
+    virtual bool ValueChanged( unsigned int col, unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, row, col ); }
+    virtual bool RowsReordered( unsigned int * WXUNUSED(new_order) )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED ); }
+    virtual bool Cleared()      { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED ); }
+
+private:
+    wxDataViewCtrl *m_ctrl;
+};
+
+
+// ---------------------------------------------------------
 // wxDataViewCtrlBase
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
@@ -427,16 +963,47 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
     m_cols.DeleteContents( true );
+    m_eventNotifier = NULL;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
+    // IMPORTANT: before calling DecRef() on our model (since it may 
+    //            result in a free() call), erase all columns (since
+    //            they hold a pointer to our model)
+    m_cols.Clear();
+
+    if (m_model)
+    {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+    
+        m_model->DecRef();
+        m_model = NULL;
+    }
 }
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
+    if (m_model)
+    {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+        
+        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(); 
+        m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
+        m_model->AddNotifier( m_eventNotifier );
+    }
+
     return true;
 }
 
@@ -445,40 +1012,99 @@ wxDataViewListModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
+bool 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 ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );
-    m_model->AddViewingColumn( col, col->GetModelColumn() );
     return true;
 }
 
-size_t wxDataViewCtrlBase::GetNumberOfColumns()
+unsigned int wxDataViewCtrlBase::GetColumnCount() const
 {
     return m_cols.GetCount();
 }
 
-bool wxDataViewCtrlBase::DeleteColumn( size_t pos )
+bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
 {
     return false;
 }
@@ -488,9 +1114,30 @@ bool wxDataViewCtrlBase::ClearColumns()
     return false;
 }
 
-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
+wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 {
     return (wxDataViewColumn*) m_cols[ pos ];
 }
 
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED)
+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_ROW_APPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+
 #endif