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 5e5e4e8fd035a22ff76e8d0ffed73b7034da171e..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,14 +322,48 @@ void wxDataViewSortedListModel::Resort()
 {
     InitStatics();
     
 {
     InitStatics();
     

-    m_array.Clear();
+    if (!m_child) return;
+    

     unsigned int n = m_child->GetRowCount();
     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 ];

        
        

-    // do we need the neworder?
-    wxDataViewListModel::RowsReordered( NULL );
+    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
 }
 
 #if 0


@@ -584,11 +597,15 @@ bool wxDataViewSortedListModel::ChildCleared()
 
 unsigned int wxDataViewSortedListModel::GetRowCount() const
 {
 
 unsigned int wxDataViewSortedListModel::GetRowCount() const
 {

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

 }
 
 unsigned int wxDataViewSortedListModel::GetColumnCount() const
 {
 }
 
 unsigned int wxDataViewSortedListModel::GetColumnCount() const
 {

+    if (!m_child) return 0;
+    

     return m_child->GetColumnCount();
 }
 
     return m_child->GetColumnCount();
 }
 


@@ -603,7 +620,7 @@ void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col,
     m_child->GetValue( variant, col, child_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 );


@@ -728,31 +745,35 @@ bool wxDataViewRendererBase::StartEditing( unsigned int row, wxRect labelRect )
     
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     
     
     m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value );
     

-    m_editorCtrl->PushEventHandler( 
-        new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ) );
+    wxDataViewEditorCtrlEvtHandler *handler = 
+        new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this );
+        
+    m_editorCtrl->PushEventHandler( handler );

     
     

+#if defined(__WXGTK20__) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+    handler->SetFocusOnIdle();
+#else

     m_editorCtrl->SetFocus();
     m_editorCtrl->SetFocus();

-    
+#endif
+

     return true;
 }
 
 void wxDataViewRendererBase::CancelEditing()
 {
     return true;
 }
 
 void wxDataViewRendererBase::CancelEditing()
 {

-    // m_editorCtrl->PopEventHandler( true );
-
-    delete m_editorCtrl;
+    wxPendingDelete.Append( m_editorCtrl );

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

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

 }
 
 bool wxDataViewRendererBase::FinishEditing()
 {
 }
 
 bool wxDataViewRendererBase::FinishEditing()
 {

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

     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 

-    delete m_editorCtrl;
+    wxPendingDelete.Append( m_editorCtrl );

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


@@ -763,6 +784,8 @@ bool wxDataViewRendererBase::FinishEditing()
     GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
     
     GetOwner()->GetOwner()->GetModel()->SetValue( value, col, m_row );
     GetOwner()->GetOwner()->GetModel()->ValueChanged( col, m_row );
     

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

     return true;
 }
 
     return true;
 }
 


@@ -773,6 +796,7 @@ bool wxDataViewRendererBase::FinishEditing()
 BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
 BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler)
     EVT_CHAR           (wxDataViewEditorCtrlEvtHandler::OnChar)
     EVT_KILL_FOCUS     (wxDataViewEditorCtrlEvtHandler::OnKillFocus)

+    EVT_IDLE           (wxDataViewEditorCtrlEvtHandler::OnIdle)

 END_EVENT_TABLE()
 
 wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
 END_EVENT_TABLE()
 
 wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(


@@ -785,6 +809,18 @@ wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
     m_finished = false;
 }
 
     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 )
 void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
 {
     switch ( event.m_keyCode )


@@ -812,7 +848,6 @@ void wxDataViewEditorCtrlEvtHandler::OnKillFocus( wxFocusEvent &event )
         m_owner->FinishEditing();
     }
 
         m_owner->FinishEditing();
     }
 

-    // We must let the native text control handle focus

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


@@ -856,11 +891,6 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_renderer)
         delete m_renderer;
 {
     if (m_renderer)
         delete m_renderer;

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

 }
 
 int wxDataViewColumnBase::GetFlags() const
 }
 
 int wxDataViewColumnBase::GetFlags() const


@@ -884,6 +914,44 @@ void wxDataViewColumnBase::SetFlags(int flags)
     SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
 }
 
     SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
 }
 

+// ---------------------------------------------------------
+// wxDataViewEventListModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewEventListModelNotifier: public wxDataViewListModelNotifier
+{
+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


@@ -895,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()


@@ -906,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;
     }


@@ -913,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;
 }


@@ -1013,7 +1096,6 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );

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

     return true;
 }
 
     return true;
 }
 


@@ -1047,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