better Sun CC fix: put the function in anonymous namespace instead of making it global

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index c3aba3e3d4c6752677692ac7a582d596b3525d37..ab02b8e824d03201b6124f0d00cc87eb962a882e 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -32,7 +32,6 @@ const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
 wxDataViewListModel::wxDataViewListModel()
 {
-    m_viewingColumns.DeleteContents( true );
     m_notifiers.DeleteContents( true );
 }
 
@@ -168,28 +167,6 @@ bool wxDataViewListModel::Cleared()
     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 );
@@ -211,9 +188,6 @@ public:
     wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
         { m_model = model; }
         
-    ~wxDataViewSortedListModelNotifier()
-        { m_model->DetachChild(); }
-
     virtual bool RowAppended()
         { return m_model->ChildRowAppended(); }
 
@@ -311,18 +285,25 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
 
     m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
     m_child->AddNotifier( m_notifierOnChild );
+    
+    m_child->IncRef();
 
     Resort();
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
-    if (m_child)
-        m_child->RemoveNotifier( m_notifierOnChild );
+    DetachChild();
 }
 
 void wxDataViewSortedListModel::DetachChild()
 {
+    if (m_child)
+    {
+        m_child->RemoveNotifier( m_notifierOnChild );
+        m_child->DecRef();
+    }
+    
     m_child = NULL;
 }
 
@@ -341,14 +322,48 @@ void wxDataViewSortedListModel::Resort()
 {
     InitStatics();
     
-    m_array.Clear();
+    if (!m_child) return;
+    
     unsigned int n = m_child->GetRowCount();
+    
     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 );
+
+    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
@@ -582,11 +597,15 @@ bool wxDataViewSortedListModel::ChildCleared()
 
 unsigned int wxDataViewSortedListModel::GetRowCount() const
 {
-    return m_array.GetCount();
+    if (!m_child) return 0;
+    
+    return m_child->GetRowCount();
 }
 
 unsigned int wxDataViewSortedListModel::GetColumnCount() const
 {
+    if (!m_child) return 0;
+    
     return m_child->GetColumnCount();
 }
 
@@ -872,11 +891,6 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_renderer)
         delete m_renderer;
-
-    if (GetOwner())
-    {
-        GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
-    }
 }
 
 int wxDataViewColumnBase::GetFlags() const
@@ -900,6 +914,44 @@ void wxDataViewColumnBase::SetFlags(int flags)
     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
@@ -911,6 +963,7 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 {
     m_model = NULL;
     m_cols.DeleteContents( true );
+    m_eventNotifier = NULL;
 }
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
@@ -922,6 +975,10 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 
     if (m_model)
     {
+        if (m_eventNotifier)
+            m_model->RemoveNotifier( m_eventNotifier );
+        m_eventNotifier = NULL;
+    
         m_model->DecRef();
         m_model = NULL;
     }
@@ -929,13 +986,23 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 
 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
+    }
 
     // add our own reference to the new model:
     m_model = model;
-    if ( m_model )
+    if (m_model)
+    {
         m_model->IncRef(); 
+        m_eventNotifier = new wxDataViewEventListModelNotifier( (wxDataViewCtrl*) this );
+        m_model->AddNotifier( m_eventNotifier );
+    }
 
     return true;
 }
@@ -1029,7 +1096,6 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
 {
     m_cols.Append( (wxObject*) col );
     col->SetOwner( (wxDataViewCtrl*) this );
-    m_model->AddViewingColumn( col, col->GetModelColumn() );
     return true;
 }
 
@@ -1063,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_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