#pragma hdrstop
#endif
-#include "wx/defs.h"
-
#if wxUSE_DATAVIEWCTRL
-#include "wx/object.h"
#include "wx/dataview.h"
-#include "wx/log.h"
-#include "wx/image.h"
-// ---------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
+const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+
+// ---------------------------------------------------------
// wxDataViewModel
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxDataViewListModel
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
+ return ret;
+}
+
+bool wxDataViewListModel::RowsReordered( size_t *new_order )
+{
+ bool ret = true;
+
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
+ while (node)
+ {
+ wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+ if (!notifier->RowsReordered( new_order ))
+ ret = false;
+ node = node->GetNext();
+ }
+
return ret;
}
{
bool ret = true;
- wxNode *node = m_notifiers.GetFirst();
+ wxList::compatibility_iterator node = m_notifiers.GetFirst();
while (node)
{
wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
ret = false;
node = node->GetNext();
}
-
+
return ret;
}
void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
{
- wxNode *node = m_viewingColumns.GetFirst();
+ 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();
}
}
m_notifiers.DeleteObject( notifier );
}
-// ---------------------------------------------------------
-// wxDataViewSortedListModel
-// ---------------------------------------------------------
+// ---------------------------------------------------------
+// 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 WXUNUSED(before) ) { return true; }
+ virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; }
+ virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; }
+ virtual bool ValueChanged( size_t col, size_t row )
+ { return m_model->ChildValueChanged( col, row); }
+ virtual bool RowsReordered( size_t *WXUNUSED(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 = model->GetValue( col, row1 );
- wxVariant value2 = model->GetValue( col, row2 );
+ wxVariant value1,value2;
+ model->GetValue( value1, col, row1 );
+ model->GetValue( value2, col, row2 );
if (value1.GetType() == wxT("string"))
{
wxString str1 = value1.GetString();
return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
}
+// ---------------------------------------------------------
+// wxDataViewSortedListModel
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
s_CmpCol = 0;
s_CmpModel = child;
s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
-
- Resort();
+
+ m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+ m_child->AddNotifier( m_notifierOnChild );
+
+ Resort();
}
wxDataViewSortedListModel::~wxDataViewSortedListModel()
{
+ m_child->RemoveNotifier( m_notifierOnChild );
}
void wxDataViewSortedListModel::Resort()
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_child->GetNumberOfRows();
+ return m_array.GetCount();
}
size_t wxDataViewSortedListModel::GetNumberOfCols()
return m_child->GetColType( col );
}
-wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
{
size_t child_row = m_array[row];
- return m_child->GetValue( col, child_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 ::ValueChanged()
+
+ // Resort in ::ChildValueChanged() which gets reported back.
+
return ret;
}
{
// you can only append
bool ret = m_child->RowAppended();
-
+
// report RowInsrted
-
+
return ret;
}
{
// you can only append
bool ret = m_child->RowAppended();
-
+
// report RowInsrted
-
+
return ret;
}
-bool wxDataViewSortedListModel::RowInserted( size_t before )
+bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(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 );
-
- wxDataViewListModel::RowDeleted( row );
-
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
return ret;
}
{
size_t child_row = m_array[row];
bool ret = m_child->RowChanged( child_row );
-
- // report delete old pos, inserted new pos
-
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
return ret;
}
{
size_t child_row = m_array[row];
bool ret = m_child->ValueChanged( col, child_row );
-
- // Do nothing if not the sorted col..
- // report delete old pos, inserted new pos
-
+
+ // Do nothing here as the change in the
+ // child model will be reported back.
+
return ret;
}
+bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+{
+ // We sort them ourselves.
+
+ return false;
+}
+
bool wxDataViewSortedListModel::Cleared()
{
bool ret = m_child->Cleared();
-
+
wxDataViewListModel::Cleared();
-
+
return ret;
}
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxDataViewCellBase
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
m_variantType = varianttype;
m_mode = mode;
}
-
-// ---------------------------------------------------------
+
+// ---------------------------------------------------------
// wxDataViewColumnBase
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-wxDataViewColumnBase::wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags)
+wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
+ wxDataViewCell *cell,
+ size_t model_column,
+ int WXUNUSED(fixed_width),
+ wxDataViewColumnSizing WXUNUSED(sizing),
+ int flags )
{
m_cell = cell;
m_model_column = model_column;
{
if (m_cell)
delete m_cell;
-
+
if (GetOwner())
{
GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
return m_title;
}
-// ---------------------------------------------------------
+// ---------------------------------------------------------
// wxDataViewCtrlBase
-// ---------------------------------------------------------
+// ---------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
wxDataViewCtrlBase::~wxDataViewCtrlBase()
{
- if (m_model)
- delete m_model;
}
bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
{
- if (m_model)
- delete m_model;
-
m_model = model;
-
+
return true;
}
bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
}
bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
{
- return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column ) );
+ return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
}
bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
return m_cols.GetCount();
}
-bool wxDataViewCtrlBase::DeleteColumn( size_t pos )
+bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )
{
return false;
}
projects / wxWidgets.git / blobdiff