use same names for test suites as the ones in ./test -l

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 8ebcfef112748d30489957e46114ed6d02a33ebd..ab02b8e824d03201b6124f0d00cc87eb962a882e 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -32,19 +32,11 @@ const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 wxDataViewListModel::wxDataViewListModel()
 {
 
 wxDataViewListModel::wxDataViewListModel()
 {

-    m_viewingColumns.DeleteContents( true );

     m_notifiers.DeleteContents( true );
 }
 
 wxDataViewListModel::~wxDataViewListModel()
 {
     m_notifiers.DeleteContents( true );
 }
 
 wxDataViewListModel::~wxDataViewListModel()
 {

-    wxList::compatibility_iterator node = m_notifiers.GetFirst();
-    while (node)
-    {
-        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
-        notifier->Freed();
-        node = node->GetNext();
-    }

 }
 
 bool wxDataViewListModel::RowAppended()
 }
 
 bool wxDataViewListModel::RowAppended()


@@ -175,28 +167,6 @@ bool wxDataViewListModel::Cleared()
     return ret;
 }
 
     return ret;
 }
 

-void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
-{
-    m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
-}
-
-void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
-{
-    wxList::compatibility_iterator node = m_viewingColumns.GetFirst();
-    while (node)
-    {
-        wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
-
-        if (tmp->m_viewColumn == column)
-        {
-            m_viewingColumns.DeleteObject( tmp );
-            return;
-        }
-
-        node = node->GetNext();
-    }
-}
-

 void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
 {
     m_notifiers.Append( notifier );
 void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
 {
     m_notifiers.Append( notifier );


@@ -217,7 +187,7 @@ class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
 public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
         { m_model = model; }
 public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
         { m_model = model; }

-
+        

     virtual bool RowAppended()
         { return m_model->ChildRowAppended(); }
 
     virtual bool RowAppended()
         { return m_model->ChildRowAppended(); }
 


@@ -242,9 +212,6 @@ public:
     virtual bool Cleared()
         { return m_model->ChildCleared(); }
 
     virtual bool Cleared()
         { return m_model->ChildCleared(); }
 

-    virtual bool Freed()
-        { m_model->m_child = NULL; return wxDataViewListModelNotifier::Freed(); }
-

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


@@ -318,14 +285,26 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
 
     m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
     m_child->AddNotifier( m_notifierOnChild );
 
     m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
     m_child->AddNotifier( m_notifierOnChild );

+    
+    m_child->IncRef();

 
     Resort();
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 
     Resort();
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()

+{
+    DetachChild();
+}
+
+void wxDataViewSortedListModel::DetachChild()

 {
     if (m_child)
 {
     if (m_child)

-    m_child->RemoveNotifier( m_notifierOnChild );
+    {
+        m_child->RemoveNotifier( m_notifierOnChild );
+        m_child->DecRef();
+    }
+    
+    m_child = NULL;

 }
 
 // FIXME
 }
 
 // FIXME


@@ -343,17 +322,54 @@ void wxDataViewSortedListModel::Resort()
 {
     InitStatics();
     
 {
     InitStatics();
     

-    m_array.Clear();
-    unsigned int n = m_child->GetNumberOfRows();
+    if (!m_child) return;
+    
+    unsigned int n = m_child->GetRowCount();
+    

     unsigned int i;
     unsigned int i;

+    if (n != m_array.GetCount())
+    {
+        // probably sorted for the first time -> no reordered
+        // -- just create index and leave
+        m_array.Clear();
+        for (i = 0; i < n; i++)
+            m_array.Add( i );
+        return;
+    }
+    
+    unsigned int *old_array = new unsigned int[ n ];
+
+    for (i = 0; i < n; i++)
+        old_array[i] = m_array[ i ];
+    
+    m_array.Clear();

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

+
+    unsigned int *order = new unsigned int[ n ];
+       
+    for (i = 0; i < n; i++)
+    {
+        unsigned int new_value = m_array[i];
+        
+        unsigned int old_pos;
+        for (old_pos = 0; old_pos < n; old_pos++)
+            if (old_array[old_pos] == new_value)
+                break;
+        order[i] = old_pos;
+    }
+    
+    delete [] old_array;
+    
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;

 }
 
 #if 0
 static void Dump( wxDataViewListModel *model, unsigned int col )
 {
 }
 
 #if 0
 static void Dump( wxDataViewListModel *model, unsigned int col )
 {

-    unsigned int n = model->GetNumberOfRows();
+    unsigned int n = model->GetRowCount();

     unsigned int i;
     for (i = 0; i < n; i++)
     {
     unsigned int i;
     for (i = 0; i < n; i++)
     {


@@ -579,28 +595,32 @@ bool wxDataViewSortedListModel::ChildCleared()
     return wxDataViewListModel::Cleared();
 }
 
     return wxDataViewListModel::Cleared();
 }
 

-unsigned int wxDataViewSortedListModel::GetNumberOfRows()
+unsigned int wxDataViewSortedListModel::GetRowCount() const

 {
 {

-    return m_array.GetCount();
+    if (!m_child) return 0;
+    
+    return m_child->GetRowCount();

 }
 
 }
 

-unsigned int wxDataViewSortedListModel::GetNumberOfCols()
+unsigned int wxDataViewSortedListModel::GetColumnCount() const

 {
 {

-    return m_child->GetNumberOfCols();
+    if (!m_child) return 0;
+    
+    return m_child->GetColumnCount();

 }
 
 }
 

-wxString wxDataViewSortedListModel::GetColType( unsigned int col )
+wxString wxDataViewSortedListModel::GetColumnType( unsigned int col ) const

 {
 {

-    return m_child->GetColType( col );
+    return m_child->GetColumnType( col );

 }
 
 }
 

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

 {
     unsigned int child_row = m_array[row];
     m_child->GetValue( variant, col, child_row );
 }
 
 {
     unsigned int child_row = m_array[row];
     m_child->GetValue( variant, col, child_row );
 }
 

-bool wxDataViewSortedListModel::SetValue( wxVariant &variant, unsigned int col, unsigned int row )
+bool wxDataViewSortedListModel::SetValue( const wxVariant &variant, unsigned int col, unsigned int row )

 {
     unsigned int child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );
 {
     unsigned int child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );


@@ -701,10 +721,134 @@ bool wxDataViewSortedListModel::Cleared()
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRendererBase, wxObject)
 

-wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxDataViewCellMode mode )
+wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, 
+                                                wxDataViewCellMode WXUNUSED(mode),
+                                                int WXUNUSED(align) )

 {
     m_variantType = varianttype;
 {
     m_variantType = varianttype;

-    m_mode = mode;
+    m_editorCtrl = NULL;
+    m_row = (unsigned int) -1;
+}
+
+const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
+{
+    return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+}
+
+bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
+{
+    m_row = row; // remember for later
+                                     
+    unsigned int col = GetOwner()->GetModelColumn();
+    wxVariant value;
+    GetOwner()->GetOwner()->GetModel()->GetValue( value, col, row );
+    
+    m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
+    
+    wxDataViewEditorCtrlEvtHandler *handler = 
+        new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
+        
+    m_editorCtrl->PushEventHandler( handler );
+    
+#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+    handler->SetFocusOnIdle();
+#else
+    m_editorCtrl->SetFocus();
+#endif
+
+    return true;
+}
+
+void wxDataViewRendererBase::CancelEditing()
+{
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    // m_editorCtrl->PopEventHandler( true );
+}
+
+bool wxDataViewRendererBase::FinishEditing()
+{
+    wxVariant value;
+    GetValueFromEditorCtrl( m_editorCtrl, value );
+
+    wxPendingDelete.Append( m_editorCtrl );
+    
+    GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
+    
+    if (!Validate(value))
+        return false;
+        
+    unsigned int col = GetOwner()->GetModelColumn();
+    GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
+    GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
+    
+    // m_editorCtrl->PopEventHandler( true );
+    
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// wxDataViewEditorCtrlEvtHandler
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
+    EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
+    EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
+    EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)
+END_EVENT_TABLE()
+
+wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
+                                wxControl *editorCtrl,
+                                wxDataViewRenderer *owner )
+{
+    m_owner = owner;
+    m_editorCtrl = editorCtrl;
+
+    m_finished = false;
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event )
+{
+    if (m_focusOnIdle)
+    {
+        m_focusOnIdle = false;
+        if (wxWindow::FindFocus() != m_editorCtrl)
+            m_editorCtrl->SetFocus();
+    }
+    
+    event.Skip();
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
+{
+    switch ( event.m_keyCode )
+    {
+        case WXK_RETURN:
+            m_finished = true;
+            m_owner->FinishEditing();
+            break;
+
+        case WXK_ESCAPE:
+            m_finished = true;
+            m_owner->CancelEditing();
+            break;
+
+        default:
+            event.Skip();
+    }
+}
+
+void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
+{
+    if (!m_finished)
+    {
+        m_finished = true;
+        m_owner->FinishEditing();
+    }
+
+    event.Skip();

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


@@ -713,19 +857,20 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, wxD
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 

-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),

                                            wxDataViewRenderer *renderer,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),
                                            wxDataViewRenderer *renderer,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
                                            wxAlignment WXUNUSED(align),

-                                           int flags ) 
+                                           int WXUNUSED(flags)) 

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

-    m_flags = flags;
-    m_title = title;

     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
     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,
 }
 
 wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,


@@ -733,11 +878,10 @@ 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 flags ) 
+                                           int WXUNUSED(flags) ) 

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

-    m_flags = flags;

     m_bitmap = bitmap;
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );
     m_bitmap = bitmap;
     m_owner = NULL;
     m_renderer->SetOwner( (wxDataViewColumn*) this );


@@ -747,32 +891,67 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_renderer)
         delete m_renderer;
 {
     if (m_renderer)
         delete m_renderer;

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

 }
 
 }
 

-void wxDataViewColumnBase::SetTitle( const wxString &title )
+int wxDataViewColumnBase::GetFlags() const

 {
 {

-    m_title = title;
-}
+    int ret = 0;

 
 

-wxString wxDataViewColumnBase::GetTitle()
-{
-    return m_title;
+    if (IsSortable())
+        ret |= wxDATAVIEW_COL_SORTABLE;
+    if (IsResizeable())
+        ret |= wxDATAVIEW_COL_RESIZABLE;
+    if (IsHidden())
+        ret |= wxDATAVIEW_COL_HIDDEN;
+
+    return ret;

 }
 
 }
 

-void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap )
+void wxDataViewColumnBase::SetFlags(int flags)

 {
 {

-    m_bitmap = bitmap;
+    SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
+    SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
+    SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);

 }
 
 }
 

-const wxBitmap &wxDataViewColumnBase::GetBitmap()
+// ---------------------------------------------------------
+// wxDataViewEventListModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier

 {
 {

-    return m_bitmap;
-}
+public:
+    wxDataViewEventListModelNotifier( wxDataViewCtrl *ctrl ) { m_ctrl = ctrl; }
+    
+    bool SendEvent( wxEventType event_type, unsigned int row = 0, unsigned int col = 0 )
+    {
+        wxDataViewEvent event( event_type, m_ctrl->GetId() );
+        event.SetEventObject( m_ctrl );
+        event.SetModel( m_ctrl->GetModel() );
+        event.SetRow( row );
+        event.SetColumn( col );
+        m_ctrl->GetEventHandler()->ProcessEvent( event );
+        return true;
+    }
+
+    virtual bool RowAppended()  { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED ); }
+    virtual bool RowPrepended() { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED ); }
+    virtual bool RowInserted( unsigned int before )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED, before ); }
+    virtual bool RowDeleted( unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED, row ); }
+    virtual bool RowChanged( unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED, row ); }
+    virtual bool ValueChanged( unsigned int col, unsigned int row )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED, row, col ); }
+    virtual bool RowsReordered( unsigned int * WXUNUSED(new_order) )
+                                { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED ); }
+    virtual bool Cleared()      { return SendEvent( wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED ); }
+
+private:
+    wxDataViewCtrl *m_ctrl;
+};
+

 
 // ---------------------------------------------------------
 // wxDataViewCtrlBase
 
 // ---------------------------------------------------------
 // wxDataViewCtrlBase


@@ -784,6 +963,7 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
     m_cols.DeleteContents( true );
 {
     m_model = NULL;
     m_cols.DeleteContents( true );

+    m_eventNotifier = NULL;

 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()


@@ -795,6 +975,10 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 
     if (m_model)
     {
 
     if (m_model)
     {

+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+    

         m_model->DecRef();
         m_model = NULL;
     }
         m_model->DecRef();
         m_model = NULL;
     }


@@ -802,13 +986,23 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {

-    if ( m_model )
+    if (m_model)
+    {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+        

         m_model->DecRef();   // discard old model, if any
         m_model->DecRef();   // discard old model, if any

+    }

 
     // add our own reference to the new model:
     m_model = model;
 
     // add our own reference to the new model:
     m_model = model;

-    if ( m_model )
+    if (m_model)
+    {

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

+        m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
+        m_model->AddNotifier( m_eventNotifier );
+    }

 
     return true;
 }
 
     return true;
 }


@@ -822,91 +1016,90 @@ bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, 
-        width, align, flags ) );
+        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, 
 }
 
 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), model_column, 
-        width, align, flags ) );
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, 
-        width, align, flags ) );
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column,
-        width, align, flags ) );
+        new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), 
+        model_column, width, align, flags ) );

 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 

-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, 
-        width, align, flags ) );
+        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 );
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );

-    m_model->AddViewingColumn( col, col->GetModelColumn() );

     return true;
 }
 
     return true;
 }
 

-unsigned int wxDataViewCtrlBase::GetNumberOfColumns()
+unsigned int wxDataViewCtrlBase::GetColumnCount() const

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


@@ -936,6 +1129,15 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ROW_ACTIVATED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK)

-
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_APPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_PREPENDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_INSERTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_DELETED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROW_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_ROWS_REORDERED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_MODEL_CLEARED)

 
 #endif
 
 #endif