wxBORDER_THEME now means 'use an appropriate themed border' on all plaforms

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 89d8f183d59938ac66f03769eba310e291fb461e..2adea130200f29ec37f93f76c7d1fa5c0cfa0436 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -36,40 +36,39 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
 // wxDataViewModel
 // ---------------------------------------------------------
 
 // wxDataViewModel
 // ---------------------------------------------------------
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataViewModelNotifiers);
+

 wxDataViewModel::wxDataViewModel()
 {
     m_notifiers.DeleteContents( true );
 wxDataViewModel::wxDataViewModel()
 {
     m_notifiers.DeleteContents( true );

-    m_sortingColumn = 0;
-    m_ascending = true;

 }
 
 bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     bool ret = true;
 
 }
 
 bool wxDataViewModel::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
 {
     bool ret = true;
 

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;

         if (!notifier->ItemAdded( parent, item ))
             ret = false;
         if (!notifier->ItemAdded( parent, item ))
             ret = false;

-        node = node->GetNext();

     }
 
     return ret;
 }
 
     }
 
     return ret;
 }
 

-bool wxDataViewModel::ItemDeleted( const wxDataViewItem &item )
+bool wxDataViewModel::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )

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

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
-        if (!notifier->ItemDeleted( item ))
+        wxDataViewModelNotifier* notifier = *iter;
+        if (!notifier->ItemDeleted( parent, item ))

             ret = false;
             ret = false;

-        node = node->GetNext();

     }
 
     return ret;
     }
 
     return ret;


@@ -79,13 +78,12 @@ bool wxDataViewModel::ItemChanged( const wxDataViewItem &item )
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;

         if (!notifier->ItemChanged( item ))
             ret = false;
         if (!notifier->ItemChanged( item ))
             ret = false;

-        node = node->GetNext();

     }
 
     return ret;
     }
 
     return ret;


@@ -95,13 +93,12 @@ bool wxDataViewModel::ValueChanged( const wxDataViewItem &item, unsigned int col
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;

         if (!notifier->ValueChanged( item, col ))
             ret = false;
         if (!notifier->ValueChanged( item, col ))
             ret = false;

-        node = node->GetNext();

     }
 
     return ret;
     }
 
     return ret;


@@ -111,13 +108,12 @@ bool wxDataViewModel::Cleared()
 {
     bool ret = true;
 
 {
     bool ret = true;
 

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;

         if (!notifier->Cleared())
             ret = false;
         if (!notifier->Cleared())
             ret = false;

-        node = node->GetNext();

     }
 
     return ret;
     }
 
     return ret;


@@ -125,18 +121,17 @@ bool wxDataViewModel::Cleared()
 
 void wxDataViewModel::Resort()
 {
 
 void wxDataViewModel::Resort()
 {

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
+    wxDataViewModelNotifiers::iterator iter;
+    for (iter = m_notifiers.begin(); iter != m_notifiers.end(); ++iter)

     {
     {

-        wxDataViewModelNotifier* notifier = (wxDataViewModelNotifier*) node->GetData();
+        wxDataViewModelNotifier* notifier = *iter;

         notifier->Resort();
         notifier->Resort();

-        node = node->GetNext();

     }
 }
 
 void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
 {
     }
 }
 
 void wxDataViewModel::AddNotifier( wxDataViewModelNotifier *notifier )
 {

-    m_notifiers.Append( notifier );
+    m_notifiers.push_back( notifier );

     notifier->SetOwner( this );
 }
 
     notifier->SetOwner( this );
 }
 


@@ -145,28 +140,29 @@ void wxDataViewModel::RemoveNotifier( wxDataViewModelNotifier *notifier )
     m_notifiers.DeleteObject( notifier );
 }
 
     m_notifiers.DeleteObject( notifier );
 }
 

-int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
+int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                              unsigned int column, bool ascending )

 {
     // sort branches before leaves
     bool item1_is_container = IsContainer(item1);
     bool item2_is_container = IsContainer(item2);
 {
     // sort branches before leaves
     bool item1_is_container = IsContainer(item1);
     bool item2_is_container = IsContainer(item2);

-    
+

     if (item1_is_container && !item2_is_container)
         return 1;
     if (item2_is_container && !item1_is_container)
         return -1;
     if (item1_is_container && !item2_is_container)
         return 1;
     if (item2_is_container && !item1_is_container)
         return -1;

-    
+

     wxVariant value1,value2;
     wxVariant value1,value2;

-    GetValue( value1, item1, m_sortingColumn );
-    GetValue( value2, item2, m_sortingColumn );
+    GetValue( value1, item1, column );
+    GetValue( value2, item2, column );

 
 

-    if (!m_ascending)
+    if (!ascending)

     {
         wxVariant temp = value1;
         value1 = value2;
         value2 = temp;
     }
     {
         wxVariant temp = value1;
         value1 = value2;
         value2 = temp;
     }

-    
+

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


@@ -197,11 +193,12 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
     }
 
     // items must be different
     }
 
     // items must be different

-    unsigned long litem1 = (unsigned long) item1.GetID();    
-    unsigned long litem2 = (unsigned long) item2.GetID();    
+    unsigned long litem1 = (unsigned long) item1.GetID();
+    unsigned long litem2 = (unsigned long) item2.GetID();
+
+    if (!ascending)
+        return litem2-litem2;

 
 

-    if (!m_ascending)
-        return litem2-litem1;

     return litem1-litem2;
 }
 
     return litem1-litem2;
 }
 


@@ -249,8 +246,8 @@ void wxDataViewIndexListModel::RowAppended()
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
     wxDataViewItem item( m_hash[row] );
 void wxDataViewIndexListModel::RowDeleted( unsigned int row )
 {
     wxDataViewItem item( m_hash[row] );

+    wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );

     m_hash.RemoveAt( row );
     m_hash.RemoveAt( row );

-    wxDataViewModel::ItemDeleted( item );

 }
 
 void wxDataViewIndexListModel::RowChanged( unsigned int row )
 }
 
 void wxDataViewIndexListModel::RowChanged( unsigned int row )


@@ -271,27 +268,34 @@ unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) cons
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 {
 
 wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
 {

+    wxASSERT( row < m_hash.GetCount() );

     return wxDataViewItem( m_hash[row] );
 }
 
     return wxDataViewItem( m_hash[row] );
 }
 

-int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2 )
+int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
+                                      const wxDataViewItem& item2,
+                                      unsigned int WXUNUSED(column),
+                                      bool ascending)

 {
 {

-    return GetRow(item1) - GetRow(item2);
+    if (ascending)
+        return GetRow(item1) - GetRow(item2);
+
+    return GetRow(item2) - GetRow(item1);

 }
 
 }
 

-void wxDataViewIndexListModel::GetValue( wxVariant &variant, 
+void wxDataViewIndexListModel::GetValue( wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col ) const
 {
                            const wxDataViewItem &item, unsigned int col ) const
 {

-    return GetValue( variant, GetRow(item), col );
+    GetValue( variant, GetRow(item), col );

 }
 
 }
 

-bool wxDataViewIndexListModel::SetValue( const wxVariant &variant, 
+bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col )
 {
     return SetValue( variant, GetRow(item), col );
 }
 
                            const wxDataViewItem &item, unsigned int col )
 {
     return SetValue( variant, GetRow(item), col );
 }
 

-wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem &item ) const
+wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const

 {
     return wxDataViewItem(0);
 }
 {
     return wxDataViewItem(0);
 }


@@ -301,33 +305,33 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
     // only the invisible root item has children
     if (!item.IsOk())
         return true;
     // only the invisible root item has children
     if (!item.IsOk())
         return true;

-        
+

     return false;
 }
 
     return false;
 }
 

-wxDataViewItem wxDataViewIndexListModel::GetFirstChild( const wxDataViewItem &parent ) const
+unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const

 {
 {

-    if (!parent.IsOk())
-    {
-        if (m_hash.GetCount() == 0)
-            return wxDataViewItem(0);
-    
-        return wxDataViewItem( m_hash[0]);
-    }
-    
-    return wxDataViewItem(0);
+    if (item.IsOk())
+        return 0;
+
+    children = m_hash;
+
+    return m_hash.GetCount();

 }
 
 }
 

-wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &item ) const
+//-----------------------------------------------------------------------------
+// wxDataViewIconText
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewIconText,wxObject)
+
+IMPLEMENT_VARIANT_OBJECT(wxDataViewIconText)
+
+bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)

 {
 {

-    if (!item.IsOk())
-        return wxDataViewItem(0);
-        
-    int pos = m_hash.Index( item.GetID() );
-    if ((pos == wxNOT_FOUND) || (pos == m_hash.GetCount()-1))
-        return wxDataViewItem(0);
-        
-    return wxDataViewItem( m_hash[pos+1] );
+    if (one.GetText() != two.GetText()) return false;
+    if (one.IsSameAs(two)) return false;
+    return true;

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -336,7 +340,7 @@ wxDataViewItem wxDataViewIndexListModel::GetNextSibling( const wxDataViewItem &i
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 

-wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype,

                                                 wxDataViewCellMode WXUNUSED(mode),
                                                 int WXUNUSED(align) )
 {
                                                 wxDataViewCellMode WXUNUSED(mode),
                                                 int WXUNUSED(align) )
 {


@@ -352,33 +356,40 @@ const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later
 bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
 {
     m_item = item; // remember for later

-                                     
+

     unsigned int col = GetOwner()->GetModelColumn();
     wxVariant value;
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );
     unsigned int col = GetOwner()->GetModelColumn();
     wxVariant value;
     GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col );

-    
+

     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );

-    
-    wxDataViewEditorCtrlEvtHandler *handler = 
+
+    wxDataViewEditorCtrlEvtHandler *handler =

         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
         new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );

-        
+

     m_editorCtrl->PushEventHandler( handler );
     m_editorCtrl->PushEventHandler( handler );

-    
+

 #if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
     handler->SetFocusOnIdle();
 #else
     m_editorCtrl->SetFocus();
 #endif
 
 #if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
     handler->SetFocusOnIdle();
 #else
     m_editorCtrl->SetFocus();
 #endif
 

+    // Now we should send Editing Started event
+    wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, GetOwner()->GetOwner()->GetId() );
+    event.SetDataViewColumn( GetOwner() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+

     return true;
 }
 
 void wxDataViewRendererBase::CancelEditing()
 {
     wxPendingDelete.Append( m_editorCtrl );
     return true;
 }
 
 void wxDataViewRendererBase::CancelEditing()
 {
     wxPendingDelete.Append( m_editorCtrl );

-    
+

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();

-    
+

     // m_editorCtrl->PopEventHandler( true );
 }
 
     // m_editorCtrl->PopEventHandler( true );
 }
 


@@ -388,18 +399,25 @@ bool wxDataViewRendererBase::FinishEditing()
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxPendingDelete.Append( m_editorCtrl );
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxPendingDelete.Append( m_editorCtrl );

-    
+

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();

-    
+

     if (!Validate(value))
         return false;
     if (!Validate(value))
         return false;

-        
+

     unsigned int col = GetOwner()->GetModelColumn();
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
     unsigned int col = GetOwner()->GetModelColumn();
     GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );

-    
+

     // m_editorCtrl->PopEventHandler( true );
     // 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() );
+    event.SetModel( GetOwner()->GetOwner()->GetModel() );
+    event.SetItem( m_item );
+    GetOwner()->GetOwner()->GetEventHandler()->ProcessEvent( event );
+

     return true;
 }
 
     return true;
 }
 


@@ -431,7 +449,7 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
         if (wxWindow::FindFocus() != m_editorCtrl)
             m_editorCtrl->SetFocus();
     }
         if (wxWindow::FindFocus() != m_editorCtrl)
             m_editorCtrl->SetFocus();
     }

-    
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -476,7 +494,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),

-                                           int WXUNUSED(flags)) 
+                                           int WXUNUSED(flags))

 {
     m_renderer = renderer;
     m_model_column = model_column;
 {
     m_renderer = renderer;
     m_model_column = model_column;


@@ -492,7 +510,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),

-                                           int WXUNUSED(flags) ) 
+                                           int WXUNUSED(flags) )

 {
     m_renderer = renderer;
     m_model_column = model_column;
 {
     m_renderer = renderer;
     m_model_column = model_column;


@@ -537,18 +555,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;

-    m_cols.DeleteContents( true );

     m_expander_column = 0;
     m_indent = 8;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
     m_expander_column = 0;
     m_indent = 8;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {

-    // IMPORTANT: before calling DecRef() on our model (since it may 
-    //            result in a free() call), erase all columns (since
-    //            they hold a pointer to our model)
-    m_cols.Clear();
-

     if (m_model)
     {
         m_model->DecRef();
     if (m_model)
     {
         m_model->DecRef();


@@ -567,7 +579,7 @@ bool wxDataViewCtrlBase::AssociateModel( wxDataViewModel *model )
     m_model = model;
     if (m_model)
     {
     m_model = model;
     if (m_model)
     {

-        m_model->IncRef(); 
+        m_model->IncRef();

     }
 
     return true;
     }
 
     return true;


@@ -578,111 +590,144 @@ wxDataViewModel* wxDataViewCtrlBase::GetModel()
     return m_model;
 }
 
     return m_model;
 }
 

-bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
-        model_column, width, align, flags ) );
-}

 
 

-bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
-{
-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
-        model_column, width, align, flags ) );
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,

                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {

-    return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
-        model_column, width, align, flags ) );
-}
-
-bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
-{
-    m_cols.Append( (wxObject*) col );
-    col->SetOwner( (wxDataViewCtrl*) this );
-    return true;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-unsigned int wxDataViewCtrlBase::GetColumnCount() const
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return m_cols.GetCount();
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return false;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-bool wxDataViewCtrlBase::ClearColumns()
+wxDataViewColumn *
+wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )

 {
 {

-    return false;
+    wxDataViewColumn *ret = new wxDataViewColumn( label,
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ),
+        model_column, width, align, flags );
+    AppendColumn( ret );
+    return ret;

 }
 
 }
 

-wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
+bool
+wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )

 {
 {

-    return (wxDataViewColumn*) m_cols[ pos ];
+    col->SetOwner( (wxDataViewCtrl*) this );
+    return true;

 }
 
 // ---------------------------------------------------------
 }
 
 // ---------------------------------------------------------


@@ -691,8 +736,16 @@ wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED)
+

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
 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_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_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)


@@ -704,3 +757,4 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
 
 #endif
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)
 
 #endif

+