restored expanders

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 7dfb742a165e82adb2482f04ba787d77220a49a6..7fbe7957d8d40166582a43c4afed1b0706681acd 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -15,214 +15,722 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/object.h"
+#if wxUSE_DATAVIEWCTRL
+

 #include "wx/dataview.h"
 #include "wx/dataview.h"

-#include "wx/log.h"
-#include "wx/image.h"

 
 

-// --------------------------------------------------------- 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+
+
+bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
+{
+    return (left.GetID() == right.GetID() );
+}
+
+
+// ---------------------------------------------------------

 // wxDataViewModel
 // wxDataViewModel

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxDataViewModelNotifiers);

 
 

-// --------------------------------------------------------- 
-// wxDataViewListModel
-// --------------------------------------------------------- 
+wxDataViewModel::wxDataViewModel()
+{
+    m_notifiers.DeleteContents( true );
+}

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
+bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
+{
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemAdded( parent, item ))
+            ret = false;
+    }

 
 

-wxDataViewListModel::wxDataViewListModel()
+    return ret;
+}
+
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )

 {
 {

-    m_notifier = NULL;
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemDeleted( parent, item ))
+            ret = false;
+    }
+
+    return ret;

 }
 
 }
 

-wxDataViewListModel::~wxDataViewListModel()
+bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )

 {
 {

-    if (m_notifier)
-        delete m_notifier;
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemChanged( item ))
+            ret = false;
+    }
+
+    return ret;

 }
 
 }
 

-bool wxDataViewListModel::RowAppended()
+bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col )

 {
 {

-    if (m_notifier)
-        return m_notifier->RowAppended();
-        
-    return false;
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ValueChanged( item, col ))
+            ret = false;
+    }
+
+    return ret;

 }
 
 }
 

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

 {
 {

-    if (m_notifier)
-        return m_notifier->RowPrepended();
-        
-    return false;
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->Cleared())
+            ret = false;
+    }
+
+    return ret;

 }
 
 }
 

-bool wxDataViewListModel::RowInserted( size_t before )
+void wxDataViewModel::Resort()

 {
 {

-    if (m_notifier)
-        return m_notifier->RowInserted( before );
-        
-    return false;
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        notifier->Resort();
+    }

 }
 
 }
 

-bool wxDataViewListModel::RowDeleted( size_t row )
+void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )

 {
 {

-    if (m_notifier)
-        return m_notifier->RowDeleted( row );
-        
-    return false;
+    m_notifiers.push_back( notifier );
+    notifier->SetOwner( this );

 }
 
 }
 

-bool wxDataViewListModel::RowChanged( size_t row )
+void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )

 {
 {

-    if (m_notifier)
-        return m_notifier->RowChanged( row );
-        
-    return false;
+    m_notifiers.DeleteObject( notifier );

 }
 
 }
 

-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                              unsigned int column, bool ascending )

 {
 {

-    if (m_notifier)
-        return m_notifier->ValueChanged( col, row );
-        
-    return false;
+    // sort branches before leaves
+    bool item1_is_container = IsContainer(item1);
+    bool item2_is_container = IsContainer(item2);
+
+    if (item1_is_container && !item2_is_container)
+        return 1;
+    if (item2_is_container && !item1_is_container)
+        return -1;
+
+    wxVariant value1,value2;
+    GetValue( value1, item1, column );
+    GetValue( value2, item2, column );
+
+    if (!ascending)
+    {
+        wxVariant temp = value1;
+        value1 = value2;
+        value2 = temp;
+    }
+
+    if (value1.GetType() == wxT("string"))
+    {
+        wxString str1 = value1.GetString();
+        wxString str2 = value2.GetString();
+        int res = str1.Cmp( str2 );
+        if (res) return res;
+    } else
+    if (value1.GetType() == wxT("long"))
+    {
+        long l1 = value1.GetLong();
+        long l2 = value2.GetLong();
+        long res = l1-l2;
+        if (res) return res;
+    } else
+    if (value1.GetType() == wxT("double"))
+    {
+        double d1 = value1.GetDouble();
+        double d2 = value2.GetDouble();
+        if (d1 < d2) return 1;
+        if (d1 > d2) return -1;
+    } else
+    if (value1.GetType() == wxT("datetime"))
+    {
+        wxDateTime dt1 = value1.GetDateTime();
+        wxDateTime dt2 = value2.GetDateTime();
+        if (dt1.IsEarlierThan(dt2)) return 1;
+        if (dt2.IsEarlierThan(dt1)) return -11;
+    }
+
+    // items must be different
+    unsigned long litem1 = (unsigned long) item1.GetID();
+    unsigned long litem2 = (unsigned long) item2.GetID();
+    
+    if (!ascending)
+        return litem2-litem2;
+
+    return litem1-litem2;

 }
 
 }
 

-bool wxDataViewListModel::Cleared()
+// ---------------------------------------------------------
+// wxDataViewIndexListModel
+// ---------------------------------------------------------
+
+wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )

 {
 {

-    if (m_notifier)
-        return m_notifier->Cleared();
-        
+    // build initial index
+    unsigned int i;
+    for (i = 1; i < initial_size+1; i++)
+        m_hash.Add( (void*) i );
+    m_lastIndex = initial_size + 1;
+}
+
+wxDataViewIndexListModel::~wxDataViewIndexListModel()
+{
+}
+
+void wxDataViewIndexListModel::RowPrepended()
+{
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, 0 );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewIndexListModel::RowInserted( unsigned int before )
+{
+    unsigned int id = m_lastIndex++;
+    m_hash.Insert( (void*) id, before );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewIndexListModel::RowAppended()
+{
+    unsigned int id = m_lastIndex++;
+    m_hash.Add( (void*) id );
+    wxDataViewItem item( (void*) id );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewIndexListModel::RowDeleted( unsigned int row )
+{
+    wxDataViewItem item( m_hash[row] );
+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+    m_hash.RemoveAt( row );
+}
+
+void wxDataViewIndexListModel::RowChanged( unsigned int row )
+{
+    wxDataViewModel::ItemChanged( GetItem(row) );
+}
+
+void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int col )
+{
+    wxDataViewModel::ValueChanged( GetItem(row), col );
+}
+
+unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
+{
+    // assert for not found
+    return (unsigned int) m_hash.Index( item.GetID() );
+}
+
+wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
+{
+    wxASSERT( row < m_hash.GetCount() );
+    return wxDataViewItem( m_hash[row] );
+}
+
+int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                                       unsigned int column, bool ascending )
+{
+    if (ascending)
+        return GetRow(item1) - GetRow(item2);
+    
+    return GetRow(item2) - GetRow(item1);
+}
+
+void wxDataViewIndexListModel::GetValue( wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col ) const
+{
+    GetValue( variant, GetRow(item), col );
+}
+
+bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col )
+{
+    return SetValue( variant, GetRow(item), col );
+}
+
+wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+{
+    return wxDataViewItem(0);
+}
+
+bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
+{
+    // only the invisible root item has children
+    if (!item.IsOk())
+        return true;
+

     return false;
 }
 
     return false;
 }
 

-void wxDataViewListModel::SetNotifier( wxDataViewListModelNotifier *notifier )
+wxDataViewItem wxDataViewIndexListModel::GetFirstChild( const wxDataViewItem &parent ) const

 {
 {

-    if (m_notifier)
-        delete m_notifier;
-        
-   m_notifier = notifier;
+    if (!parent.IsOk())
+    {
+        if (m_hash.GetCount() == 0)
+            return wxDataViewItem(0);
+
+        return wxDataViewItem( m_hash[0]);
+    }
+
+    return wxDataViewItem(0);

 }
 
 }
 

-wxDataViewListModelNotifier* wxDataViewListModel::GetNotifier()
+wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &item ) const

 {
 {

-    return m_notifier;
+    if (!item.IsOk())
+        return wxDataViewItem(0);
+
+    int pos = m_hash.Index( item.GetID() );
+    if ((pos == wxNOT_FOUND) || (pos == (int) (m_hash.GetCount()-1)))
+        return wxDataViewItem(0);
+
+    return wxDataViewItem( m_hash[pos+1] );

 }
 
 }
 

-// --------------------------------------------------------- 
-// 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_variantType = varianttype;

-    m_mode = mode;
+    m_editorCtrl = NULL;
+}
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();

 }
 }

+
+bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
+{
+    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
+
+    // Now we should send Editing Started event
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() );
+    event.SetDataViewColumn( GetOwner() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
+    return true;
+}
+
+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, m_item, col );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
+
+    // m_editorCtrl->PopEventHandler( true );

     
     

-// --------------------------------------------------------- 
+    // Now we should send Editing Done event
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
+    event.SetDataViewColumn( GetOwner() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( m_item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// 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
 // wxDataViewColumnBase

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
 
 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_model_column = model_column;

-    m_flags = flags;
-    m_title = title;

     m_owner = NULL;
     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()
 {
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {

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

 }
 
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCtrlBase
 // wxDataViewCtrlBase

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;

-    m_cols.DeleteContents( true );
+    m_expander_column = 0;
+    m_indent = 8;

 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
     if (m_model)
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
     if (m_model)

-        delete m_model;
+    {
+        m_model->DecRef();
+        m_model = NULL;
+    }

 }
 
 }
 

-bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
+bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )

 {
     if (m_model)
 {
     if (m_model)

-        delete m_model;
-        
+    {
+        m_model->DecRef();   // discard old model, if any
+    }
+
+    // add our own reference to the new model:

     m_model = model;
     m_model = model;

-    
+    if (m_model)
+    {
+        m_model->IncRef();
+    }
+

     return true;
 }
 
     return true;
 }
 

-wxDataViewListModel* wxDataViewCtrlBase::GetModel()
+wxDataViewModel* wxDataViewCtrlBase::GetModel()

 {
     return m_model;
 }
 
 {
     return m_model;
 }
 

-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

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

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+wxDataViewColumn *
+wxDataViewCtrlBase::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 ) );
+    
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    m_cols.Append( (wxObject*) col );
-    col->SetOwner( (wxDataViewCtrl*) this );
-    return true;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-size_t wxDataViewCtrlBase::GetNumberOfColumns()
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return m_cols.GetCount();
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::DeleteColumn( size_t pos )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return false;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return (wxDataViewColumn*) m_cols[ pos ];
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;
+}
+
+bool
+wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+
+#endif
+