Comment out wxHVScrolledWindow

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index a323d1c87303e3a741f86e86aac6ec7fe3b44ce0..268856c151a635c6c98176aa8e11b1573a6ce4d5 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -38,82 +38,462 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
 
 wxDataViewListModel::wxDataViewListModel()
 {
 
 wxDataViewListModel::wxDataViewListModel()
 {

-    m_notifier = NULL;
+    m_viewingColumns.DeleteContents( true );
+    m_notifiers.DeleteContents( true );

 }
 
 wxDataViewListModel::~wxDataViewListModel()
 {
 }
 
 wxDataViewListModel::~wxDataViewListModel()
 {

-    if (m_notifier)
-        delete m_notifier;

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

-    if (m_notifier)
-        return m_notifier->RowAppended();
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowAppended())
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::RowPrepended()
 {
 }
 
 bool wxDataViewListModel::RowPrepended()
 {

-    if (m_notifier)
-        return m_notifier->RowPrepended();
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowPrepended())
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::RowInserted( size_t before )
 {
 }
 
 bool wxDataViewListModel::RowInserted( size_t before )
 {

-    if (m_notifier)
-        return m_notifier->RowInserted( before );
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowInserted(before))
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::RowDeleted( size_t row )
 {
 }
 
 bool wxDataViewListModel::RowDeleted( size_t row )
 {

-    if (m_notifier)
-        return m_notifier->RowDeleted( row );
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowDeleted( row ))
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::RowChanged( size_t row )
 {
 }
 
 bool wxDataViewListModel::RowChanged( size_t row )
 {

-    if (m_notifier)
-        return m_notifier->RowChanged( row );
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowChanged( row ))
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
 {
 }
 
 bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
 {

-    if (m_notifier)
-        return m_notifier->ValueChanged( col, row );
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->ValueChanged( col, row ))
+            ret = false;
+        node = node->GetNext();
+    }
+    
+    return ret;
+}
+
+bool wxDataViewListModel::RowsReordered( size_t *new_order )
+{
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowsReordered( new_order ))
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;

 }
 
 bool wxDataViewListModel::Cleared()
 {
 }
 
 bool wxDataViewListModel::Cleared()
 {

-    if (m_notifier)
-        return m_notifier->Cleared();
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->Cleared())
+            ret = false;
+        node = node->GetNext();
+    }

         
         

-    return false;
+    return ret;
+}
+
+void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column )
+{
+    m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );

 }
 
 }
 

-void wxDataViewListModel::SetNotifier( wxDataViewListModelNotifier *notifier )
+void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )

 {
 {

-    if (m_notifier)
-        delete m_notifier;
+    wxNode *node = m_viewingColumns.GetFirst();
+    while (node)
+    {
+        wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();

         
         

-   m_notifier = notifier;
+        if (tmp->m_viewColumn == column)
+        {
+            m_viewingColumns.DeleteObject( tmp );
+            return;
+        }
+    
+        node = node->GetNext();
+    }
+}
+
+void wxDataViewListModel::AddNotifier( wxDataViewListModelNotifier *notifier )
+{
+    m_notifiers.Append( notifier );
+    notifier->SetOwner( this );
+}
+
+void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier )
+{
+    m_notifiers.DeleteObject( notifier );
+}
+
+// --------------------------------------------------------- 
+// wxDataViewSortedListModelNotifier
+// --------------------------------------------------------- 
+
+class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
+    { m_model = model; }
+    
+    virtual bool RowAppended() { return true; }
+    virtual bool RowPrepended()  { return true; }
+    virtual bool RowInserted( size_t before )  { return true; }
+    virtual bool RowDeleted( size_t row ) { return true; }
+    virtual bool RowChanged( size_t row ) { return true; }
+    virtual bool ValueChanged( size_t col, size_t row )
+         { return m_model->ChildValueChanged( col, row); }
+    virtual bool RowsReordered( size_t *new_order ) { return true; }
+    virtual bool Cleared() { return true; }
+    
+    wxDataViewSortedListModel *m_model;
+};
+
+// --------------------------------------------------------- 
+// wxDataViewSortedListModel compare function
+// --------------------------------------------------------- 
+
+int wxCALLBACK wxDataViewListModelSortedDefaultCompare
+      (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
+{
+    wxVariant value1,value2;
+    model->GetValue( value1, col, row1 );
+    model->GetValue( value2, col, row2 );
+    if (value1.GetType() == wxT("string"))
+    {
+        wxString str1 = value1.GetString();
+        wxString str2 = value2.GetString();
+        return str1.Cmp( str2 );
+    }
+    if (value1.GetType() == wxT("long"))
+    {
+        long l1 = value1.GetLong();
+        long l2 = value2.GetLong();
+        return l1-l2;
+    }
+    if (value1.GetType() == wxT("double"))
+    {
+        double d1 = value1.GetDouble();
+        double d2 = value2.GetDouble();
+        if (d1 == d2) return 0;
+        if (d1 < d2) return 1;
+        return -1;
+    }
+    if (value1.GetType() == wxT("datetime"))
+    {
+        wxDateTime dt1 = value1.GetDateTime();
+        wxDateTime dt2 = value2.GetDateTime();
+        if (dt1.IsEqualTo(dt2)) return 0;
+        if (dt1.IsEarlierThan(dt2)) return 1;
+        return -1;
+    }
+
+    return 0;
+}
+
+static wxDataViewListModelCompare   s_CmpFunc;
+static wxDataViewListModel         *s_CmpModel;
+static size_t                       s_CmpCol;
+
+int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
+{
+    return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
+}
+
+// --------------------------------------------------------- 
+// wxDataViewSortedListModel
+// ---------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
+
+wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
+  m_array( wxDataViewIntermediateCmp )
+{
+    m_child = child;
+    s_CmpCol = 0;
+    s_CmpModel = child;
+    s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
+    
+    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+    m_child->AddNotifier( m_notifierOnChild );
+    
+    Resort();    
+}
+
+wxDataViewSortedListModel::~wxDataViewSortedListModel()
+{
+    m_child->RemoveNotifier( m_notifierOnChild );
+}
+
+void wxDataViewSortedListModel::Resort()
+{
+    m_array.Clear();
+    size_t n = m_child->GetNumberOfRows();
+    size_t i;
+    for (i = 0; i < n; i++)
+        m_array.Add( i );
+}
+
+#if 0
+static void Dump( wxDataViewListModel *model, size_t col )
+{
+    size_t n = model->GetNumberOfRows();
+    size_t i;
+    for (i = 0; i < n; i++)
+    {
+        wxVariant variant;
+        model->GetValue( variant, col, i );
+        wxString tmp;
+        tmp = variant.GetString();
+        wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
+    }
+}
+#endif
+
+bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+{
+    size_t i;
+    size_t len = m_array.GetCount();
+    
+    // Remove and readd sorted. Find out at which
+    // position it was and where it ended.
+    size_t start_pos = 0,end_pos = 0;
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            start_pos = i;
+            break;
+        }
+    m_array.RemoveAt( start_pos );
+    m_array.Add( row );
+    
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            end_pos = i;
+            break;
+        }
+    
+    if (end_pos == start_pos)
+        return wxDataViewListModel::ValueChanged( col, start_pos );
+    
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    size_t *order = new size_t[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    if (start_pos < end_pos)
+    {
+        for (i = start_pos; i < end_pos; i++)
+            order[i] = order[i+1];
+        order[end_pos] = start_pos;
+    }
+    else
+    {
+        for (i = end_pos; i > start_pos; i--)
+            order[i] = order[i-1];
+        order[start_pos] = end_pos;
+    }   
+    
+    wxDataViewListModel::RowsReordered( order );
+    
+    delete [] order;
+    
+    return true;
+}
+
+size_t wxDataViewSortedListModel::GetNumberOfRows()
+{
+    return m_array.GetCount();

 }
 
 }
 

-wxDataViewListModelNotifier* wxDataViewListModel::GetNotifier()
+size_t wxDataViewSortedListModel::GetNumberOfCols()

 {
 {

-    return m_notifier;
+    return m_child->GetNumberOfCols();
+}
+
+wxString wxDataViewSortedListModel::GetColType( size_t col )
+{
+    return m_child->GetColType( col );
+}
+
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
+{
+    size_t child_row = m_array[row];
+    m_child->GetValue( variant, col, child_row );
+}
+
+bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
+{
+    size_t child_row = m_array[row];
+    bool ret = m_child->SetValue( variant, col, child_row );
+    
+    // Resort in ::ChildValueChanged() which gets reported back.
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowAppended()
+{
+    // you can only append
+    bool ret = m_child->RowAppended();
+    
+    // report RowInsrted
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowPrepended()
+{
+    // you can only append
+    bool ret = m_child->RowAppended();
+    
+    // report RowInsrted
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowInserted( size_t before )
+{
+    // you can only append
+    bool ret = m_child->RowAppended();
+    
+    // report different RowInsrted
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowDeleted( size_t row )
+{
+    size_t child_row = m_array[row];
+    
+    bool ret = m_child->RowDeleted( child_row );
+    
+    // Do nothing here as the change in the
+    // child model will be reported back.
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowChanged( size_t row )
+{
+    size_t child_row = m_array[row];
+    bool ret = m_child->RowChanged( child_row );
+    
+    // Do nothing here as the change in the
+    // child model will be reported back.
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
+{
+    size_t child_row = m_array[row];
+    bool ret = m_child->ValueChanged( col, child_row );
+    
+    // Do nothing here as the change in the
+    // child model will be reported back.
+    
+    return ret;
+}
+
+bool wxDataViewSortedListModel::RowsReordered( size_t *new_order )
+{
+    // We sort them ourselves.
+
+    return false;
+}
+
+bool wxDataViewSortedListModel::Cleared()
+{
+    bool ret = m_child->Cleared();
+    
+    wxDataViewListModel::Cleared();
+    
+    return ret;

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


@@ -148,6 +528,11 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_cell)
         delete m_cell;
 {
     if (m_cell)
         delete m_cell;

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

 }
 
 void wxDataViewColumnBase::SetTitle( const wxString &title )
 }
 
 void wxDataViewColumnBase::SetTitle( const wxString &title )


@@ -174,15 +559,10 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {

-    if (m_model)
-        delete m_model;

 }
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
 }
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {

-    if (m_model)
-        delete m_model;
-        

     m_model = model;
     
     return true;
     m_model = model;
     
     return true;


@@ -203,10 +583,21 @@ bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model
     return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
 }
 
     return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
 }
 

+bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
+{
+    return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+}
+
+bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
+{
+    return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
+}
+

 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;
 }