Added part of patch

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index ec05414d7e3d9227d2ca5732083023037f34be65..1094b1ebcadab777192d344449f3d85305d35dd4 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -15,24 +15,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_DATAVIEWCTRL
 
 #if wxUSE_DATAVIEWCTRL
 

-#include "wx/object.h"

 #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");
+
+// ---------------------------------------------------------

 // wxDataViewModel
 // wxDataViewModel

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

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 

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

 // wxDataViewListModel
 // wxDataViewListModel

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

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
 


@@ -50,7 +51,7 @@ bool wxDataViewListModel::RowAppended()
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -58,7 +59,7 @@ bool wxDataViewListModel::RowAppended()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -66,7 +67,7 @@ bool wxDataViewListModel::RowPrepended()
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -74,15 +75,15 @@ bool wxDataViewListModel::RowPrepended()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::RowInserted( size_t before )
+bool wxDataViewListModel::RowInserted( unsigned int before )

 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -90,15 +91,15 @@ bool wxDataViewListModel::RowInserted( size_t before )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::RowDeleted( size_t row )
+bool wxDataViewListModel::RowDeleted( unsigned int row )

 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -106,15 +107,15 @@ bool wxDataViewListModel::RowDeleted( size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::RowChanged( size_t row )
+bool wxDataViewListModel::RowChanged( unsigned int row )

 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -122,15 +123,15 @@ bool wxDataViewListModel::RowChanged( size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
+bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )

 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -138,15 +139,15 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-    
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewListModel::RowsReordered( size_t *new_order )
+bool wxDataViewListModel::RowsReordered( unsigned int *new_order )

 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -154,7 +155,7 @@ bool wxDataViewListModel::RowsReordered( size_t *new_order )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -162,7 +163,7 @@ bool wxDataViewListModel::Cleared()
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxNode *node = m_notifiers.GetFirst();
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();

     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
     while (node)
     {
         wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();


@@ -170,28 +171,28 @@ bool wxDataViewListModel::Cleared()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     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 )
 {
 {
     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();
     while (node)
     {
         wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();

-        
+

         if (tmp->m_viewColumn == column)
         {
             m_viewingColumns.DeleteObject( tmp );
             return;
         }
         if (tmp->m_viewColumn == column)
         {
             m_viewingColumns.DeleteObject( tmp );
             return;
         }

-    
+

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -207,38 +208,53 @@ void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier
     m_notifiers.DeleteObject( notifier );
 }
 
     m_notifiers.DeleteObject( notifier );
 }
 

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

 // wxDataViewSortedListModelNotifier
 // wxDataViewSortedListModelNotifier

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

 
 class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
 {
 public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
 
 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 before )  { return true; }
-    virtual bool RowDeleted( size_t row ) { return true; }
-    virtual bool RowChanged( size_t row ) { return true; }
-    virtual bool ValueChanged( size_t col, size_t row )
-         { return m_model->ChildValueChanged( col, row); }
-    virtual bool RowsReordered( size_t *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(); }
+

     wxDataViewSortedListModel *m_model;
 };
 
     wxDataViewSortedListModel *m_model;
 };
 

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

 // wxDataViewSortedListModel compare function
 // wxDataViewSortedListModel compare function

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

 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
 
 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 = model->GetValue( col, row1 );
-    wxVariant value2 = model->GetValue( col, row2 );
+    wxVariant value1,value2;
+    model->GetValue( value1, col, row1 );
+    model->GetValue( value2, col, row2 );

     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();
     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();


@@ -271,16 +287,22 @@ int wxCALLBACK wxDataViewListModelSortedDefaultCompare
     return 0;
 }
 
     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 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 );
 }
 
 {
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 

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

 // wxDataViewSortedListModel
 // ---------------------------------------------------------
 
 // wxDataViewSortedListModel
 // ---------------------------------------------------------
 


@@ -290,14 +312,13 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
   m_array( wxDataViewIntermediateCmp )
 {
     m_child = 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 );
     m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
     m_child->AddNotifier( m_notifierOnChild );

-    
-    Resort();    
+
+    Resort();

 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()


@@ -305,44 +326,220 @@ wxDataViewSortedListModel::~wxDataViewSortedListModel()
     m_child->RemoveNotifier( m_notifierOnChild );
 }
 
     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()
 {
 void wxDataViewSortedListModel::Resort()
 {

+    InitStatics();
+    

     m_array.Clear();
     m_array.Clear();

-    size_t n = m_child->GetNumberOfRows();
-    size_t i;
+    unsigned int n = m_child->GetNumberOfRows();
+    unsigned int i;

     for (i = 0; i < n; i++)
         m_array.Add( i );
 }
 
     for (i = 0; i < n; i++)
         m_array.Add( i );
 }
 

-bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+#if 0
+static void Dump( wxDataViewListModel *model, unsigned int col )

 {
 {

-    size_t i;
-    size_t len = m_array.GetCount();
-    
+    unsigned int n = model->GetNumberOfRows();
+    unsigned int i;
+    for (i = 0; i < n; i++)
+    {
+        wxVariant variant;
+        model->GetValue( variant, col, i );
+        wxString tmp;
+        tmp = variant.GetString();
+        wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
+    }
+}
+#endif
+
+bool wxDataViewSortedListModel::ChildRowAppended()
+{
+    // no need to fix up array
+
+    unsigned int len = m_array.GetCount();
+
+    unsigned int pos = m_array.Add( len );
+
+    if (pos == 0)
+        return wxDataViewListModel::RowPrepended();
+
+    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 )
+{
+    unsigned int i;
+    unsigned int len = m_array.GetCount();
+

     // Remove and readd sorted. Find out at which
     // position it was and where it ended.
     // 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)
         {
             start_pos = i;
             break;
         }
     for (i = 0; i < len; i++)
         if (m_array[i] == row)
         {
             start_pos = i;
             break;
         }

-    m_array.Remove( row );
+    m_array.RemoveAt( start_pos );

     m_array.Add( row );
     m_array.Add( row );

+

     for (i = 0; i < len; i++)
         if (m_array[i] == row)
         {
             end_pos = i;
             break;
         }
     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 );
     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.
     // 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;
     // Fill up initial values.
     for (i = 0; i < len; i++)
         order[i] = i;


@@ -358,43 +555,57 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
         for (i = end_pos; i > start_pos; i--)
             order[i] = order[i-1];
         order[start_pos] = end_pos;
         for (i = end_pos; i > start_pos; i--)
             order[i] = order[i-1];
         order[start_pos] = end_pos;

-    }   
-    
-    RowsReordered( order );
-    
+    }
+
+    wxDataViewListModel::RowsReordered( order );
+

     delete [] order;
     delete [] order;

-    
+
+    return true;
+}
+
+bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
+{
+    // Nothing needs to be done. If the sort criteria
+    // of this list don't change, the order of the
+    // items of the child list isn't relevant.

     return true;
 }
 
     return true;
 }
 

-size_t wxDataViewSortedListModel::GetNumberOfRows()
+bool wxDataViewSortedListModel::ChildCleared()
+{
+    return wxDataViewListModel::Cleared();
+}
+
+unsigned int wxDataViewSortedListModel::GetNumberOfRows()

 {
 {

-    return m_child->GetNumberOfRows();
+    return m_array.GetCount();

 }
 
 }
 

-size_t wxDataViewSortedListModel::GetNumberOfCols()
+unsigned int wxDataViewSortedListModel::GetNumberOfCols()

 {
     return m_child->GetNumberOfCols();
 }
 
 {
     return m_child->GetNumberOfCols();
 }
 

-wxString wxDataViewSortedListModel::GetColType( size_t col )
+wxString wxDataViewSortedListModel::GetColType( unsigned int col )

 {
     return m_child->GetColType( col );
 }
 
 {
     return m_child->GetColType( col );
 }
 

-wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row )

 {
 {

-    size_t child_row = m_array[row];
-    return m_child->GetValue( col, child_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 );
     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;
 }
 
     return ret;
 }
 


@@ -402,9 +613,10 @@ bool wxDataViewSortedListModel::RowAppended()
 {
     // you can only append
     bool ret = m_child->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;
 }
 
     return ret;
 }
 


@@ -412,57 +624,59 @@ bool wxDataViewSortedListModel::RowPrepended()
 {
     // you can only append
     bool ret = m_child->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;
 }
 
     return ret;
 }
 

-bool wxDataViewSortedListModel::RowInserted( size_t before )
+bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )

 {
     // you can only append
     bool ret = m_child->RowAppended();
 {
     // 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;
 }
 
     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 );
     bool ret = m_child->RowDeleted( child_row );

-    
+

     // Do nothing here as the change in the
     // child model will be reported back.
     // Do nothing here as the change in the
     // child model will be reported back.

-    
+

     return ret;
 }
 
     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 );
     bool ret = m_child->RowChanged( child_row );

-    
+

     // Do nothing here as the change in the
     // child model will be reported back.
     // Do nothing here as the change in the
     // child model will be reported back.

-    
+

     return ret;
 }
 
     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 );
     bool ret = m_child->ValueChanged( col, child_row );

-    
+

     // Do nothing here as the change in the
     // child model will be reported back.
     // Do nothing here as the change in the
     // child model will be reported back.

-    
+

     return ret;
 }
 
     return ret;
 }
 

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

 {
     // We sort them ourselves.
 
 {
     // We sort them ourselves.
 


@@ -472,45 +686,64 @@ bool wxDataViewSortedListModel::RowsReordered( size_t *new_order )
 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();
 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;
 }
 
     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 mode )

 {
     m_variantType = varianttype;
     m_mode = mode;
 }
 {
     m_variantType = varianttype;
     m_mode = mode;
 }

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

 // 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& title,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           int flags ) 

 {
 {

-    m_cell = cell;
+    m_renderer = renderer;

     m_model_column = model_column;
     m_flags = flags;
     m_title = title;
     m_owner = NULL;
     m_model_column = model_column;
     m_flags = flags;
     m_title = title;
     m_owner = NULL;

-    m_cell->SetOwner( (wxDataViewColumn*) this );
+    m_renderer->SetOwner( (wxDataViewColumn*) this );
+}
+
+wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
+                                           wxDataViewRenderer *renderer,
+                                           unsigned int model_column,
+                                           int WXUNUSED(width),
+                                           int flags ) 
+{
+    m_renderer = renderer;
+    m_model_column = model_column;
+    m_flags = flags;
+    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;
+

     if (GetOwner())
     {
         GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
     if (GetOwner())
     {
         GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );


@@ -527,9 +760,19 @@ wxString wxDataViewColumnBase::GetTitle()
     return m_title;
 }
 
     return m_title;
 }
 

-// --------------------------------------------------------- 
+void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap )
+{
+    m_bitmap = bitmap;
+}
+
+const wxBitmap &wxDataViewColumnBase::GetBitmap()
+{
+    return m_bitmap;
+}
+
+// ---------------------------------------------------------

 // wxDataViewCtrlBase
 // wxDataViewCtrlBase

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

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 


@@ -546,7 +789,7 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
     m_model = model;
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
     m_model = model;

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -555,24 +798,74 @@ wxDataViewListModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
     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 )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode), model_column, width ) );

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );

 }
 
 }
 

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

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );

 }
 
 }
 

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

 {
 {

-    return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width ) );
+}
+
+bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width )
+{
+    return AppendColumn( new wxDataViewColumn( label, 
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );

 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )


@@ -583,12 +876,12 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
     return true;
 }
 
     return true;
 }
 

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

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

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

 {
     return false;
 }
 {
     return false;
 }


@@ -598,9 +891,21 @@ 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_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
 #endif