X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52e750fc75020aa412fc85623d2b3cf91f9b0b33..1fee6e257780f17b4d53b48aa0e7d2ac69664595:/src/common/datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index b9e16750ed..7303a0b119 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -20,12 +20,13 @@
 #include "wx/dataview.h"
 
 #include "wx/spinctrl.h"
-#include "wx/dc.h"
-#include "wx/settings.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");
@@ -36,13 +37,19 @@ 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
 
 // ---------------------------------------------------------
 // wxDataViewModelNotifier
 // ---------------------------------------------------------
 
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewModelNotifiers);
+WX_DEFINE_LIST(wxDataViewModelNotifiers)
 
 bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
 {
@@ -50,7 +57,7 @@ bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wx
     size_t i;
     for (i = 0; i < count; i++)
         if (!ItemAdded( parent, items[i] )) return false;
-        
+
     return true;
 }
 
@@ -60,7 +67,7 @@ bool wxDataViewModelNotifier::ItemsDeleted( const wxDataViewItem &parent, const
     size_t i;
     for (i = 0; i < count; i++)
         if (!ItemDeleted( parent, items[i] )) return false;
-    
+
     return true;
 }
 
@@ -70,7 +77,7 @@ bool wxDataViewModelNotifier::ItemsChanged( const wxDataViewItemArray &items )
     size_t i;
     for (i = 0; i < count; i++)
         if (!ItemChanged( items[i] )) return false;
-        
+
     return true;
 }
 
@@ -292,46 +299,168 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
 
 wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
 {
-    // build initial index
-    unsigned int i;
-    for (i = 1; i < initial_size+1; i++)
-        m_hash.Add( (void*) i );
-    m_lastIndex = initial_size + 1;
+#ifndef __WXMAC__
+    m_useHash = false;
+#else
+    m_useHash = true;
+#endif
+
+    if (m_useHash)
+    {
+        // 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_lastIndex = initial_size + 1;
+    }
+    else
+    {
+        m_lastIndex = initial_size-1;
+    }
 }
 
 wxDataViewIndexListModel::~wxDataViewIndexListModel()
 {
 }
 
+void wxDataViewIndexListModel::Reset( unsigned int new_size )
+{
+    if (m_useHash)
+    {
+        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( (void*) i );
+        m_lastIndex = new_size + 1;
+    }
+    else
+    {
+        m_lastIndex = new_size-1;
+    }
+    
+    wxDataViewModel::Cleared();
+}
+
 void wxDataViewIndexListModel::RowPrepended()
 {
-    unsigned int id = m_lastIndex++;
-    m_hash.Insert( (void*) id, 0 );
-    wxDataViewItem item( (void*) id );
-    ItemAdded( wxDataViewItem(0), item );
+    if (m_useHash)
+    {
+        m_ordered = false;
+    
+        unsigned int id = m_lastIndex++;
+        m_hash.Insert( (void*) id, 0 );
+        wxDataViewItem item( (void*) id );
+        ItemAdded( wxDataViewItem(0), item );
+    }
+    else
+    {
+        m_lastIndex++;
+        wxDataViewItem item( (void*) 0 );
+        ItemAdded( wxDataViewItem(0), item );
+    }
 }
 
 void wxDataViewIndexListModel::RowInserted( unsigned int before )
 {
-    unsigned int id = m_lastIndex++;
-    m_hash.Insert( (void*) id, before );
-    wxDataViewItem item( (void*) id );
-    ItemAdded( wxDataViewItem(0), item );
+    if (m_useHash)
+    {
+        m_ordered = false;
+    
+        unsigned int id = m_lastIndex++;
+        m_hash.Insert( (void*) id, before );
+        wxDataViewItem item( (void*) id );
+        ItemAdded( wxDataViewItem(0), item );
+    }
+    else
+    {
+        m_lastIndex++;
+        wxDataViewItem item( (void*) before );
+        ItemAdded( wxDataViewItem(0), item );
+    }
 }
 
 void wxDataViewIndexListModel::RowAppended()
 {
-    unsigned int id = m_lastIndex++;
-    m_hash.Add( (void*) id );
-    wxDataViewItem item( (void*) id );
-    ItemAdded( wxDataViewItem(0), item );
+    if (m_useHash)
+    {
+        unsigned int id = m_lastIndex++;
+        m_hash.Add( (void*) id );
+        wxDataViewItem item( (void*) id );
+        ItemAdded( wxDataViewItem(0), item );
+    }
+    else
+    {
+        m_lastIndex++;
+        wxDataViewItem item( (void*) m_lastIndex );
+        ItemAdded( wxDataViewItem(0), item );
+    }
 }
 
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
-    wxDataViewItem item( m_hash[row] );
-    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
-    m_hash.RemoveAt( row );
+    if (m_useHash)
+    {
+        m_ordered = false;
+        
+        wxDataViewItem item( m_hash[row] );
+        wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+        m_hash.RemoveAt( row );
+    }
+    else
+    {
+        wxDataViewItem item( (void*) row );
+        wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+        m_lastIndex++;
+    }
+}
+
+static int my_sort( int *v1, int *v2 )
+{
+   return *v2-*v1;
+}
+
+void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
+{
+    wxArrayInt sorted = rows;
+    sorted.Sort( my_sort );
+    
+    if (m_useHash)
+    {
+        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] );
+    }
+    else
+    {
+        wxDataViewItemArray array;
+        unsigned int i;
+        for (i = 0; i < sorted.GetCount(); i++)
+        {
+            wxDataViewItem item( (void*) sorted[i] );
+            array.Add( item );
+        }
+        wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+    
+        m_lastIndex -= rows.GetCount();
+    }
 }
 
 void wxDataViewIndexListModel::RowChanged( unsigned int row )
@@ -346,14 +475,39 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c
 
 unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
 {
-    // assert for not found
-    return (unsigned int) m_hash.Index( item.GetID() );
+    if (m_useHash)
+    {
+        if (m_ordered)
+        {
+            unsigned int pos = wxPtrToUInt( item.GetID() );
+            return pos-1;
+        }
+    
+        // assert for not found
+        return (unsigned int) m_hash.Index( item.GetID() );
+    }
+    else
+    {
+        return wxPtrToUInt( item.GetID() );
+    }
 }
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 {
-    wxASSERT( row < m_hash.GetCount() );
-    return wxDataViewItem( m_hash[row] );
+    if (m_useHash)
+    {
+        wxASSERT( row < m_hash.GetCount() );
+        return wxDataViewItem( m_hash[row] );
+    }
+    else
+    {
+        return wxDataViewItem( (void*) row  );
+    }
+}
+
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{ 
+    return !m_ordered;
 }
 
 int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
@@ -361,6 +515,17 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
                                       unsigned int WXUNUSED(column),
                                       bool ascending)
 {
+    if (m_ordered || !m_useHash)
+    {
+        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);
 
@@ -379,6 +544,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);
@@ -395,11 +565,14 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
 
 unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
 {
+    if (!m_useHash)
+        return 0;  // error
+        
     if (item.IsOk())
         return 0;
 
     children = m_hash;
-
+    
     return m_hash.GetCount();
 }
 
@@ -628,6 +801,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);
 }
 
 // ---------------------------------------------------------
@@ -674,6 +848,11 @@ 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 )
@@ -971,9 +1150,12 @@ 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)
 
 
 // -------------------------------------
@@ -981,46 +1163,59 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
 // -------------------------------------
 
 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;
 }
-    
+
 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\n"), (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( "%d", (int) m_data );
+    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;
@@ -1031,8 +1226,8 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
 // wxDataViewTreeStore
 //-----------------------------------------------------------------------------
 
-wxDataViewTreeStoreNode::wxDataViewTreeStoreNode( 
-        wxDataViewTreeStoreNode *parent, 
+wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
+        wxDataViewTreeStoreNode *parent,
         const wxString &text, const wxIcon &icon, wxClientData *data )
 {
     m_parent = parent;
@@ -1046,16 +1241,17 @@ wxDataViewTreeStoreNode::~wxDataViewTreeStoreNode()
     if (m_data)
         delete m_data;
 }
-    
+
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewTreeStoreNodeList);
+WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
 
-wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode( 
-        wxDataViewTreeStoreNode *parent, const wxString &text, 
+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);
 }
 
@@ -1075,19 +1271,19 @@ wxDataViewTreeStore::~wxDataViewTreeStore()
     delete m_root;
 }
 
-wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent, 
+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 = 
+
+    wxDataViewTreeStoreNode *node =
         new wxDataViewTreeStoreNode( parent_node, text, icon, data );
     parent_node->GetChildren().Append( node );
-    
+
     // notify control
     ItemAdded( parent, node->GetItem() );
-    
+
     return node->GetItem();
 }
 
@@ -1096,60 +1292,71 @@ wxDataViewItem wxDataViewTreeStore::PrependItem( const wxDataViewItem& parent,
 {
     wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
     if (!parent_node) return wxDataViewItem(0);
-    
-    wxDataViewTreeStoreNode *node = 
+
+    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& parent, const wxDataViewItem& previous,
-        const wxString &text, const wxIcon &icon, wxClientData *data )
+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, 
+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 = 
+
+    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 )
+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 = 
+
+    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& parent, const wxDataViewItem& previous,
-        const wxString &text, const wxIcon &icon, const wxIcon &expanded, 
-        wxClientData *data )
+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);
 }
@@ -1158,11 +1365,11 @@ wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, u
 {
     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);
 }
 
@@ -1170,21 +1377,21 @@ 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();    
+    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 );
 }
@@ -1193,7 +1400,7 @@ wxString wxDataViewTreeStore::GetItemText( const wxDataViewItem& item ) const
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return wxEmptyString;
-    
+
     return node->GetText();
 }
 
@@ -1201,9 +1408,9 @@ void wxDataViewTreeStore::SetItemIcon( const wxDataViewItem& item, const wxIcon
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return;
-    
+
     node->SetIcon( icon );
-    
+
     // notify control
     ValueChanged( item, 0 );
 }
@@ -1212,7 +1419,7 @@ const wxIcon &wxDataViewTreeStore::GetItemIcon( const wxDataViewItem& item ) con
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return wxNullIcon;
-    
+
     return node->GetIcon();
 }
 
@@ -1220,9 +1427,9 @@ void wxDataViewTreeStore::SetItemExpandedIcon( const wxDataViewItem& item, const
 {
     wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
     if (!node) return;
-    
+
     node->SetExpandedIcon( icon );
-    
+
     // notify control
     ValueChanged( item, 0 );
 }
@@ -1231,7 +1438,7 @@ const wxIcon &wxDataViewTreeStore::GetItemExpandedIcon( const wxDataViewItem& it
 {
     wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
     if (!node) return wxNullIcon;
-    
+
     return node->GetExpandedIcon();
 }
 
@@ -1239,9 +1446,9 @@ void wxDataViewTreeStore::SetItemData( const wxDataViewItem& item, wxClientData
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return;
-    
+
     node->SetData( data );
-    
+
     // notify control? only sensible when sorting on client data
     // ValueChanged( item, 0 );
 }
@@ -1250,7 +1457,7 @@ wxClientData *wxDataViewTreeStore::GetItemData( const wxDataViewItem& item ) con
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return NULL;
-    
+
     return node->GetData();
 }
 
@@ -1262,12 +1469,12 @@ void wxDataViewTreeStore::DeleteItem( const wxDataViewItem& 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 );
 }
@@ -1276,7 +1483,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++)
@@ -1284,9 +1491,9 @@ void wxDataViewTreeStore::DeleteChildren( const wxDataViewItem& item )
         wxDataViewTreeStoreNode* child = *iter;
         array.Add( child->GetItem() );
     }
-    
+
     node->GetChildren().clear();
-    
+
     // notify control
     ItemsDeleted( item, array );
 }
@@ -1296,34 +1503,46 @@ void wxDataViewTreeStore::DeleteAllItems()
     // TODO
 }
 
-void wxDataViewTreeStore::GetValue( wxVariant &variant, 
-                           const wxDataViewItem &item, unsigned int col ) const
+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(), node->GetIcon() );
-    
+    wxDataViewIconText data( node->GetText(), icon );
+
     variant << data;
 }
 
-bool wxDataViewTreeStore::SetValue( const wxVariant &variant, 
-                           const wxDataViewItem &item, unsigned int col )
+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;
 }
 
@@ -1331,13 +1550,13 @@ wxDataViewItem wxDataViewTreeStore::GetParent( const wxDataViewItem &item ) cons
 {
     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();
 }
 
@@ -1345,7 +1564,7 @@ bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const
 {
     wxDataViewTreeStoreNode *node = FindNode( item );
     if (!node) return false;
-    
+
     return node->IsContainer();
 }
 
@@ -1360,36 +1579,36 @@ unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDat
         wxDataViewTreeStoreNode* child = *iter;
         children.Add( child->GetItem() );
     }
-    
+
     return node->GetChildren().GetCount();
 }
 
-int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+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* parent1 =
         (wxDataViewTreeStoreContainerNode*) node1->GetParent();
-    wxDataViewTreeStoreContainerNode* parent2 = 
+    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 );
 }
 
@@ -1397,7 +1616,7 @@ wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &it
 {
     if (!item.IsOk())
         return m_root;
-        
+
     return (wxDataViewTreeStoreNode*) item.GetID();
 }
 
@@ -1407,12 +1626,167 @@ wxDataViewTreeStoreContainerNode *wxDataViewTreeStore::FindContainerNode( const
         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