X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f554a14b8989125033f32fd9bfc4ef877664eb39..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 56966186a5..73fa33d507 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -17,26 +17,19 @@
 
 #if wxUSE_DATAVIEWCTRL
 
+#include "wx/dataview.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/object.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/image.h"
-#include "wx/dataview.h"
-
-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 
 // ---------------------------------------------------------
 // wxDataViewListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
 wxDataViewListModel::wxDataViewListModel()
 {
     m_viewingColumns.DeleteContents( true );
@@ -45,13 +38,20 @@ wxDataViewListModel::wxDataViewListModel()
 
 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;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -67,7 +67,7 @@ bool wxDataViewListModel::RowPrepended()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -79,11 +79,11 @@ bool wxDataViewListModel::RowPrepended()
     return ret;
 }
 
-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -95,11 +95,11 @@ bool wxDataViewListModel::RowInserted( size_t before )
     return ret;
 }
 
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -111,11 +111,11 @@ bool wxDataViewListModel::RowDeleted( size_t row )
     return ret;
 }
 
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -127,11 +127,11 @@ bool wxDataViewListModel::RowChanged( size_t row )
     return ret;
 }
 
-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -143,11 +143,11 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
     return ret;
 }
 
-bool wxDataViewListModel::RowsReordered( size_t *new_order )
+bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -163,7 +163,7 @@ bool wxDataViewListModel::Cleared()
 {
     bool ret = true;
 
-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
@@ -175,14 +175,14 @@ bool wxDataViewListModel::Cleared()
     return ret;
 }
 
-void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column )
+void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
 {
     m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
 }
 
 void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
 {
-    wxNode *node = m_viewingColumns.GetFirst();
+    wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
     while (node)
     {
         wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
@@ -216,17 +216,34 @@ class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
 {
 public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
-    { m_model = model; }
-
-    virtual bool RowAppended() { return true; }
-    virtual bool RowPrepended()  { return true; }
-    virtual bool RowInserted( size_t WXUNUSED(before) )  { return true; }
-    virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; }
-    virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; }
-    virtual bool ValueChanged( size_t col, size_t row )
-         { return m_model->ChildValueChanged( col, row); }
-    virtual bool RowsReordered( size_t *WXUNUSED(new_order) ) { return true; }
-    virtual bool Cleared() { return true; }
+        { 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;
 };
@@ -236,7 +253,7 @@ public:
 // ---------------------------------------------------------
 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
-      (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
+      (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
 {
     wxVariant value1,value2;
     model->GetValue( value1, col, row1 );
@@ -273,11 +290,17 @@ int wxCALLBACK wxDataViewListModelSortedDefaultCompare
     return 0;
 }
 
+int wxCALLBACK wxDataViewListModelSortedDefaultCompareDescending
+      (unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
+{
+    return wxDataViewListModelSortedDefaultCompare( row2, row1, col, model );
+}
+
 static wxDataViewListModelCompare   s_CmpFunc;
 static wxDataViewListModel         *s_CmpModel;
-static size_t                       s_CmpCol;
+static unsigned int                 s_CmpCol;
 
-int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
+int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
 {
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
@@ -286,15 +309,12 @@ int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
 // wxDataViewSortedListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
-
 wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
   m_array( wxDataViewIntermediateCmp )
 {
     m_child = child;
-    s_CmpCol = 0;
-    s_CmpModel = child;
-    s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+    
+    m_ascending = true;
 
     m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
     m_child->AddNotifier( m_notifierOnChild );
@@ -304,23 +324,37 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
+    if (m_child)
     m_child->RemoveNotifier( m_notifierOnChild );
 }
 
+// FIXME
+void wxDataViewSortedListModel::InitStatics()
+{
+    s_CmpCol = 0;
+    s_CmpModel = m_child;
+    if (m_ascending)
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+    else
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
+}
+
 void wxDataViewSortedListModel::Resort()
 {
+    InitStatics();
+    
     m_array.Clear();
-    size_t n = m_child->GetNumberOfRows();
-    size_t i;
+    unsigned int n = m_child->GetRowCount();
+    unsigned int i;
     for (i = 0; i < n; i++)
         m_array.Add( i );
 }
 
 #if 0
-static void Dump( wxDataViewListModel *model, size_t col )
+static void Dump( wxDataViewListModel *model, unsigned int col )
 {
-    size_t n = model->GetNumberOfRows();
-    size_t i;
+    unsigned int n = model->GetRowCount();
+    unsigned int i;
     for (i = 0; i < n; i++)
     {
         wxVariant variant;
@@ -332,14 +366,160 @@ static void Dump( wxDataViewListModel *model, size_t col )
 }
 #endif
 
-bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+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();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowPrepended()
+{
+    // fix up array
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        m_array[i] = value+1;
+    }
+
+    unsigned int pos = m_array.Add( 0 );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
+{
+    // fix up array
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        if (value >= before)
+           m_array[i] = value+1;
+    }
+
+    unsigned int pos = m_array.Add( before );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    if (pos == len)
+        return wxDataViewListModel::RowAppended();
+
+    return wxDataViewListModel::RowInserted( pos );
+}
+
+bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
+{
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+    int pos = -1;
+    for (i = 0; i < len; i++)
+    {
+        unsigned int value = m_array[i];
+        if (value == row)
+        {
+            // delete later
+            pos = (int) i;
+        }
+        else
+        {
+            // Fix up array
+            if (value > row)
+                m_array[i] = value-1;
+        }
+    }
+
+    if (pos == -1)
+        return false; // we should probably assert
+
+    // remove
+    m_array.RemoveAt( (unsigned int) pos );
+
+    return wxDataViewListModel::RowDeleted( (unsigned int) pos);
+}
+
+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;
+            break;
+        }
+
+    if (end_pos == start_pos)
+        return wxDataViewListModel::RowChanged( start_pos );
+
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    unsigned int *order = new unsigned int[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    if (start_pos < end_pos)
+    {
+        for (i = start_pos; i < end_pos; i++)
+            order[i] = order[i+1];
+        order[end_pos] = start_pos;
+    }
+    else
+    {
+        for (i = end_pos; i > start_pos; i--)
+            order[i] = order[i-1];
+        order[start_pos] = end_pos;
+    }
+
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;
+
+    return true;
+}
+
+bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
 {
-    size_t i;
-    size_t len = m_array.GetCount();
+    unsigned int i;
+    unsigned int 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;
+    unsigned int start_pos = 0,end_pos = 0;
     for (i = 0; i < len; i++)
         if (m_array[i] == row)
         {
@@ -361,7 +541,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
 
     // Create an array where order[old] -> new_pos, so that
     // if nothing changed order[0] -> 0 etc.
-    size_t *order = new size_t[ len ];
+    unsigned int *order = new unsigned int[ len ];
     // Fill up initial values.
     for (i = 0; i < len; i++)
         order[i] = i;
@@ -386,33 +566,47 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
     return true;
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfRows()
+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::GetRowCount() const
 {
     return m_array.GetCount();
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfCols()
+unsigned int wxDataViewSortedListModel::GetColumnCount() const
 {
-    return m_child->GetNumberOfCols();
+    return m_child->GetColumnCount();
 }
 
-wxString wxDataViewSortedListModel::GetColType( size_t col )
+wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const
 {
-    return m_child->GetColType( col );
+    return m_child->GetColumnType( col );
 }
 
-void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row ) const
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     m_child->GetValue( variant, col, child_row );
 }
 
-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+bool wxDataViewSortedListModel::SetValue( wxVariant &variant, unsigned int col, unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );
 
-    // Resort in ::ChildValueChanged() which gets reported back.
+    // Do nothing here as the change in the
+    // child model will be reported back.
 
     return ret;
 }
@@ -422,7 +616,8 @@ bool wxDataViewSortedListModel::RowAppended()
     // you can only append
     bool ret = m_child->RowAppended();
 
-    // report RowInsrted
+    // Do nothing here as the change in the
+    // child model will be reported back.
 
     return ret;
 }
@@ -432,24 +627,26 @@ bool wxDataViewSortedListModel::RowPrepended()
     // you can only append
     bool ret = m_child->RowAppended();
 
-    // report RowInsrted
+    // Do nothing here as the change in the
+    // child model will be reported back.
 
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
+bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
 {
     // you can only append
     bool ret = m_child->RowAppended();
 
-    // report different RowInsrted
+    // Do nothing here as the change in the
+    // child model will be reported back.
 
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowDeleted( size_t row )
+bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
 
     bool ret = m_child->RowDeleted( child_row );
 
@@ -459,9 +656,9 @@ bool wxDataViewSortedListModel::RowDeleted( size_t row )
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowChanged( size_t row )
+bool wxDataViewSortedListModel::RowChanged( unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );
 
     // Do nothing here as the change in the
@@ -470,9 +667,9 @@ bool wxDataViewSortedListModel::RowChanged( size_t row )
     return ret;
 }
 
-bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
 {
-    size_t child_row = m_array[row];
+    unsigned int child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );
 
     // Do nothing here as the change in the
@@ -481,7 +678,7 @@ bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
     return ret;
 }
 
-bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
 {
     // We sort them ourselves.
 
@@ -492,21 +689,28 @@ bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();
 
-    wxDataViewListModel::Cleared();
+    // Do nothing here as the change in the
+    // child model will be reported back.
 
     return ret;
 }
 
 // ---------------------------------------------------------
-// wxDataViewCellBase
+// wxDataViewRendererBase
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_mode = mode;
+}
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 
 // ---------------------------------------------------------
@@ -515,20 +719,40 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC
 
 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_renderer = renderer;
+    m_model_column = model_column;
+    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,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
+                                           int WXUNUSED(flags) ) 
 {
-    m_cell = cell;
+    m_renderer = renderer;
     m_model_column = model_column;
-    m_flags = flags;
-    m_title = title;
+    m_bitmap = bitmap;
     m_owner = NULL;
-    m_cell->SetOwner( (wxDataViewColumn*) this );
+    m_renderer->SetOwner( (wxDataViewColumn*) this );
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {
-    if (m_cell)
-        delete m_cell;
+    if (m_renderer)
+        delete m_renderer;
 
     if (GetOwner())
     {
@@ -536,16 +760,28 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
     }
 }
 
-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
 // ---------------------------------------------------------
@@ -560,11 +796,27 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
+    // IMPORTANT: before calling DecRef() on our model (since it may 
+    //            result in a free() call), erase all columns (since
+    //            they hold a pointer to our model)
+    m_cols.Clear();
+
+    if (m_model)
+    {
+        m_model->DecRef();
+        m_model = NULL;
+    }
 }
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
+    if ( m_model )
+        m_model->DecRef();   // discard old model, if any
+
+    // add our own reference to the new model:
     m_model = model;
+    if ( m_model )
+        m_model->IncRef(); 
 
     return true;
 }
@@ -574,24 +826,84 @@ wxDataViewListModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new 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, (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, (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, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new 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 ) );
+    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 ) );
+    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 )
@@ -602,12 +914,12 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
-size_t wxDataViewCtrlBase::GetNumberOfColumns()
+unsigned int wxDataViewCtrlBase::GetColumnCount() const
 {
     return m_cols.GetCount();
 }
 
-bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )
+bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
 {
     return false;
 }
@@ -617,9 +929,21 @@ bool wxDataViewCtrlBase::ClearColumns()
     return false;
 }
 
-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
+wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 {
     return (wxDataViewColumn*) m_cols[ pos ];
 }
 
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
+
+
 #endif