X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4264606eedb18f626e864020082d8dde8d055eea..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index b5f49859fc..6628437655 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -19,17 +19,18 @@
 
 #include "wx/dataview.h"
 
-#include "wx/spinctrl.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");
+#include "wx/spinctrl.h"
+#include "wx/choice.h"
+#include "wx/imaglist.h"
+
+const char wxDataViewCtrlNameStr[] = "dataviewCtrl";
 
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
@@ -40,7 +41,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 #ifdef __WXDEBUG__
 void wxDataViewItem::Print(const wxString& text) const
 {
-    wxPrintf("item %s: %l\n", text, (long)m_id);
+    wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id));
 }
 #endif
 
@@ -259,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;
 }
 
@@ -310,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) );
@@ -353,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() );
 }
@@ -363,11 +424,27 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
     return wxDataViewItem( m_hash[row] );
 }
 
+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);
 
@@ -377,18 +454,18 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
 void wxDataViewIndexListModel::GetValue( wxVariant &variant,
                            const wxDataViewItem &item, unsigned int col ) const
 {
-    GetValue( variant, GetRow(item), col );
+    GetValueByRow( variant, GetRow(item), col );
 }
 
 bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
                            const wxDataViewItem &item, unsigned int col )
 {
-    return SetValue( variant, GetRow(item), col );
+    return SetValueByRow( variant, GetRow(item), col );
 }
 
 bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
 {
-    return GetAttr( GetRow(item), col, attr );
+    return GetAttrByRow( GetRow(item), col, attr );
 }
 
 wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
@@ -415,6 +492,150 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item,
     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
+{
+    GetValueByRow( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col )
+{
+    return SetValueByRow( variant, GetRow(item), col );
+}
+
+bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+    return GetAttrByRow( 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
 //-----------------------------------------------------------------------------
@@ -441,14 +662,30 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,
                                                 int WXUNUSED(align) )
 {
     m_variantType = varianttype;
-    m_editorCtrl = NULL;
+    m_owner = NULL;
+}
+
+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
 }
 
 const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 {
-    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+    return 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
@@ -458,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 );
@@ -482,22 +720,26 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
-    wxPendingDelete.Append( m_editorCtrl );
+    if (!m_editorCtrl) return;
 
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
-    // m_editorCtrl->PopEventHandler( true );
+    m_editorCtrl->Hide();
+    wxPendingDelete.Append( m_editorCtrl );
 }
 
 bool wxDataViewRendererBase::FinishEditing()
 {
+    if (!m_editorCtrl) return true;
+
     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;
 
@@ -505,8 +747,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() );
@@ -525,6 +765,7 @@ BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
     EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
+    EVT_TEXT_ENTER     (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter)
 END_EVENT_TABLE()
 
 wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
@@ -549,6 +790,12 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
     event.Skip();
 }
 
+void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
+{
+    m_finished = true;
+    m_owner->FinishEditing();
+}
+
 void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )
@@ -559,10 +806,11 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_ESCAPE:
+        {
             m_finished = true;
             m_owner->CancelEditing();
             break;
-
+        }
         default:
             event.Skip();
     }
@@ -583,63 +831,18 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-
-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) )
+void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer,
+                                unsigned int model_column)
 {
     m_renderer = renderer;
     m_model_column = model_column;
-    m_bitmap = bitmap;
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
 }
 
 wxDataViewColumnBase::~wxDataViewColumnBase()
 {
-    if (m_renderer)
-        delete m_renderer;
-}
-
-int wxDataViewColumnBase::GetFlags() const
-{
-    int ret = 0;
-
-    if (IsSortable())
-        ret |= wxDATAVIEW_COL_SORTABLE;
-    if (IsResizeable())
-        ret |= wxDATAVIEW_COL_RESIZABLE;
-    if (IsHidden())
-        ret |= wxDATAVIEW_COL_HIDDEN;
-
-    return ret;
-}
-
-void wxDataViewColumnBase::SetFlags(int flags)
-{
-    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
-    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
-    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
+    delete m_renderer;
 }
 
 // ---------------------------------------------------------
@@ -686,12 +889,51 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
+const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
+{
+    return m_model;
+}
+
+bool wxDataViewCtrlBase::EnableDragSource( const wxDataFormat &WXUNUSED(format) )
+{
+    return false;
+}
+
+bool wxDataViewCtrlBase::EnableDropTarget( const wxDataFormat &WXUNUSED(format) )
+{
+    return false;
+}
+
+void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item )
+{
+    if (!m_model) return;
+
+    if (!item.IsOk()) return;
+
+    wxVector<wxDataViewItem> parentChain;
+
+    // at first we get all the parents of the selected item
+    wxDataViewItem parent = m_model->GetParent(item);
+    while (parent.IsOk())
+    {
+        parentChain.push_back(parent);
+        parent = m_model->GetParent(parent);
+    }
+
+    // then we expand the parents, starting at the root
+    while (!parentChain.empty())
+    {
+         Expand(parentChain.back());
+         parentChain.pop_back();
+    }
+}
+
 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;
@@ -702,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;
@@ -712,9 +954,8 @@ 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;
@@ -725,7 +966,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;
@@ -736,7 +977,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;
@@ -747,7 +988,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;
@@ -758,7 +999,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;
@@ -769,7 +1010,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;
@@ -780,7 +1021,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;
@@ -791,7 +1032,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;
@@ -802,7 +1043,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;
@@ -813,7 +1054,7 @@ 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;
@@ -824,7 +1065,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxString &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 );
     PrependColumn( ret );
     return ret;
@@ -835,7 +1076,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int m
                             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 );
     PrependColumn( ret );
     return ret;
@@ -847,7 +1088,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int mod
 {
 
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -858,7 +1099,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int m
                             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 );
     PrependColumn( ret );
     return ret;
@@ -869,7 +1110,7 @@ wxDataViewCtrlBase::PrependDateColumn( 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 );
     PrependColumn( ret );
     return ret;
@@ -880,7 +1121,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int mod
                             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 );
     PrependColumn( ret );
     return ret;
@@ -891,7 +1132,7 @@ wxDataViewCtrlBase::PrependTextColumn( 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 );
     PrependColumn( ret );
     return ret;
@@ -902,7 +1143,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int m
                             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 );
     PrependColumn( ret );
     return ret;
@@ -913,7 +1154,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int mod
                             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 );
     PrependColumn( ret );
     return ret;
@@ -924,7 +1165,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int m
                             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 );
     PrependColumn( ret );
     return ret;
@@ -935,7 +1176,7 @@ wxDataViewCtrlBase::PrependDateColumn( 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 );
     PrependColumn( ret );
     return ret;
@@ -946,7 +1187,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int mod
                             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 );
     PrependColumn( ret );
     return ret;
@@ -966,34 +1207,47 @@ wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col )
     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)
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEvent )
 
-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)
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent )
 
-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)
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent )
 
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent )
+
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, wxDataViewEvent )
 
 // -------------------------------------
 // wxDataViewSpinRenderer
 // -------------------------------------
 
 wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
-   wxDataViewCustomRenderer( "long", mode, alignment )
+   wxDataViewCustomRenderer(wxT("long"), mode, alignment )
 {
     m_min = min;
     m_max = max;
@@ -1002,8 +1256,21 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell
 wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
 {
     long l = value;
-    return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString,
-               labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l );
+    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|wxTE_PROCESS_ENTER, 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 )
@@ -1017,7 +1284,7 @@ bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVarian
 bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
 {
     wxString str;
-    str.Printf( "%d", (int) m_data );
+    str.Printf(wxT("%d"), (int) m_data );
     RenderText( str, 0, rect, dc, state );
     return true;
 }
@@ -1039,66 +1306,357 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
     return true;
 }
 
-//-----------------------------------------------------------------------------
-// wxDataViewTreeStore
-//-----------------------------------------------------------------------------
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
 
-wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
-        wxDataViewTreeStoreNode *parent,
-        const wxString &text, const wxIcon &icon, wxClientData *data )
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__)
+
+wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) :
+   wxDataViewCustomRenderer(wxT("string"), mode, alignment )
 {
-    m_parent = parent;
-    m_text = text;
-    m_icon = icon;
-    m_data = data;
+    m_choices = choices;
 }
 
-wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode()
+wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
 {
-    if (m_data)
-        delete m_data;
-}
+    wxString s = value;
+    wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+    size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+    wxChoice *c = new wxChoice( parent, wxID_ANY, labelRect.GetTopLeft(), size, m_choices );
+    c->SetStringSelection( value.GetString() );
 
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
+    return c;
+}
 
-wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
-        wxDataViewTreeStoreNode *parent, const wxString &text,
-        const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) :
-    wxDataViewTreeStoreNode( parent, text, icon, data )
+bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
 {
-    m_iconExpanded = expanded;
-    m_children.DeleteContents(true);
+    wxChoice *c = (wxChoice*) editor;
+    wxString s = c->GetStringSelection();
+    value = s;
+    return true;
 }
 
-wxDataViewTreeStoreContainerNode::~wxDataViewTreeStoreContainerNode()
+bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state )
 {
+    RenderText( m_data, 0, rect, dc, state );
+    return true;
 }
 
-//-----------------------------------------------------------------------------
-
-wxDataViewTreeStore::wxDataViewTreeStore()
+wxSize wxDataViewChoiceRenderer::GetSize() const
 {
-    m_root = new wxDataViewTreeStoreContainerNode( NULL, wxEmptyString );
+    return wxSize(80,16);
 }
 
-wxDataViewTreeStore::~wxDataViewTreeStore()
+bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
 {
-    delete m_root;
+    m_data = value.GetString();
+    return true;
 }
 
-wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
-        const wxString &text, const wxIcon &icon, wxClientData *data )
+bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const
 {
-    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
-    if (!parent_node) return wxDataViewItem(0);
+    value = m_data;
+    return true;
+}
 
-    wxDataViewTreeStoreNode *node =
-        new wxDataViewTreeStoreNode( parent_node, text, icon, data );
-    parent_node->GetChildren().Append( node );
+#endif
 
-    // notify control
-    ItemAdded( parent, node->GetItem() );
+//-----------------------------------------------------------------------------
+// wxDataViewListStore
+//-----------------------------------------------------------------------------
+
+wxDataViewListStore::wxDataViewListStore()
+{
+}
+
+wxDataViewListStore::~wxDataViewListStore()
+{
+    wxVector<wxDataViewListStoreLine*>::iterator it;
+    for (it = m_data.begin(); it != m_data.end(); ++it)
+    {
+        wxDataViewListStoreLine* line = *it;
+        delete line;
+    }
+}
+
+void wxDataViewListStore::PrependColumn( const wxString &varianttype )
+{
+    m_cols.Insert( varianttype, 0 );
+}
+
+void wxDataViewListStore::InsertColumn( unsigned int pos, const wxString &varianttype )
+{
+    m_cols.Insert( varianttype, pos );
+}
+
+void wxDataViewListStore::AppendColumn( const wxString &varianttype )
+{
+    m_cols.Add( varianttype );
+}
+
+unsigned int wxDataViewListStore::GetColumnCount() const
+{
+    return m_cols.GetCount();
+}
+
+wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const
+{
+    return m_cols[pos];
+}
+
+void wxDataViewListStore::AppendItem( const wxVector<wxVariant> &values, wxClientData *data )
+{
+    wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
+    line->m_values = values;
+    m_data.push_back( line );
+
+    RowAppended();
+}
+
+void wxDataViewListStore::PrependItem( const wxVector<wxVariant> &values, wxClientData *data )
+{
+    wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
+    line->m_values = values;
+    m_data.insert( m_data.begin(), line );
+
+    RowPrepended();
+}
+
+void wxDataViewListStore::InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data )
+{
+    wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
+    line->m_values = values;
+    m_data.insert( m_data.begin()+row, line );
+
+    RowInserted( row );
+}
+
+void wxDataViewListStore::DeleteItem( unsigned row )
+{
+    wxVector<wxDataViewListStoreLine*>::iterator it = m_data.begin() + row;
+    m_data.erase( it );
+
+    RowDeleted( row );
+}
+
+void wxDataViewListStore::DeleteAllItems()
+{
+    wxVector<wxDataViewListStoreLine*>::iterator it;
+    for (it = m_data.begin(); it != m_data.end(); ++it)
+    {
+        wxDataViewListStoreLine* line = *it;
+        delete line;
+    }
+
+    Reset( 0 );
+}
+
+void wxDataViewListStore::GetValueByRow( wxVariant &value, unsigned int row, unsigned int col ) const
+{
+    wxDataViewListStoreLine *line = m_data[row];
+    value = line->m_values[col];
+}
+
+bool wxDataViewListStore::SetValueByRow( const wxVariant &value, unsigned int row, unsigned int col )
+{
+    wxDataViewListStoreLine *line = m_data[row];
+    line->m_values[col] = value;
+
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewListCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewListCtrl,wxDataViewCtrl)
+
+BEGIN_EVENT_TABLE(wxDataViewListCtrl,wxDataViewCtrl)
+   EVT_SIZE( wxDataViewListCtrl::OnSize )
+END_EVENT_TABLE()
+
+wxDataViewListCtrl::wxDataViewListCtrl()
+{
+}
+
+wxDataViewListCtrl::wxDataViewListCtrl( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos, const wxSize& size, long style,
+           const wxValidator& validator )
+{
+    Create( parent, id, pos, size, style, validator );
+
+    wxDataViewListStore *store = new wxDataViewListStore;
+    AssociateModel( store );
+    store->DecRef();
+}
+
+wxDataViewListCtrl::~wxDataViewListCtrl()
+{
+}
+
+
+bool wxDataViewListCtrl::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 );
+}
+
+bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *column, const wxString &varianttype )
+{
+    GetStore()->AppendColumn( varianttype );
+    return wxDataViewCtrl::AppendColumn( column );
+}
+
+bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *column, const wxString &varianttype )
+{
+    GetStore()->PrependColumn( varianttype );
+    return wxDataViewCtrl::PrependColumn( column );
+}
+
+bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype )
+{
+    GetStore()->InsertColumn( pos, varianttype );
+    return wxDataViewCtrl::InsertColumn( pos, column );
+}
+
+bool wxDataViewListCtrl::PrependColumn( wxDataViewColumn *col )
+{
+    return PrependColumn( col, "string" );
+}
+
+bool wxDataViewListCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col )
+{
+    return InsertColumn( pos, col, "string" );
+}
+
+bool wxDataViewListCtrl::AppendColumn( wxDataViewColumn *col )
+{
+    return AppendColumn( col, "string" );
+}
+
+wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label, 
+          wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    GetStore()->AppendColumn( wxT("string") );
+
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode ),
+        GetStore()->GetColumnCount()-1, width, align, flags );
+
+    wxDataViewCtrl::AppendColumn( ret );
+
+    return ret;
+}
+
+wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label, 
+          wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    GetStore()->AppendColumn( wxT("bool") );
+
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        GetStore()->GetColumnCount()-1, width, align, flags );
+
+    wxDataViewCtrl::AppendColumn( ret );
+
+    return ret;
+}
+
+wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label, 
+          wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    GetStore()->AppendColumn( wxT("long") );
+
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        GetStore()->GetColumnCount()-1, width, align, flags );
+
+    wxDataViewCtrl::AppendColumn( ret );
+
+    return ret;
+}
+
+wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label, 
+          wxDataViewCellMode mode, int width, wxAlignment align, int flags )
+{
+    GetStore()->AppendColumn( wxT("wxDataViewIconText") );
+
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        GetStore()->GetColumnCount()-1, width, align, flags );
+
+    wxDataViewCtrl::AppendColumn( ret );
+
+    return ret;
+}
+
+void wxDataViewListCtrl::OnSize( wxSizeEvent &event )
+{
+    event.Skip( 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 );
 
     return node->GetItem();
 }
@@ -1113,20 +1671,28 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent,
         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))
+wxDataViewTreeStore::InsertItem(const wxDataViewItem& parent,
+                                const wxDataViewItem& previous,
+                                const wxString& text,
+                                const wxIcon& icon,
+                                wxClientData *data)
 {
-    return wxDataViewItem(0);
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *previous_node = FindNode( previous );
+    int pos = parent_node->GetChildren().IndexOf( previous_node );
+    if (pos == wxNOT_FOUND) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *node =
+        new wxDataViewTreeStoreNode( parent_node, text, icon, data );
+    parent_node->GetChildren().Insert( (size_t) pos, node );
+
+    return node->GetItem();
 }
 
 wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent,
@@ -1140,9 +1706,6 @@ wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& pare
         new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
     parent_node->GetChildren().Insert( node );
 
-    // notify control
-    ItemAdded( parent, node->GetItem() );
-
     return node->GetItem();
 }
 
@@ -1160,21 +1723,29 @@ wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent,
         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))
+wxDataViewTreeStore::InsertContainer(const wxDataViewItem& parent,
+                                     const wxDataViewItem& previous,
+                                     const wxString& text,
+                                     const wxIcon& icon,
+                                     const wxIcon& expanded,
+                                     wxClientData * data)
 {
-    return wxDataViewItem(0);
+    wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
+    if (!parent_node) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreNode *previous_node = FindNode( previous );
+    int pos = parent_node->GetChildren().IndexOf( previous_node );
+    if (pos == wxNOT_FOUND) return wxDataViewItem(0);
+
+    wxDataViewTreeStoreContainerNode *node =
+        new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
+    parent_node->GetChildren().Insert( (size_t) pos, node );
+
+    return node->GetItem();
 }
 
 wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
@@ -1207,9 +1778,6 @@ void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxStrin
     if (!node) return;
 
     node->SetText( text );
-
-    // notify control
-    ValueChanged( item, 0 );
 }
 
 wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const
@@ -1226,9 +1794,6 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon
     if (!node) return;
 
     node->SetIcon( icon );
-
-    // notify control
-    ValueChanged( item, 0 );
 }
 
 const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) const
@@ -1245,9 +1810,6 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const
     if (!node) return;
 
     node->SetExpandedIcon( icon );
-
-    // notify control
-    ValueChanged( item, 0 );
 }
 
 const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& item ) const
@@ -1264,9 +1826,6 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData
     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
@@ -1290,9 +1849,6 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& item )
     if (!node) return;
 
     parent_node->GetChildren().DeleteObject( node );
-
-    // notify control
-    ItemDeleted( parent_item, item );
 }
 
 void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
@@ -1300,18 +1856,7 @@ 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()
@@ -1329,7 +1874,15 @@ wxDataViewTreeStore::GetValue(wxVariant &variant,
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return;
 
-    wxDataViewIconText data( node->GetText(), node->GetIcon() );
+    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;
 }
@@ -1441,5 +1994,248 @@ wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const
     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 );
+
+    wxDataViewItem res = GetStore()->AppendItem( parent, text, icon, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+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 );
+
+    wxDataViewItem res = GetStore()->PrependItem( parent, text, icon, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+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 );
+
+    wxDataViewItem res = GetStore()->InsertItem( parent, previous, text, icon, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+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 );
+
+    wxDataViewItem res = GetStore()->PrependContainer( parent, text, icon, expanded, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+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 );
+
+    wxDataViewItem res = GetStore()->AppendContainer( parent, text, icon, expanded, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+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 );
+
+    wxDataViewItem res = GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
+
+    GetStore()->ItemAdded( parent, res );
+
+    return res;
+}
+
+void wxDataViewTreeCtrl::SetItemText( const wxDataViewItem& item, const wxString &text )
+{ 
+    GetStore()->SetItemText(item,text);
+
+    // notify control
+    GetStore()->ValueChanged( item, 0 );
+}
+
+void wxDataViewTreeCtrl::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon )
+{ 
+    GetStore()->SetItemIcon(item,icon);
+
+    // notify control
+    GetStore()->ValueChanged( item, 0 );
+}
+
+void wxDataViewTreeCtrl::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon )
+{ 
+    GetStore()->SetItemExpandedIcon(item,icon);
+
+    // notify control
+    GetStore()->ValueChanged( item, 0 );
+}
+
+void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item )
+{ 
+    wxDataViewItem parent_item = GetStore()->GetParent( item );
+
+    GetStore()->DeleteItem(item);
+
+    // notify control
+    GetStore()->ItemDeleted( parent_item, item );
+}
+
+void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item )
+{ 
+    wxDataViewTreeStoreContainerNode *node = GetStore()->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() );
+    }
+
+    GetStore()->DeleteChildren( item );
+
+    // notify control
+    GetStore()->ItemsDeleted( item, array );
+}
+
+void  wxDataViewTreeCtrl::DeleteAllItems()
+{ 
+    GetStore()->DeleteAllItems();
+
+    GetStore()->Cleared();
+}
+
+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)
+    // automatically resize our only column to take the entire control width
+    if ( GetColumnCount() )
+    {
+        wxSize size = GetClientSize();
+        GetColumn(0)->SetWidth(size.x);
+    }
+#endif
+    event.Skip( true );
+}
+
 #endif // wxUSE_DATAVIEWCTRL