X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d86c187031547bd2f0604adddef273deedea7907..d50c083157f7280e9244595a7c0de72bbead2e7d:/src/common/datavcmn.cpp?ds=inline

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 80d59e25cd..5edb1147bd 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -18,9 +18,16 @@
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
+#include "wx/spinctrl.h"
+
+#include "wx/weakref.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/settings.h"
     #include "wx/log.h"
+    #include "wx/icon.h"
+    #include "wx/crt.h"
 #endif
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
@@ -31,13 +38,53 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
     return (left.GetID() == right.GetID() );
 }
 
+#ifdef __WXDEBUG__
+void wxDataViewItem::Print(const wxString& text) const
+{
+    wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id);
+}
+#endif
 
 // ---------------------------------------------------------
-// wxDataViewModel
+// wxDataViewModelNotifier
 // ---------------------------------------------------------
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewModelNotifiers);
+WX_DEFINE_LIST(wxDataViewModelNotifiers)
+
+bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
+{
+    size_t count = items.GetCount();
+    size_t i;
+    for (i = 0; i < count; i++)
+        if (!ItemAdded( parent, items[i] )) return false;
+
+    return true;
+}
+
+bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items )
+{
+    size_t count = items.GetCount();
+    size_t i;
+    for (i = 0; i < count; i++)
+        if (!ItemDeleted( parent, items[i] )) return false;
+
+    return true;
+}
+
+bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items )
+{
+    size_t count = items.GetCount();
+    size_t i;
+    for (i = 0; i < count; i++)
+        if (!ItemChanged( items[i] )) return false;
+
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewModel
+// ---------------------------------------------------------
 
 wxDataViewModel::wxDataViewModel()
 {
@@ -89,6 +136,51 @@ bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )
     return ret;
 }
 
+bool wxDataViewModel::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
+{
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemsAdded( parent, items ))
+            ret = false;
+    }
+
+    return ret;
+}
+
+bool wxDataViewModel::ItemsDeleted( const wxDataViewItem &parent, const wxDataViewItemArray &items )
+{
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemsDeleted( parent, items ))
+            ret = false;
+    }
+
+    return ret;
+}
+
+bool wxDataViewModel::ItemsChanged( const wxDataViewItemArray &items )
+{
+    bool ret = true;
+
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)
+    {
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemsChanged( items ))
+            ret = false;
+    }
+
+    return ret;
+}
+
 bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col )
 {
     bool ret = true;
@@ -168,50 +260,62 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
         wxString str1 = value1.GetString();
         wxString str2 = value2.GetString();
         int res = str1.Cmp( str2 );
-        if (res) return res;
-    } else
-    if (value1.GetType() == wxT("long"))
+        if (res)
+            return res;
+    }
+    else if (value1.GetType() == wxT("long"))
     {
         long l1 = value1.GetLong();
         long l2 = value2.GetLong();
         long res = l1-l2;
-        if (res) return res;
-    } else
-    if (value1.GetType() == wxT("double"))
+        if (res)
+            return res;
+    }
+    else if (value1.GetType() == wxT("double"))
     {
         double d1 = value1.GetDouble();
         double d2 = value2.GetDouble();
-        if (d1 < d2) return 1;
-        if (d1 > d2) return -1;
-    } else
-    if (value1.GetType() == wxT("datetime"))
+        if (d1 < d2)
+            return 1;
+        if (d1 > d2)
+            return -1;
+    }
+    else if (value1.GetType() == wxT("datetime"))
     {
         wxDateTime dt1 = value1.GetDateTime();
         wxDateTime dt2 = value2.GetDateTime();
-        if (dt1.IsEarlierThan(dt2)) return 1;
-        if (dt2.IsEarlierThan(dt1)) return -11;
+        if (dt1.IsEarlierThan(dt2))
+            return 1;
+        if (dt2.IsEarlierThan(dt1))
+            return -11;
     }
 
     // items must be different
-    unsigned long litem1 = (unsigned long) item1.GetID();
-    unsigned long litem2 = (unsigned long) item2.GetID();
-    
-    if (!ascending)
-        return litem2-litem2;
+    wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
+              id2 = wxPtrToUInt(item2.GetID());
 
-    return litem1-litem2;
+    return ascending ? id1 - id2 : id2 - id1;
 }
 
 // ---------------------------------------------------------
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 
+static int my_sort( int *v1, int *v2 )
+{
+   return *v2-*v1;
+}
+
+
 wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
 {
+    // IDs are ordered until an item gets deleted or inserted
+    m_ordered = true;
+
     // build initial index
     unsigned int i;
     for (i = 1; i < initial_size+1; i++)
-        m_hash.Add( (void*) i );
+            m_hash.Add( wxUIntToPtr(i) );
     m_lastIndex = initial_size + 1;
 }
 
@@ -219,37 +323,79 @@ wxDataViewIndexListModel::~wxDataViewIndexListModel()
 {
 }
 
+void wxDataViewIndexListModel::Reset( unsigned int new_size )
+{
+    m_hash.Clear();
+
+    // IDs are ordered until an item gets deleted or inserted
+    m_ordered = true;
+
+    // build initial index
+    unsigned int i;
+    for (i = 1; i < new_size+1; i++)
+            m_hash.Add( wxUIntToPtr(i) );
+    m_lastIndex = new_size + 1;
+
+    wxDataViewModel::Cleared();
+}
+
 void wxDataViewIndexListModel::RowPrepended()
 {
+    m_ordered = false;
+
     unsigned int id = m_lastIndex++;
-    m_hash.Insert( (void*) id, 0 );
-    wxDataViewItem item( (void*) id );
+    m_hash.Insert( wxUIntToPtr(id), 0 );
+    wxDataViewItem item( wxUIntToPtr(id) );
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
+    m_ordered = false;
+
     unsigned int id = m_lastIndex++;
-    m_hash.Insert( (void*) id, before );
-    wxDataViewItem item( (void*) id );
+    m_hash.Insert( wxUIntToPtr(id), before );
+    wxDataViewItem item( wxUIntToPtr(id) );
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowAppended()
 {
     unsigned int id = m_lastIndex++;
-    m_hash.Add( (void*) id );
-    wxDataViewItem item( (void*) id );
+    m_hash.Add( wxUIntToPtr(id) );
+    wxDataViewItem item( wxUIntToPtr(id) );
     ItemAdded( wxDataViewItem(0), item );
 }
 
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
+    m_ordered = false;
+
     wxDataViewItem item( m_hash[row] );
     wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
     m_hash.RemoveAt( row );
 }
 
+void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
+{
+    wxArrayInt sorted = rows;
+    sorted.Sort( my_sort );
+
+    m_ordered = false;
+
+    wxDataViewItemArray array;
+    unsigned int i;
+    for (i = 0; i < rows.GetCount(); i++)
+    {
+            wxDataViewItem item( m_hash[rows[i]] );
+            array.Add( item );
+    }
+    wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+
+    for (i = 0; i < sorted.GetCount(); i++)
+           m_hash.RemoveAt( sorted[i] );
+}
+
 void wxDataViewIndexListModel::RowChanged( unsigned int row )
 {
     wxDataViewModel::ItemChanged( GetItem(row) );
@@ -262,6 +408,12 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c
 
 unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
 {
+    if (m_ordered)
+    {
+            unsigned int pos = wxPtrToUInt( item.GetID() );
+            return pos-1;
+    }
+
     // assert for not found
     return (unsigned int) m_hash.Index( item.GetID() );
 }
@@ -272,12 +424,30 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
     return wxDataViewItem( m_hash[row] );
 }
 
-int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                                       unsigned int column, bool ascending )
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{
+    return !m_ordered;
+}
+
+int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
+                                      const wxDataViewItem& item2,
+                                      unsigned int WXUNUSED(column),
+                                      bool ascending)
 {
+    if (m_ordered)
+    {
+        unsigned int pos1 = wxPtrToUInt(item1.GetID());
+        unsigned int pos2 = wxPtrToUInt(item2.GetID());
+
+        if (ascending)
+            return pos1 - pos2;
+        else
+            return pos2 - pos1;
+    }
+
     if (ascending)
         return GetRow(item1) - GetRow(item2);
-    
+
     return GetRow(item2) - GetRow(item1);
 }
 
@@ -293,6 +463,11 @@ bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
     return SetValue( variant, GetRow(item), col );
 }
 
+bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+    return GetAttr( GetRow(item), col, attr );
+}
+
 wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
 {
     return wxDataViewItem(0);
@@ -313,17 +488,161 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item,
         return 0;
 
     children = m_hash;
-    
+
     return m_hash.GetCount();
 }
 
+// ---------------------------------------------------------
+// wxDataViewVirtualListModel
+// ---------------------------------------------------------
+
+#ifndef __WXMAC__
+
+wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size )
+{
+    m_lastIndex = initial_size-1;
+}
+
+wxDataViewVirtualListModel::~wxDataViewVirtualListModel()
+{
+}
+
+void wxDataViewVirtualListModel::Reset( unsigned int new_size )
+{
+    m_lastIndex = new_size-1;
+
+    wxDataViewModel::Cleared();
+}
+
+void wxDataViewVirtualListModel::RowPrepended()
+{
+    m_lastIndex++;
+    wxDataViewItem item( NULL );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowInserted( unsigned int before )
+{
+    m_lastIndex++;
+    wxDataViewItem item( wxUIntToPtr(before) );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowAppended()
+{
+    m_lastIndex++;
+    wxDataViewItem item( wxUIntToPtr(m_lastIndex) );
+    ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
+{
+    wxDataViewItem item( wxUIntToPtr(row) );
+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+    m_lastIndex++;
+}
+
+void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows )
+{
+    wxArrayInt sorted = rows;
+    sorted.Sort( my_sort );
+
+    wxDataViewItemArray array;
+    unsigned int i;
+    for (i = 0; i < sorted.GetCount(); i++)
+    {
+            wxDataViewItem item( wxUIntToPtr(sorted[i]) );
+            array.Add( item );
+    }
+    wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+
+    m_lastIndex -= rows.GetCount();
+}
+
+void wxDataViewVirtualListModel::RowChanged( unsigned int row )
+{
+    wxDataViewModel::ItemChanged( GetItem(row) );
+}
+
+void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col )
+{
+    wxDataViewModel::ValueChanged( GetItem(row), col );
+}
+
+unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const
+{
+    return wxPtrToUInt( item.GetID() );
+}
+
+wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const
+{
+    return wxDataViewItem( wxUIntToPtr(row)  );
+}
+
+bool wxDataViewVirtualListModel::HasDefaultCompare() const
+{
+    return true;
+}
+
+int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1,
+                                      const wxDataViewItem& item2,
+                                      unsigned int WXUNUSED(column),
+                                      bool ascending)
+{
+    unsigned int pos1 = wxPtrToUInt(item1.GetID());
+    unsigned int pos2 = wxPtrToUInt(item2.GetID());
+
+    if (ascending)
+       return pos1 - pos2;
+    else
+       return pos2 - pos1;
+}
+
+void wxDataViewVirtualListModel::GetValue( wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col ) const
+{
+    GetValue( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col )
+{
+    return SetValue( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+    return GetAttr( GetRow(item), col, attr );
+}
+
+wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+{
+    return wxDataViewItem(0);
+}
+
+bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const
+{
+    // only the invisible root item has children
+    if (!item.IsOk())
+        return true;
+
+    return false;
+}
+
+unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const
+{
+    return 0;  // should we report an error ?
+}
+
+#endif  // __WXMAC__
+
 //-----------------------------------------------------------------------------
 // wxDataViewIconText
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
 
-IMPLEMENT_VARIANT_OBJECT(wxDataViewIconText)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
 
 bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
 {
@@ -343,7 +662,11 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_editorCtrl = NULL;
+    m_owner = NULL;
+}
+
+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
 }
 
 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
@@ -351,6 +674,18 @@ const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
     return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
 }
 
+class wxKillRef: public wxWindowRef
+{
+public:
+   wxKillRef( wxWindow *win ) : wxWindowRef( win ) { }
+   virtual void OnObjectDestroy()
+   {
+      get()->PopEventHandler( true );
+      m_pobj = NULL;
+      delete this;
+   }
+};
+
 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later
@@ -360,6 +695,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
 
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
+    (void) new wxKillRef( m_editorCtrl.get() );
 
     wxDataViewEditorCtrlEvtHandler *handler =
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
@@ -384,11 +720,10 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
-    wxPendingDelete.Append( m_editorCtrl );
-
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
-    // m_editorCtrl->PopEventHandler( true );
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
 }
 
 bool wxDataViewRendererBase::FinishEditing()
@@ -396,10 +731,11 @@ bool wxDataViewRendererBase::FinishEditing()
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
-    wxPendingDelete.Append( m_editorCtrl );
-
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
+
     if (!Validate(value))
         return false;
 
@@ -407,8 +743,6 @@ bool wxDataViewRendererBase::FinishEditing()
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
 
-    // m_editorCtrl->PopEventHandler( true );
-    
     // Now we should send Editing Done event
     wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
     event.SetDataViewColumn( GetOwner() );
@@ -542,6 +876,7 @@ void wxDataViewColumnBase::SetFlags(int flags)
     SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
     SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
     SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
+    SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0);
 }
 
 // ---------------------------------------------------------
@@ -588,12 +923,17 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
+const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
+{
+    return m_model;
+}
+
 wxDataViewColumn *
 wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -604,7 +944,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -614,9 +954,9 @@ wxDataViewColumn *
 wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    
+
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -627,7 +967,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -638,7 +978,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -649,7 +989,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -660,7 +1000,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        new wxDataViewTextRenderer( wxT("string"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -671,7 +1011,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -682,7 +1022,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -693,7 +1033,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -704,7 +1044,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -715,44 +1055,820 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
 }
 
-bool
-wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
-    col->SetOwner( (wxDataViewCtrl*) this );
-    return true;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
 }
 
-// ---------------------------------------------------------
-// wxDataViewEvent
-// ---------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED)
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
 
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
 
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_ADDED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_DELETED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ITEM_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
 
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+wxDataViewColumn *
+wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        model_column, width, align, flags );
+    PrependColumn( ret );
+    return ret;
+}
+
+bool
+wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+
+bool
+wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+
+bool 
+wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col )
+{
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;
+}
+
+// ---------------------------------------------------------
+// wxDataViewEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED)
+
+
+// -------------------------------------
+// wxDataViewSpinRenderer
+// -------------------------------------
+
+wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
+   wxDataViewCustomRenderer(wxT("long"), mode, alignment )
+{
+    m_min = min;
+    m_max = max;
+}
+
+wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
+{
+    long l = value;
+    wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+    size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+    wxString str;
+    str.Printf( wxT("%d"), (int) l );
+    wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
+               labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l );
+#ifdef __WXMAC__
+    size = sc->GetSize();
+    wxPoint pt = sc->GetPosition();
+    sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
+#endif
+
+    return sc;
+}
+
+bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
+{
+    wxSpinCtrl *sc = (wxSpinCtrl*) editor;
+    long l = sc->GetValue();
+    value = l;
+    return true;
+}
+
+bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
+{
+    wxString str;
+    str.Printf(wxT("%d"), (int) m_data );
+    RenderText( str, 0, rect, dc, state );
+    return true;
+}
+
+wxSize wxDataViewSpinRenderer::GetSize() const
+{
+    return wxSize(80,16);
+}
+
+bool wxDataViewSpinRenderer::SetValue( const wxVariant &value )
+{
+    m_data = value.GetLong();
+    return true;
+}
+
+bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
+{
+    value = m_data;
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewTreeStore
+//-----------------------------------------------------------------------------
+
+wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
+        wxDataViewTreeStoreNode *parent,
+        const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+    m_parent = parent;
+    m_text = text;
+    m_icon = icon;
+    m_data = data;
+}
+
+wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode()
+{
+    if (m_data)
+        delete m_data;
+}
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
+
+wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
+        wxDataViewTreeStoreNode *parent, const wxString &text,
+        const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) :
+    wxDataViewTreeStoreNode( parent, text, icon, data )
+{
+    m_iconExpanded = expanded;
+    m_isExpanded = false;
+    m_children.DeleteContents(true);
+}
+
+wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+
+wxDataViewTreeStore::wxDataViewTreeStore()
+{
+    m_root = new wxDataViewTreeStoreContainerNode( NULL, wxEmptyString );
+}
+
+wxDataViewTreeStore::~wxDataViewTreeStore()
+{
+    delete m_root;
+}
+
+wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
+        const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *node =
+        new wxDataViewTreeStoreNode( parent_node, text, icon, data );
+    parent_node->GetChildren().Append( node );
+
+    // notify control
+    ItemAdded( parent, node->GetItem() );
+
+    return node->GetItem();
+}
+
+wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent,
+        const wxString &text, const wxIcon &icon, wxClientData *data )
+{
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *node =
+        new wxDataViewTreeStoreNode( parent_node, text, icon, data );
+    parent_node->GetChildren().Insert( node );
+
+    // notify control
+    ItemAdded( parent, node->GetItem() );
+
+    return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::InsertItem(const wxDataViewItem& WXUNUSED(parent),
+                                const wxDataViewItem& WXUNUSED(previous),
+                                const wxString& WXUNUSED(text),
+                                const wxIcon& WXUNUSED(icon),
+                                wxClientData * WXUNUSED(data))
+{
+    return wxDataViewItem(0);
+}
+
+wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent,
+        const wxString &text, const wxIcon &icon, const wxIcon &expanded,
+        wxClientData *data )
+{
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreContainerNode *node =
+        new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
+    parent_node->GetChildren().Insert( node );
+
+    // notify control
+    ItemAdded( parent, node->GetItem() );
+
+    return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent,
+                                     const wxString &text,
+                                     const wxIcon& icon,
+                                     const wxIcon& expanded,
+                                     wxClientData * data)
+{
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreContainerNode *node =
+        new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
+    parent_node->GetChildren().Append( node );
+
+    // notify control
+    ItemAdded( parent, node->GetItem() );
+
+    return node->GetItem();
+}
+
+wxDataViewItem
+wxDataViewTreeStore::InsertContainer(const wxDataViewItem& WXUNUSED(parent),
+                                     const wxDataViewItem& WXUNUSED(previous),
+                                     const wxString& WXUNUSED(text),
+                                     const wxIcon& WXUNUSED(icon),
+                                     const wxIcon& WXUNUSED(expanded),
+                                     wxClientData * WXUNUSED(data))
+{
+    return wxDataViewItem(0);
+}
+
+wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
+{
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
+    if (node)
+        return node->GetData();
+
+    return wxDataViewItem(0);
+}
+
+int wxDataViewTreeStore::GetChildCount( const wxDataViewItem& parent ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( parent );
+    if (!node) return -1;
+
+    if (!node->IsContainer())
+        return 0;
+
+    wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node;
+    return (int) container_node->GetChildren().GetCount();
+}
+
+void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text )
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return;
+
+    node->SetText( text );
+
+    // notify control
+    ValueChanged( item, 0 );
+}
+
+wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return wxEmptyString;
+
+    return node->GetText();
+}
+
+void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon )
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return;
+
+    node->SetIcon( icon );
+
+    // notify control
+    ValueChanged( item, 0 );
+}
+
+const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return wxNullIcon;
+
+    return node->GetIcon();
+}
+
+void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon )
+{
+    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+    if (!node) return;
+
+    node->SetExpandedIcon( icon );
+
+    // notify control
+    ValueChanged( item, 0 );
+}
+
+const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const
+{
+    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+    if (!node) return wxNullIcon;
+
+    return node->GetExpandedIcon();
+}
+
+void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData *data )
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return;
+
+    node->SetData( data );
+
+    // notify control? only sensible when sorting on client data
+    // ValueChanged( item, 0 );
+}
+
+wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return NULL;
+
+    return node->GetData();
+}
+
+void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item )
+{
+    if (!item.IsOk()) return;
+
+    wxDataViewItem parent_item = GetParent( item );
+
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item );
+    if (!parent_node) return;
+
+    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+    if (!node) return;
+
+    parent_node->GetChildren().DeleteObject( node );
+
+    // notify control
+    ItemDeleted( parent_item, item );
+}
+
+void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
+{
+    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+    if (!node) return;
+
+    wxDataViewItemArray array;
+    wxDataViewTreeStoreNodeList::iterator iter;
+    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+    {
+        wxDataViewTreeStoreNode* child = *iter;
+        array.Add( child->GetItem() );
+    }
+
+    node->GetChildren().clear();
+
+    // notify control
+    ItemsDeleted( item, array );
+}
+
+void wxDataViewTreeStore::DeleteAllItems()
+{
+    // TODO
+}
+
+void
+wxDataViewTreeStore::GetValue(wxVariant &variant,
+                              const wxDataViewItem &item,
+                              unsigned int WXUNUSED(col)) const
+{
+    // if (col != 0) return;
+
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return;
+
+    wxIcon icon( node->GetIcon());
+    if (node->IsContainer())
+    {
+        wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node;
+        if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
+           icon = container->GetExpandedIcon();
+    }
+
+    wxDataViewIconText data( node->GetText(), icon );
+
+    variant << data;
+}
+
+bool
+wxDataViewTreeStore::SetValue(const wxVariant& variant,
+                              const wxDataViewItem& item,
+                              unsigned int WXUNUSED(col))
+{
+    // if (col != 0) return false;
+
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return false;
+
+    wxDataViewIconText data;
+
+    data << variant;
+
+    node->SetText( data.GetText() );
+    node->SetIcon( data.GetIcon() );
+
+    return true;
+}
+
+wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *parent = node->GetParent();
+    if (!parent) return wxDataViewItem(0);
+
+    if (parent == m_root)
+        return wxDataViewItem(0);
+
+    return parent->GetItem();
+}
+
+bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const
+{
+    wxDataViewTreeStoreNode *node = FindNode( item );
+    if (!node) return false;
+
+    return node->IsContainer();
+}
+
+unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
+{
+    wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
+    if (!node) return 0;
+
+    wxDataViewTreeStoreNodeList::iterator iter;
+    for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
+    {
+        wxDataViewTreeStoreNode* child = *iter;
+        children.Add( child->GetItem() );
+    }
+
+    return node->GetChildren().GetCount();
+}
+
+int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                         unsigned int WXUNUSED(column), bool WXUNUSED(ascending) )
+{
+    wxDataViewTreeStoreNode *node1 = FindNode( item1 );
+    wxDataViewTreeStoreNode *node2 = FindNode( item2 );
+
+    if (!node1 || !node2)
+        return 0;
+
+    wxDataViewTreeStoreContainerNode* parent1 =
+        (wxDataViewTreeStoreContainerNode*) node1->GetParent();
+    wxDataViewTreeStoreContainerNode* parent2 =
+        (wxDataViewTreeStoreContainerNode*) node2->GetParent();
+
+    if (parent1 != parent2)
+    {
+        wxLogError( wxT("Comparing items with different parent.") );
+        return 0;
+    }
+
+    if (node1->IsContainer() && !!node2->IsContainer())
+        return 1;
+
+    if (node2->IsContainer() && !!node1->IsContainer())
+        return -1;
+
+    return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 );
+}
+
+wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const
+{
+    if (!item.IsOk())
+        return m_root;
+
+    return (wxDataViewTreeStoreNode*) item.GetID();
+}
+
+wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const wxDataViewItem &item ) const
+{
+    if (!item.IsOk())
+        return (wxDataViewTreeStoreContainerNode*) m_root;
+
+    wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID();
+
+    if (!node->IsContainer())
+        return NULL;
+
+    return (wxDataViewTreeStoreContainerNode*) node;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewTreeCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl)
+
+BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
+   EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded)
+   EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed)
+   EVT_SIZE( wxDataViewTreeCtrl::OnSize )
+END_EVENT_TABLE()
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl()
+{
+    m_imageList = NULL;
+}
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+    m_imageList = NULL;
+    Create( parent, id, pos, size, style, validator );
+
+    wxDataViewTreeStore *store = new wxDataViewTreeStore;
+    AssociateModel( store );
+    store->DecRef();
+
+    AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
+}
+
+wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
+{
+    if (m_imageList)
+        delete m_imageList;
+}
+
+bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+    return wxDataViewCtrl::Create( parent, id, pos, size, style, validator );
+}
+
+void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
+{
+    if (m_imageList)
+        delete m_imageList;
+
+    m_imageList = imagelist;
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent,
+        const wxString &text, int iconIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    return GetStore()->AppendItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent,
+        const wxString &text, int iconIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    return GetStore()->PrependItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
+        const wxString &text, int iconIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    return GetStore()->InsertItem( parent, previous, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent,
+        const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    wxIcon expanded = wxNullIcon;
+    if (m_imageList && (expandedIndex != -1))
+        expanded = m_imageList->GetIcon( expandedIndex );
+
+    return GetStore()->PrependContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent,
+        const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    wxIcon expanded = wxNullIcon;
+    if (m_imageList && (expandedIndex != -1))
+        expanded = m_imageList->GetIcon( expandedIndex );
+
+    return GetStore()->AppendContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
+        const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+    wxIcon icon = wxNullIcon;
+    if (m_imageList && (iconIndex != -1))
+        icon = m_imageList->GetIcon( iconIndex );
+
+    wxIcon expanded = wxNullIcon;
+    if (m_imageList && (expandedIndex != -1))
+        expanded = m_imageList->GetIcon( expandedIndex );
+
+    return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
+}
+
+void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
+{
+    if (m_imageList) return;
+
+    wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+    if (!container) return;
+
+    container->SetExpanded( true );
+    GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
+{
+    if (m_imageList) return;
+
+    wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+    if (!container) return;
+
+    container->SetExpanded( false );
+    GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
+{
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+    wxSize size = GetClientSize();
+    wxDataViewColumn *col = GetColumn( 0 );
+    if (col)
+       col->SetWidth( size.x );
 #endif
+    event.Skip( true );
+}
+
+#endif // wxUSE_DATAVIEWCTRL