ignore bakefile-generated test.dsw too

[wxWidgets.git] / src / common / datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 14973793095437a6399b474b4ecd1bc941b5c6e3..f8f5154fa29e1aba0be610690944d2089c118bc0 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -25,85 +25,32 @@
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 

-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
-
-// ---------------------------------------------------------
-// wxDataViewListModel
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
-wxDataViewListModel::wxDataViewListModel()
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)

 {
 {

-    m_viewingColumns.DeleteContents( true );
-    m_notifiers.DeleteContents( true );
+    return (left.GetID() == right.GetID() );

 }
 
 }
 

-wxDataViewListModel::~wxDataViewListModel()
-{
-}
-
-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;
-
-    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( 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 );
+    m_cmpFunc = NULL;

 }
 
 }
 

-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)
     {
 {
     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();
     }
             ret = false;
         node = node->GetNext();
     }


@@ -111,15 +58,15 @@ bool wxDataViewListModel::RowDeleted( size_t row )
     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item )

 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
 {
     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();
     }
             ret = false;
         node = node->GetNext();
     }


@@ -127,15 +74,15 @@ bool wxDataViewListModel::RowChanged( size_t row )
     return ret;
 }
 
     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)
     {
 {
     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();
     }
             ret = false;
         node = node->GetNext();
     }


@@ -143,15 +90,15 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
     return ret;
 }
 
     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)
     {
 {
     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();
     }
             ret = false;
         node = node->GetNext();
     }


@@ -159,14 +106,14 @@ bool wxDataViewListModel::RowsReordered( size_t *new_order )
     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::Cleared()
+bool wxDataViewModel::Cleared()

 {
     bool ret = true;
 
     wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
 {
     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();
         if (!notifier->Cleared())
             ret = false;
         node = node->GetNext();


@@ -175,622 +122,405 @@ bool wxDataViewListModel::Cleared()
     return ret;
 }
 
     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 )
-{
-    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 );
 }
 
 {
     m_notifiers.Append( notifier );
     notifier->SetOwner( this );
 }
 

-void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )

 {
     m_notifiers.DeleteObject( notifier );
 }
 
 // ---------------------------------------------------------
 {
     m_notifiers.DeleteObject( notifier );
 }
 
 // ---------------------------------------------------------

-// wxDataViewSortedListModelNotifier
+// wxDataViewRendererBase

 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 

-class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
-{
-public:
-    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
-        { m_model = model; }
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)

 
 

-    virtual bool RowAppended()
-        { return m_model->ChildRowAppended(); }
-        
-    virtual bool RowPrepended()
-        { return m_model->ChildRowPrepended(); }
-        
-    virtual bool RowInserted( size_t before )
-        { return m_model->ChildRowInserted( before ); }
-        
-    virtual bool RowDeleted( size_t row )
-        { return m_model->ChildRowDeleted( row ); }
-        
-    virtual bool RowChanged( size_t row )
-        { return m_model->ChildRowChanged( row ); }
-        
-    virtual bool ValueChanged( size_t col, size_t row )
-        { return m_model->ChildValueChanged( col, row); }
-        
-    virtual bool RowsReordered( size_t *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 )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )

 {
 {

-    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;
+    m_variantType = varianttype;
+    m_editorCtrl = NULL;

 }
 
 }
 

-static wxDataViewListModelCompare   s_CmpFunc;
-static wxDataViewListModel         *s_CmpModel;
-static size_t                       s_CmpCol;
-
-int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const

 {
 {

-    return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();

 }
 
 }
 

-// ---------------------------------------------------------
-// wxDataViewSortedListModel
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
-
-wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
-  m_array( wxDataViewIntermediateCmp )
+bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )

 {
 {

-    m_child = child;
-    s_CmpCol = 0;
-    s_CmpModel = child;
-    s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
-
-    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
-    m_child->AddNotifier( m_notifierOnChild );
-
-    Resort();
-}
+    m_item = item; // remember for later
+                                     
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
+    
+    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

 
 

-wxDataViewSortedListModel::~wxDataViewSortedListModel()
-{
-    m_child->RemoveNotifier( m_notifierOnChild );
+    return true;

 }
 
 }
 

-void wxDataViewSortedListModel::Resort()
+void wxDataViewRendererBase::CancelEditing()

 {
 {

-    m_array.Clear();
-    size_t n = m_child->GetNumberOfRows();
-    size_t i;
-    for (i = 0; i < n; i++)
-        m_array.Add( i );
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    // m_editorCtrl->PopEventHandler( true );

 }
 
 }
 

-#if 0
-static void Dump( wxDataViewListModel *model, size_t col )
+bool wxDataViewRendererBase::FinishEditing()

 {
 {

-    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() );
-    }
-}
-#endif
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );

 
 

-bool wxDataViewSortedListModel::ChildRowAppended()
-{
-    // no need to fix up array
-    
-    size_t len = m_array.GetCount();
-    
-    size_t pos = m_array.Add( len );
+    wxPendingDelete.Append( m_editorCtrl );

     
     

-    if (pos == 0)
-        return wxDataViewListModel::RowPrepended();
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();

     
     

-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
+    if (!Validate(value))
+        return false;

         
         

-    return wxDataViewListModel::RowInserted( pos );
-}
-
-bool wxDataViewSortedListModel::ChildRowPrepended()
-{
-    // fix up array
-    size_t i;
-    size_t len = m_array.GetCount();
-    for (i = 0; i < len; i++)
-    {
-        size_t value = m_array[i];
-        m_array[i] = value+1;
-    }
-    
-    size_t pos = m_array.Add( 0 );
+    unsigned int col = GetOwner()->GetModelColumn();
+    GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );

     
     

-    if (pos == 0)
-        return wxDataViewListModel::RowPrepended();
+    // m_editorCtrl->PopEventHandler( true );

     
     

-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
-        
-    return wxDataViewListModel::RowInserted( pos );
+    return true;

 }
 
 }
 

-bool wxDataViewSortedListModel::ChildRowInserted( size_t before )
+//-----------------------------------------------------------------------------
+// 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 )

 {
 {

-    // fix up array
-    size_t i;
-    size_t len = m_array.GetCount();
-    for (i = 0; i < len; i++)
-    {
-        size_t value = m_array[i];
-        if (value >= before)
-           m_array[i] = value+1;
-    }
-    
-    size_t pos = m_array.Add( before );
-    
-    if (pos == 0)
-        return wxDataViewListModel::RowPrepended();
-    
-    if (pos == len)
-        return wxDataViewListModel::RowAppended();
-        
-    return wxDataViewListModel::RowInserted( pos );
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
+
+    m_finished = false;

 }
 
 }
 

-bool wxDataViewSortedListModel::ChildRowDeleted( size_t row )
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )

 {
 {

-    size_t i;
-    size_t len = m_array.GetCount();
-    int pos = -1;
-    for (i = 0; i < len; i++)
+    if (m_focusOnIdle)

     {
     {

-        size_t value = m_array[i];
-        if (value == row)
-        {
-            // delete later
-            pos = (int) i;
-        }
-        else
-        {
-            // Fix up array
-            if (value > row)
-                m_array[i] = value-1;
-        }
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();

     }
     
     }
     

-    if (pos == -1)
-        return false; // we should probably assert
-
-    // remove        
-    m_array.RemoveAt( (size_t) pos );
-
-    return wxDataViewListModel::RowDeleted( (size_t) pos);
+    event.Skip();

 }
 
 }
 

-bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
+void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )

 {
 {

-    size_t i;
-    size_t len = m_array.GetCount();
-
-    // 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;
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            m_finished = true;
+            m_owner->FinishEditing();

             break;
             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.
-    size_t *order = new size_t[ 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( size_t col, size_t row )
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )

 {
 {

-    size_t i;
-    size_t len = m_array.GetCount();
-
-    // 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;
-        }
-
-    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.
-    size_t *order = new size_t[ len ];
-    // Fill up initial values.
-    for (i = 0; i < len; i++)
-        order[i] = i;
-
-    if (start_pos < end_pos)
+    if (!m_finished)

     {
     {

-        for (i = start_pos; i < end_pos; i++)
-            order[i] = order[i+1];
-        order[end_pos] = start_pos;
+        m_finished = true;
+        m_owner->FinishEditing();

     }
     }

-    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::ChildRowsReordered( size_t *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();
+    event.Skip();

 }
 
 }
 

-size_t wxDataViewSortedListModel::GetNumberOfRows()
-{
-    return m_array.GetCount();
-}
+// ---------------------------------------------------------
+// wxDataViewColumnBase
+// ---------------------------------------------------------

 
 

-size_t wxDataViewSortedListModel::GetNumberOfCols()
-{
-    return m_child->GetNumberOfCols();
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)

 
 

-wxString wxDataViewSortedListModel::GetColType( size_t col )
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags)) 

 {
 {

-    return m_child->GetColType( col );
-}
+    m_renderer = renderer;
+    m_model_column = model_column;
+    m_owner = NULL;
+    m_renderer->SetOwner( (wxDataViewColumn*) this );

 
 

-void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
-{
-    size_t child_row = m_array[row];
-    m_child->GetValue( variant, col, child_row );
+    // NOTE: the wxDataViewColumn's ctor must store the width, align, flags
+    //       parameters inside the native control!

 }
 
 }
 

-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags) ) 

 {
 {

-    size_t 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;
+    m_renderer = renderer;
+    m_model_column = model_column;
+    m_bitmap = bitmap;
+    m_owner = NULL;
+    m_renderer->SetOwner( (wxDataViewColumn*) this );

 }
 
 }
 

-bool wxDataViewSortedListModel::RowAppended()
+wxDataViewColumnBase::~wxDataViewColumnBase()

 {
 {

-    // 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;
+    if (m_renderer)
+        delete m_renderer;

 }
 
 }
 

-bool wxDataViewSortedListModel::RowPrepended()
+int wxDataViewColumnBase::GetFlags() const

 {
 {

-    // you can only append
-    bool ret = m_child->RowAppended();
+    int ret = 0;

 
 

-    // Do nothing here as the change in the
-    // child model will be reported back.
+    if (IsSortable())
+        ret |= wxDATAVIEW_COL_SORTABLE;
+    if (IsResizeable())
+        ret |= wxDATAVIEW_COL_RESIZABLE;
+    if (IsHidden())
+        ret |= wxDATAVIEW_COL_HIDDEN;

 
     return ret;
 }
 
 
     return ret;
 }
 

-bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
+void wxDataViewColumnBase::SetFlags(int flags)

 {
 {

-    // 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;
+    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
+    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
+    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);

 }
 
 }
 

-bool wxDataViewSortedListModel::RowDeleted( size_t row )
-{
-    size_t 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;
-}
+// ---------------------------------------------------------
+// wxDataViewEventModelNotifier
+// ---------------------------------------------------------

 
 

-bool wxDataViewSortedListModel::RowChanged( size_t row )
+class WXDLLIMPEXP_ADV wxDataViewEventModelNotifier: public wxDataViewModelNotifier

 {
 {

-    size_t 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.
+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;
+    }

 
 

-    return ret;
-}
+    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;
+};

 
 

-bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
-{
-    size_t 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.
+// ---------------------------------------------------------
+// wxDataViewCtrlBase
+// ---------------------------------------------------------

 
 

-    return ret;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)

 
 

-bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+wxDataViewCtrlBase::wxDataViewCtrlBase()

 {
 {

-    // We sort them ourselves.
-
-    return false;
+    m_model = NULL;
+    m_cols.DeleteContents( true );
+    m_eventNotifier = NULL;
+    m_expander_column = 0;
+    m_indent = 8;

 }
 
 }
 

-bool wxDataViewSortedListModel::Cleared()
+wxDataViewCtrlBase::~wxDataViewCtrlBase()

 {
 {

-    bool ret = m_child->Cleared();
+    // 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();

 
 

-    // Do nothing here as the change in the
-    // child model will be reported back.
+    if (m_model)
+    {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;

     
     

-    return ret;
+        m_model->DecRef();
+        m_model = NULL;
+    }

 }
 
 }
 

-// ---------------------------------------------------------
-// wxDataViewCellBase
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
-
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )

 {
 {

-    m_variantType = varianttype;
-    m_mode = mode;
-}
-
-// ---------------------------------------------------------
-// wxDataViewColumnBase
-// ---------------------------------------------------------
+    if (m_model)
+    {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+        
+        m_model->DecRef();   // discard old model, if any
+    }

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
+    // add our own reference to the new model:
+    m_model = model;
+    if (m_model)
+    {
+        m_model->IncRef(); 
+        m_eventNotifier = new wxDataViewEventModelNotifier( (wxDataViewCtrl*) this );
+        m_model->AddNotifier( m_eventNotifier );
+    }

 
 

-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
-                                           wxDataViewCell *cell,
-                                           size_t model_column,
-                                           int WXUNUSED(fixed_width),
-                                           wxDataViewColumnSizing WXUNUSED(sizing),
-                                           int flags )
-{
-    m_cell = cell;
-    m_model_column = model_column;
-    m_flags = flags;
-    m_title = title;
-    m_owner = NULL;
-    m_cell->SetOwner( (wxDataViewColumn*) this );
+    return true;

 }
 
 }
 

-wxDataViewColumnBase::~wxDataViewColumnBase()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()

 {
 {

-    if (m_cell)
-        delete m_cell;
-
-    if (GetOwner())
-    {
-        GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
-    }
+    return m_model;

 }
 
 }
 

-void wxDataViewColumnBase::SetTitle( const wxString &title )
+bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    m_title = title;
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-wxString wxDataViewColumnBase::GetTitle()
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return m_title;
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-// ---------------------------------------------------------
-// wxDataViewCtrlBase
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
-
-wxDataViewCtrlBase::wxDataViewCtrlBase()
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    m_model = NULL;
-    m_cols.DeleteContents( true );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-wxDataViewCtrlBase::~wxDataViewCtrlBase()
+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, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    m_model = model;
-
-    return true;
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return m_model;
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &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 wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &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 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 );
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );

-    m_model->AddViewingColumn( col, col->GetModelColumn() );

     return true;
 }
 
     return true;
 }
 

-size_t wxDataViewCtrlBase::GetNumberOfColumns()
+unsigned int wxDataViewCtrlBase::GetColumnCount() const

 {
     return m_cols.GetCount();
 }
 
 {
     return m_cols.GetCount();
 }
 

-bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )
+bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )

 {
     return false;
 }
 {
     return false;
 }


@@ -800,9 +530,27 @@ bool wxDataViewCtrlBase::ClearColumns()
     return false;
 }
 
     return false;
 }
 

-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
+wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )

 {
     return (wxDataViewColumn*) m_cols[ pos ];
 }
 
 {
     return (wxDataViewColumn*) m_cols[ pos ];
 }
 

+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+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
 #endif