X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87f0efe2d7e053089507a4e76c26da516975f6cd..c11132ca80f6af13bf636abe53f77c8dfd7dab4e:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 8ebcfef112..f8f5154fa2 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -26,84 +26,31 @@
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 
-// ---------------------------------------------------------
-// wxDataViewListModel
-// ---------------------------------------------------------
-
-wxDataViewListModel::wxDataViewListModel()
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 {
-    m_viewingColumns.DeleteContents( true );
-    m_notifiers.DeleteContents( true );
-}
-
-wxDataViewListModel::~wxDataViewListModel()
-{
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        notifier->Freed();
-        node = node->GetNext();
-    }
-}
-
-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;
+    return (left.GetID() == right.GetID() );
 }
 
-bool wxDataViewListModel::RowPrepended()
-{
-    bool ret = true;
-
-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowPrepended())
-            ret = false;
-        node = node->GetNext();
-    }
 
-    return ret;
-}
+// ---------------------------------------------------------
+// wxDataViewModel
+// ---------------------------------------------------------
 
-bool wxDataViewListModel::RowInserted( unsigned int 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 );
+    m_cmpFunc = NULL;
 }
 
-bool wxDataViewListModel::RowDeleted( unsigned int row )
+bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowDeleted( row ))
+        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        if (!notifier->ItemAdded( parent, item ))
             ret = false;
         node = node->GetNext();
     }
@@ -111,15 +58,15 @@ bool wxDataViewListModel::RowDeleted( unsigned int row )
     return ret;
 }
 
-bool wxDataViewListModel::RowChanged( unsigned int row )
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item )
 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowChanged( row ))
+        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        if (!notifier->ItemDeleted( item ))
             ret = false;
         node = node->GetNext();
     }
@@ -127,15 +74,15 @@ bool wxDataViewListModel::RowChanged( unsigned int row )
     return ret;
 }
 
-bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
+bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )
 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->ValueChanged( col, row ))
+        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        if (!notifier->ItemChanged( item ))
             ret = false;
         node = node->GetNext();
     }
@@ -143,15 +90,15 @@ bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
     return ret;
 }
 
-bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
+bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col )
 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        if (!notifier->RowsReordered( new_order ))
+        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        if (!notifier->ValueChanged( item, col ))
             ret = false;
         node = node->GetNext();
     }
@@ -159,14 +106,14 @@ bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
     return ret;
 }
 
-bool wxDataViewListModel::Cleared()
+bool wxDataViewModel::Cleared()
 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
         if (!notifier->Cleared())
             ret = false;
         node = node->GetNext();
@@ -175,536 +122,150 @@ bool wxDataViewListModel::Cleared()
     return ret;
 }
 
-void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
-{
-    m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
-}
-
-void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
-{
-    wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
-    while (node)
-    {
-        wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
-
-        if (tmp->m_viewColumn == column)
-        {
-            m_viewingColumns.DeleteObject( tmp );
-            return;
-        }
-
-        node = node->GetNext();
-    }
-}
-
-void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
 {
     m_notifiers.Append( notifier );
     notifier->SetOwner( this );
 }
 
-void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
 {
     m_notifiers.DeleteObject( notifier );
 }
 
 // ---------------------------------------------------------
-// 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(); }
-
-    virtual bool Freed()
-        { m_model->m_child = NULL; return wxDataViewListModelNotifier::Freed(); }
-
-    wxDataViewSortedListModel *m_model;
-};
-
-// ---------------------------------------------------------
-// wxDataViewSortedListModel compare function
+// wxDataViewRendererBase
 // ---------------------------------------------------------
 
-int wxCALLBACK wxDataViewListModelSortedDefaultCompare
-      (unsigned int row1, unsigned int row2, unsigned int 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 );
-    }
-    if (value1.GetType() == wxT("long"))
-    {
-        long l1 = value1.GetLong();
-        long l2 = value2.GetLong();
-        return l1-l2;
-    }
-    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 (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;
-    }
-
-    return 0;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
-int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
-      (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )
 {
-    return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
+    m_variantType = varianttype;
+    m_editorCtrl = NULL;
 }
 
-static wxDataViewListModelCompare   s_CmpFunc;
-static wxDataViewListModel         *s_CmpModel;
-static unsigned int                 s_CmpCol;
-
-int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
-    return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 
-// ---------------------------------------------------------
-// wxDataViewSortedListModel
-// ---------------------------------------------------------
-
-wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
-  m_array( wxDataViewIntermediateCmp )
+bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
-    m_child = child;
+    m_item = item; // remember for later
+                                     
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
     
-    m_ascending = true;
-
-    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
-    m_child->AddNotifier( m_notifierOnChild );
+    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
 
-    Resort();
+    return true;
 }
 
-wxDataViewSortedListModel::~wxDataViewSortedListModel()
+void wxDataViewRendererBase::CancelEditing()
 {
-    if (m_child)
-    m_child->RemoveNotifier( m_notifierOnChild );
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    // m_editorCtrl->PopEventHandler( true );
 }
 
-// FIXME
-void wxDataViewSortedListModel::InitStatics()
+bool wxDataViewRendererBase::FinishEditing()
 {
-    s_CmpCol = 0;
-    s_CmpModel = m_child;
-    if (m_ascending)
-        s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
-    else
-        s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
-}
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );
 
-void wxDataViewSortedListModel::Resort()
-{
-    InitStatics();
+    wxPendingDelete.Append( m_editorCtrl );
     
-    m_array.Clear();
-    unsigned int n = m_child->GetNumberOfRows();
-    unsigned int i;
-    for (i = 0; i < n; i++)
-        m_array.Add( i );
-}
-
-#if 0
-static void Dump( wxDataViewListModel *model, unsigned int col )
-{
-    unsigned int n = model->GetNumberOfRows();
-    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() );
-    }
+    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 );
+    
+    return true;
 }
-#endif
-
-bool wxDataViewSortedListModel::ChildRowAppended()
-{
-    // 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();
+//-----------------------------------------------------------------------------
+// wxDataViewEditorCtrlEvtHandler
+//-----------------------------------------------------------------------------
 
-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
+BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
+    EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
+    EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
+    EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
+END_EVENT_TABLE()
 
-    return wxDataViewListModel::RowInserted( pos );
-}
-
-bool wxDataViewSortedListModel::ChildRowPrepended()
+wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
+                                wxControl *editorCtrl,
+                                wxDataViewRenderer *owner )
 {
-    // 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;
-    }
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
 
-    unsigned int pos = m_array.Add( 0 );
-
-    if (pos == 0)
-        return wxDataViewListModel::RowPrepended();
-
-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
-
-    return wxDataViewListModel::RowInserted( pos );
+    m_finished = false;
 }
 
-bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
 {
-    // fix up array
-    unsigned int i;
-    unsigned int len = m_array.GetCount();
-    for (i = 0; i < len; i++)
+    if (m_focusOnIdle)
     {
-        unsigned int value = m_array[i];
-        if (value >= before)
-           m_array[i] = value+1;
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();
     }
-
-    unsigned int pos = m_array.Add( before );
-
-    if (pos == 0)
-        return wxDataViewListModel::RowPrepended();
-
-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
-
-    return wxDataViewListModel::RowInserted( pos );
+    
+    event.Skip();
 }
 
-bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
 {
-    unsigned int i;
-    unsigned int len = m_array.GetCount();
-    int pos = -1;
-    for (i = 0; i < len; i++)
+    switch ( event.m_keyCode )
     {
-        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);
-}
-
-bool wxDataViewSortedListModel::ChildRowChanged( unsigned int 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;
+        case WXK_RETURN:
+            m_finished = true;
+            m_owner->FinishEditing();
             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;
+        case WXK_ESCAPE:
+            m_finished = true;
+            m_owner->CancelEditing();
+            break;
 
-    if (start_pos < end_pos)
-    {
-        for (i = start_pos; i < end_pos; i++)
-            order[i] = order[i+1];
-        order[end_pos] = start_pos;
+        default:
+            event.Skip();
     }
-    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::ChildValueChanged( unsigned int col, unsigned int row )
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 {
-    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
+    if (!m_finished)
     {
-        for (i = end_pos; i > start_pos; i--)
-            order[i] = order[i-1];
-        order[start_pos] = end_pos;
+        m_finished = true;
+        m_owner->FinishEditing();
     }
 
-    wxDataViewListModel::RowsReordered( order );
-
-    delete [] order;
-
-    return true;
-}
-
-bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
-{
-    // 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::GetNumberOfRows()
-{
-    return m_array.GetCount();
-}
-
-unsigned int wxDataViewSortedListModel::GetNumberOfCols()
-{
-    return m_child->GetNumberOfCols();
-}
-
-wxString wxDataViewSortedListModel::GetColType( unsigned int col )
-{
-    return m_child->GetColType( col );
-}
-
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row )
-{
-    unsigned int child_row = m_array[row];
-    m_child->GetValue( variant, col, child_row );
-}
-
-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, unsigned int col, unsigned int row )
-{
-    unsigned int child_row = m_array[row];
-    bool ret = m_child->SetValue( variant, col, child_row );
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::RowAppended()
-{
-    // you can only append
-    bool ret = m_child->RowAppended();
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::RowPrepended()
-{
-    // you can only append
-    bool ret = m_child->RowAppended();
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
-{
-    // you can only append
-    bool ret = m_child->RowAppended();
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
-{
-    unsigned int child_row = m_array[row];
-
-    bool ret = m_child->RowDeleted( child_row );
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::RowChanged( unsigned int row )
-{
-    unsigned int child_row = m_array[row];
-    bool ret = m_child->RowChanged( child_row );
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
-{
-    unsigned int child_row = m_array[row];
-    bool ret = m_child->ValueChanged( col, child_row );
-
-    // 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();
-
-    // Do nothing here as the change in the
-    // child model will be reported back.
-
-    return ret;
-}
-
-// ---------------------------------------------------------
-// wxDataViewRendererBase
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
-
-wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewCellMode mode )
-{
-    m_variantType = varianttype;
-    m_mode = mode;
+    event.Skip();
 }
 
 // ---------------------------------------------------------
@@ -713,19 +274,20 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxD
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
                                            wxDataViewRenderer *renderer,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),
-                                           int flags ) 
+                                           int WXUNUSED(flags)) 
 {
     m_renderer = renderer;
     m_model_column = model_column;
-    m_flags = flags;
-    m_title = title;
     m_owner = NULL;
     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,
@@ -733,11 +295,10 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),
-                                           int flags ) 
+                                           int WXUNUSED(flags) ) 
 {
     m_renderer = renderer;
     m_model_column = model_column;
-    m_flags = flags;
     m_bitmap = bitmap;
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
@@ -747,32 +308,64 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_renderer)
         delete m_renderer;
-
-    if (GetOwner())
-    {
-        GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
-    }
 }
 
-void wxDataViewColumnBase::SetTitle( const wxString &title )
+int wxDataViewColumnBase::GetFlags() const
 {
-    m_title = title;
-}
+    int ret = 0;
 
-wxString wxDataViewColumnBase::GetTitle()
-{
-    return m_title;
+    if (IsSortable())
+        ret |= wxDATAVIEW_COL_SORTABLE;
+    if (IsResizeable())
+        ret |= wxDATAVIEW_COL_RESIZABLE;
+    if (IsHidden())
+        ret |= wxDATAVIEW_COL_HIDDEN;
+
+    return ret;
 }
 
-void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap )
+void wxDataViewColumnBase::SetFlags(int flags)
 {
-    m_bitmap = bitmap;
+    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
+    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
+    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
 }
 
-const wxBitmap &wxDataViewColumnBase::GetBitmap()
+// ---------------------------------------------------------
+// wxDataViewEventModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewEventModelNotifier: public wxDataViewModelNotifier
 {
-    return m_bitmap;
-}
+public:
+    wxDataViewEventModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; }
+    
+    bool SendEvent( wxEventType event_type, const wxDataViewItem &item, unsigned int col = 0 )
+    {
+        wxDataViewEvent event( event_type, m_ctrl->GetId() );
+        event.SetEventObject( m_ctrl );
+        event.SetModel( m_ctrl->GetModel() );
+        event.SetItem( item );
+        event.SetColumn( col );
+        m_ctrl->GetEventHandler()->ProcessEvent( event );
+        return true;
+    }
+
+    virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )  
+        { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED, item ); }
+    virtual bool ItemDeleted( const wxDataViewItem &item )
+        { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED, item ); }
+    virtual bool ItemChanged( const wxDataViewItem &item )
+        { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED, item ); }
+    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col )
+        { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, item, col ); }
+    virtual bool Cleared()      
+        { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED, wxDataViewItem(0) ); }
+
+private:
+    wxDataViewCtrl *m_ctrl;
+};
+
 
 // ---------------------------------------------------------
 // wxDataViewCtrlBase
@@ -784,6 +377,9 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
     m_cols.DeleteContents( true );
+    m_eventNotifier = NULL;
+    m_expander_column = 0;
+    m_indent = 8;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
@@ -795,25 +391,39 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 
     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 )
+bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )
 {
-    if ( m_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 )
+    if (m_model)
+    {
         m_model->IncRef(); 
+        m_eventNotifier = new wxDataViewEventModelNotifier( (wxDataViewCtrl*) this );
+        m_model->AddNotifier( m_eventNotifier );
+    }
 
     return true;
 }
 
-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()
 {
     return m_model;
 }
@@ -822,91 +432,90 @@ bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewDateRenderer( wxT("datetime"), mode), model_column, 
-        width, align, flags ) );
+        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 ), model_column, 
-        width, align, flags ) );
+        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 ), model_column, 
-        width, align, flags ) );
+        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 ), model_column, 
-        width, align, flags ) );
+        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 ), model_column, 
-        width, align, flags ) );
+        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 ), model_column,
-        width, align, flags ) );
+        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 ), model_column, 
-        width, align, flags ) );
+        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;
 }
 
-unsigned int wxDataViewCtrlBase::GetNumberOfColumns()
+unsigned int wxDataViewCtrlBase::GetColumnCount() const
 {
     return m_cols.GetCount();
 }
@@ -932,10 +541,16 @@ wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 
 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_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_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_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