X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4627af27d499cd8aca708ca06e8fad19dd61ca26..96aaaff8654713ad989bd833476856e9df06f8a8:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 1497379309..c3aba3e3d4 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -25,18 +25,11 @@
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 
 // ---------------------------------------------------------
 // wxDataViewListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
 wxDataViewListModel::wxDataViewListModel()
 {
     m_viewingColumns.DeleteContents( true );
@@ -79,7 +72,7 @@ bool wxDataViewListModel::RowPrepended()
     return ret;
 }
 
-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )
 {
     bool ret = true;
 
@@ -95,7 +88,7 @@ bool wxDataViewListModel::RowInserted( size_t before )
     return ret;
 }
 
-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )
 {
     bool ret = true;
 
@@ -111,7 +104,7 @@ bool wxDataViewListModel::RowDeleted( size_t row )
     return ret;
 }
 
-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )
 {
     bool ret = true;
 
@@ -127,7 +120,7 @@ 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;
 
@@ -143,7 +136,7 @@ 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;
 
@@ -175,7 +168,7 @@ 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 ) );
 }
@@ -217,28 +210,31 @@ class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
 public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
         { m_model = model; }
+        
+    ~wxDataViewSortedListModelNotifier()
+        { m_model->DetachChild(); }
 
     virtual bool RowAppended()
         { return m_model->ChildRowAppended(); }
-        
+
     virtual bool RowPrepended()
         { return m_model->ChildRowPrepended(); }
-        
-    virtual bool RowInserted( size_t before )
+
+    virtual bool RowInserted( unsigned int before )
         { return m_model->ChildRowInserted( before ); }
-        
-    virtual bool RowDeleted( size_t row )
+
+    virtual bool RowDeleted( unsigned int row )
         { return m_model->ChildRowDeleted( row ); }
-        
-    virtual bool RowChanged( size_t row )
+
+    virtual bool RowChanged( unsigned int row )
         { return m_model->ChildRowChanged( row ); }
-        
-    virtual bool ValueChanged( size_t col, size_t row )
+
+    virtual bool ValueChanged( unsigned int col, unsigned int row )
         { return m_model->ChildValueChanged( col, row); }
-        
-    virtual bool RowsReordered( size_t *new_order )
-        { return m_model->ChildRowsReordered( new_order ); }  
-        
+
+    virtual bool RowsReordered( unsigned int *new_order )
+        { return m_model->ChildRowsReordered( new_order ); }
+
     virtual bool Cleared()
         { return m_model->ChildCleared(); }
 
@@ -250,7 +246,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 );
@@ -287,11 +283,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 );
 }
@@ -300,15 +302,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 );
@@ -318,23 +317,45 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
-    m_child->RemoveNotifier( m_notifierOnChild );
+    if (m_child)
+        m_child->RemoveNotifier( m_notifierOnChild );
+}
+
+void wxDataViewSortedListModel::DetachChild()
+{
+    m_child = NULL;
+}
+
+// FIXME
+void wxDataViewSortedListModel::InitStatics()
+{
+    s_CmpCol = 0;
+    s_CmpModel = m_child;
+    if (m_ascending)
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+    else
+        s_CmpFunc = wxDataViewListModelSortedDefaultCompareDescending;
 }
 
 void wxDataViewSortedListModel::Resort()
 {
+    InitStatics();
+    
     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 );
+       
+    // do we need the neworder?
+    wxDataViewListModel::RowsReordered( NULL );
 }
 
 #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;
@@ -349,73 +370,73 @@ static void Dump( wxDataViewListModel *model, size_t col )
 bool wxDataViewSortedListModel::ChildRowAppended()
 {
     // no need to fix up array
-    
-    size_t len = m_array.GetCount();
-    
-    size_t pos = m_array.Add( len );
-    
+
+    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
-    size_t i;
-    size_t len = m_array.GetCount();
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
     for (i = 0; i < len; i++)
     {
-        size_t value = m_array[i];
+        unsigned int value = m_array[i];
         m_array[i] = value+1;
     }
-    
-    size_t pos = m_array.Add( 0 );
-    
+
+    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( size_t before )
+bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
 {
     // fix up array
-    size_t i;
-    size_t len = m_array.GetCount();
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
     for (i = 0; i < len; i++)
     {
-        size_t value = m_array[i];
+        unsigned int value = m_array[i];
         if (value >= before)
            m_array[i] = value+1;
     }
-    
-    size_t pos = m_array.Add( before );
-    
+
+    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( size_t row )
+bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
 {
-    size_t i;
-    size_t len = m_array.GetCount();
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
     int pos = -1;
     for (i = 0; i < len; i++)
     {
-        size_t value = m_array[i];
+        unsigned int value = m_array[i];
         if (value == row)
         {
             // delete later
@@ -428,24 +449,24 @@ bool wxDataViewSortedListModel::ChildRowDeleted( size_t row )
                 m_array[i] = value-1;
         }
     }
-    
+
     if (pos == -1)
         return false; // we should probably assert
 
-    // remove        
-    m_array.RemoveAt( (size_t) pos );
+    // remove
+    m_array.RemoveAt( (unsigned int) pos );
 
-    return wxDataViewListModel::RowDeleted( (size_t) pos);
+    return wxDataViewListModel::RowDeleted( (unsigned int) pos);
 }
 
-bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
+bool wxDataViewSortedListModel::ChildRowChanged( 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)
         {
@@ -467,7 +488,7 @@ bool wxDataViewSortedListModel::ChildRowChanged( 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;
@@ -492,14 +513,14 @@ bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
     return true;
 }
 
-bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+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)
         {
@@ -521,7 +542,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;
@@ -546,7 +567,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
     return true;
 }
 
-bool wxDataViewSortedListModel::ChildRowsReordered( size_t *new_order )
+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
@@ -559,30 +580,30 @@ bool wxDataViewSortedListModel::ChildCleared()
     return wxDataViewListModel::Cleared();
 }
 
-size_t wxDataViewSortedListModel::GetNumberOfRows()
+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( const 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 );
 
     // Do nothing here as the change in the
@@ -613,7 +634,7 @@ bool wxDataViewSortedListModel::RowPrepended()
     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();
@@ -624,9 +645,9 @@ bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
     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 );
 
@@ -636,9 +657,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
@@ -647,9 +668,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
@@ -658,7 +679,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.
 
@@ -671,20 +692,144 @@ bool wxDataViewSortedListModel::Cleared()
 
     // Do nothing here as the change in the
     // child model will be reported back.
-    
+
     return ret;
 }
 
 // ---------------------------------------------------------
-// wxDataViewCellBase
+// wxDataViewRendererBase
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
-wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_mode = mode;
+    m_editorCtrl = NULL;
+    m_row = (unsigned int) -1;
+}
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+}
+
+bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+{
+    m_row = row; // remember for later
+                                     
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row );
+    
+    m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
+    
+    wxDataViewEditorCtrlEvtHandler *handler = 
+        new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
+        
+    m_editorCtrl->PushEventHandler( handler );
+    
+#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+    handler->SetFocusOnIdle();
+#else
+    m_editorCtrl->SetFocus();
+#endif
+
+    return true;
+}
+
+void wxDataViewRendererBase::CancelEditing()
+{
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    // m_editorCtrl->PopEventHandler( true );
+}
+
+bool wxDataViewRendererBase::FinishEditing()
+{
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );
+
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    if (!Validate(value))
+        return false;
+        
+    unsigned int col = GetOwner()->GetModelColumn();
+    GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
+    
+    // m_editorCtrl->PopEventHandler( true );
+    
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewEditorCtrlEvtHandler
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
+    EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
+    EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
+    EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
+END_EVENT_TABLE()
+
+wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
+                                wxControl *editorCtrl,
+                                wxDataViewRenderer *owner )
+{
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
+
+    m_finished = false;
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
+{
+    if (m_focusOnIdle)
+    {
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();
+    }
+    
+    event.Skip();
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            m_finished = true;
+            m_owner->FinishEditing();
+            break;
+
+        case WXK_ESCAPE:
+            m_finished = true;
+            m_owner->CancelEditing();
+            break;
+
+        default:
+            event.Skip();
+    }
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
+{
+    if (!m_finished)
+    {
+        m_finished = true;
+        m_owner->FinishEditing();
+    }
+
+    event.Skip();
 }
 
 // ---------------------------------------------------------
@@ -693,25 +838,40 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
-                                           wxDataViewCell *cell,
-                                           size_t model_column,
-                                           int WXUNUSED(fixed_width),
-                                           wxDataViewColumnSizing WXUNUSED(sizing),
-                                           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())
     {
@@ -719,16 +879,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
 // ---------------------------------------------------------
@@ -743,11 +915,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;
 }
@@ -757,24 +945,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 wxDataViewTextCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
@@ -785,12 +1033,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;
 }
@@ -800,9 +1048,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