#include "wx/dataview.h"
#include "wx/spinctrl.h"
-#include "wx/dc.h"
-#include "wx/settings.h"
#ifndef WX_PRECOMP
+ #include "wx/dc.h"
+ #include "wx/settings.h"
#include "wx/log.h"
#include "wx/icon.h"
+ #include "wx/crt.h"
#endif
const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
return (left.GetID() == right.GetID() );
}
+#ifdef __WXDEBUG__
+void wxDataViewItem::Print(const wxString& text) const
+{
+ wxPrintf("item %s: %l\n", text, (long)m_id);
+}
+#endif
// ---------------------------------------------------------
// wxDataViewModelNotifier
// ---------------------------------------------------------
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewModelNotifiers);
+WX_DEFINE_LIST(wxDataViewModelNotifiers)
bool wxDataViewModelNotifier::ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items )
{
size_t i;
for (i = 0; i < count; i++)
if (!ItemAdded( parent, items[i] )) return false;
-
+
return true;
}
size_t i;
for (i = 0; i < count; i++)
if (!ItemDeleted( parent, items[i] )) return false;
-
+
return true;
}
size_t i;
for (i = 0; i < count; i++)
if (!ItemChanged( items[i] )) return false;
-
+
return true;
}
wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
{
- // build initial index
- unsigned int i;
- for (i = 1; i < initial_size+1; i++)
- m_hash.Add( (void*) i );
- m_lastIndex = initial_size + 1;
+#ifndef __WXMAC__
+ m_useHash = false;
+#else
+ m_useHash = true;
+#endif
+
+ if (m_useHash)
+ {
+ // IDs are ordered until an item gets deleted or inserted
+ m_ordered = true;
+
+ // build initial index
+ unsigned int i;
+ for (i = 1; i < initial_size+1; i++)
+ m_hash.Add( (void*) i );
+ m_lastIndex = initial_size + 1;
+ }
+ else
+ {
+ m_lastIndex = initial_size-1;
+ }
}
wxDataViewIndexListModel::~wxDataViewIndexListModel()
void wxDataViewIndexListModel::RowPrepended()
{
- unsigned int id = m_lastIndex++;
- m_hash.Insert( (void*) id, 0 );
- wxDataViewItem item( (void*) id );
- ItemAdded( wxDataViewItem(0), item );
+ if (m_useHash)
+ {
+ m_ordered = false;
+
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( (void*) id, 0 );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
+ }
+ else
+ {
+ m_lastIndex++;
+ wxDataViewItem item( (void*) 0 );
+ ItemAdded( wxDataViewItem(0), item );
+ }
}
void wxDataViewIndexListModel::RowInserted( unsigned int before )
{
- unsigned int id = m_lastIndex++;
- m_hash.Insert( (void*) id, before );
- wxDataViewItem item( (void*) id );
- ItemAdded( wxDataViewItem(0), item );
+ if (m_useHash)
+ {
+ m_ordered = false;
+
+ unsigned int id = m_lastIndex++;
+ m_hash.Insert( (void*) id, before );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
+ }
+ else
+ {
+ m_lastIndex++;
+ wxDataViewItem item( (void*) before );
+ ItemAdded( wxDataViewItem(0), item );
+ }
}
void wxDataViewIndexListModel::RowAppended()
{
- unsigned int id = m_lastIndex++;
- m_hash.Add( (void*) id );
- wxDataViewItem item( (void*) id );
- ItemAdded( wxDataViewItem(0), item );
+ if (m_useHash)
+ {
+ unsigned int id = m_lastIndex++;
+ m_hash.Add( (void*) id );
+ wxDataViewItem item( (void*) id );
+ ItemAdded( wxDataViewItem(0), item );
+ }
+ else
+ {
+ m_lastIndex++;
+ wxDataViewItem item( (void*) m_lastIndex );
+ ItemAdded( wxDataViewItem(0), item );
+ }
}
void wxDataViewIndexListModel::RowDeleted( unsigned int row )
{
- wxDataViewItem item( m_hash[row] );
- wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
- m_hash.RemoveAt( row );
+ if (m_useHash)
+ {
+ wxDataViewItem item( m_hash[row] );
+ wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+ m_hash.RemoveAt( row );
+ }
+ else
+ {
+ wxDataViewItem item( (void*) row );
+ wxDataViewModel::ItemDeleted( wxDataViewItem(0), item );
+ m_lastIndex++;
+ }
}
void wxDataViewIndexListModel::RowChanged( unsigned int row )
unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
{
- // assert for not found
- return (unsigned int) m_hash.Index( item.GetID() );
+ if (m_useHash)
+ {
+ if (m_ordered)
+ {
+ unsigned int pos = wxPtrToUInt( item.GetID() );
+ return pos-1;
+ }
+
+ // assert for not found
+ return (unsigned int) m_hash.Index( item.GetID() );
+ }
+ else
+ {
+ return wxPtrToUInt( item.GetID() );
+ }
}
wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
{
- wxASSERT( row < m_hash.GetCount() );
- return wxDataViewItem( m_hash[row] );
+ if (m_useHash)
+ {
+ wxASSERT( row < m_hash.GetCount() );
+ return wxDataViewItem( m_hash[row] );
+ }
+ else
+ {
+ return wxDataViewItem( (void*) row );
+ }
+}
+
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{
+ return !m_ordered;
}
int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
unsigned int WXUNUSED(column),
bool ascending)
{
+ if (m_ordered || !m_useHash)
+ {
+ unsigned int pos1 = wxPtrToUInt(item1.GetID());
+ unsigned int pos2 = wxPtrToUInt(item2.GetID());
+
+ if (ascending)
+ return pos1 - pos2;
+ else
+ return pos2 - pos1;
+ }
+
if (ascending)
return GetRow(item1) - GetRow(item2);
return SetValue( variant, GetRow(item), col );
}
+bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+ return GetAttr( GetRow(item), col, attr );
+}
+
wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
{
return wxDataViewItem(0);
unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
{
+ if (!m_useHash)
+ return 0; // error
+
if (item.IsOk())
return 0;
// -------------------------------------
wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
- wxDataViewCustomRenderer( "long", mode, alignment )
-{
+ wxDataViewCustomRenderer( "long", mode, alignment )
+{
m_min = min;
m_max = max;
}
-
+
wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
-{
+{
long l = value;
- return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString,
+ return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString,
labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l );
}
-
+
bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
-{
+{
wxSpinCtrl *sc = (wxSpinCtrl*) editor;
long l = sc->GetValue();
value = l;
return true;
}
-
+
bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
{
wxString str;
RenderText( str, 0, rect, dc, state );
return true;
}
-
+
wxSize wxDataViewSpinRenderer::GetSize() const
{
return wxSize(80,16);
}
-
+
bool wxDataViewSpinRenderer::SetValue( const wxVariant &value )
{
m_data = value.GetLong();
return true;
}
-
+
bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const
{
value = m_data;
// wxDataViewTreeStore
//-----------------------------------------------------------------------------
-wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
- wxDataViewTreeStoreNode *parent,
+wxDataViewTreeStoreNode::wxDataViewTreeStoreNode(
+ wxDataViewTreeStoreNode *parent,
const wxString &text, const wxIcon &icon, wxClientData *data )
{
m_parent = parent;
if (m_data)
delete m_data;
}
-
+
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewTreeStoreNodeList);
+WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
-wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
- wxDataViewTreeStoreNode *parent, const wxString &text,
+wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
+ wxDataViewTreeStoreNode *parent, const wxString &text,
const wxIcon &icon, const wxIcon &expanded, wxClientData *data ) :
wxDataViewTreeStoreNode( parent, text, icon, data )
{
delete m_root;
}
-wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
+wxDataViewItem wxDataViewTreeStore::AppendItem( const wxDataViewItem& parent,
const wxString &text, const wxIcon &icon, wxClientData *data )
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
if (!parent_node) return wxDataViewItem(0);
-
- wxDataViewTreeStoreNode *node =
+
+ wxDataViewTreeStoreNode *node =
new wxDataViewTreeStoreNode( parent_node, text, icon, data );
parent_node->GetChildren().Append( node );
-
+
// notify control
ItemAdded( parent, node->GetItem() );
-
+
return node->GetItem();
}
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
if (!parent_node) return wxDataViewItem(0);
-
- wxDataViewTreeStoreNode *node =
+
+ wxDataViewTreeStoreNode *node =
new wxDataViewTreeStoreNode( parent_node, text, icon, data );
parent_node->GetChildren().Insert( node );
-
+
// notify control
ItemAdded( parent, node->GetItem() );
-
+
return node->GetItem();
}
-wxDataViewItem wxDataViewTreeStore::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
- const wxString &text, const wxIcon &icon, wxClientData *data )
+wxDataViewItem
+wxDataViewTreeStore::InsertItem(const wxDataViewItem& WXUNUSED(parent),
+ const wxDataViewItem& WXUNUSED(previous),
+ const wxString& WXUNUSED(text),
+ const wxIcon& WXUNUSED(icon),
+ wxClientData * WXUNUSED(data))
{
return wxDataViewItem(0);
}
-wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent,
- const wxString &text, const wxIcon &icon, const wxIcon &expanded,
+wxDataViewItem wxDataViewTreeStore::PrependContainer( const wxDataViewItem& parent,
+ const wxString &text, const wxIcon &icon, const wxIcon &expanded,
wxClientData *data )
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
if (!parent_node) return wxDataViewItem(0);
-
- wxDataViewTreeStoreContainerNode *node =
+
+ wxDataViewTreeStoreContainerNode *node =
new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
parent_node->GetChildren().Insert( node );
-
+
// notify control
ItemAdded( parent, node->GetItem() );
-
+
return node->GetItem();
}
-wxDataViewItem wxDataViewTreeStore::AppendContainer( const wxDataViewItem& parent,
- const wxString &text, const wxIcon &icon, const wxIcon &expanded,
- wxClientData *data )
+wxDataViewItem
+wxDataViewTreeStore::AppendContainer(const wxDataViewItem& parent,
+ const wxString &text,
+ const wxIcon& icon,
+ const wxIcon& expanded,
+ wxClientData * data)
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
if (!parent_node) return wxDataViewItem(0);
-
- wxDataViewTreeStoreContainerNode *node =
+
+ wxDataViewTreeStoreContainerNode *node =
new wxDataViewTreeStoreContainerNode( parent_node, text, icon, expanded, data );
parent_node->GetChildren().Append( node );
-
+
// notify control
ItemAdded( parent, node->GetItem() );
-
+
return node->GetItem();
}
-wxDataViewItem wxDataViewTreeStore::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
- const wxString &text, const wxIcon &icon, const wxIcon &expanded,
- wxClientData *data )
+wxDataViewItem
+wxDataViewTreeStore::InsertContainer(const wxDataViewItem& WXUNUSED(parent),
+ const wxDataViewItem& WXUNUSED(previous),
+ const wxString& WXUNUSED(text),
+ const wxIcon& WXUNUSED(icon),
+ const wxIcon& WXUNUSED(expanded),
+ wxClientData * WXUNUSED(data))
{
return wxDataViewItem(0);
}
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
if (!parent_node) return wxDataViewItem(0);
-
+
wxDataViewTreeStoreNodeList::compatibility_iterator node = parent_node->GetChildren().Item( pos );
if (node)
return node->GetData();
-
+
return wxDataViewItem(0);
}
{
wxDataViewTreeStoreNode *node = FindNode( parent );
if (!node) return -1;
-
+
if (!node->IsContainer())
return 0;
-
+
wxDataViewTreeStoreContainerNode *container_node = (wxDataViewTreeStoreContainerNode*) node;
- return (int) container_node->GetChildren().GetCount();
+ return (int) container_node->GetChildren().GetCount();
}
void wxDataViewTreeStore::SetItemText( const wxDataViewItem& item, const wxString &text )
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
-
+
node->SetText( text );
-
+
// notify control
ValueChanged( item, 0 );
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return wxEmptyString;
-
+
return node->GetText();
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
-
+
node->SetIcon( icon );
-
+
// notify control
ValueChanged( item, 0 );
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return wxNullIcon;
-
+
return node->GetIcon();
}
{
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
if (!node) return;
-
+
node->SetExpandedIcon( icon );
-
+
// notify control
ValueChanged( item, 0 );
}
{
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
if (!node) return wxNullIcon;
-
+
return node->GetExpandedIcon();
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
-
+
node->SetData( data );
-
+
// notify control? only sensible when sorting on client data
// ValueChanged( item, 0 );
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return NULL;
-
+
return node->GetData();
}
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent_item );
if (!parent_node) return;
-
+
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
if (!node) return;
-
+
parent_node->GetChildren().DeleteObject( node );
-
+
// notify control
ItemDeleted( parent_item, item );
}
{
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
if (!node) return;
-
+
wxDataViewItemArray array;
wxDataViewTreeStoreNodeList::iterator iter;
for (iter = node->GetChildren().begin(); iter != node->GetChildren().end(); iter++)
wxDataViewTreeStoreNode* child = *iter;
array.Add( child->GetItem() );
}
-
+
node->GetChildren().clear();
-
+
// notify control
ItemsDeleted( item, array );
}
// TODO
}
-void wxDataViewTreeStore::GetValue( wxVariant &variant,
- const wxDataViewItem &item, unsigned int col ) const
+void
+wxDataViewTreeStore::GetValue(wxVariant &variant,
+ const wxDataViewItem &item,
+ unsigned int WXUNUSED(col)) const
{
// if (col != 0) return;
-
+
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
-
+
wxDataViewIconText data( node->GetText(), node->GetIcon() );
-
+
variant << data;
}
-bool wxDataViewTreeStore::SetValue( const wxVariant &variant,
- const wxDataViewItem &item, unsigned int col )
+bool
+wxDataViewTreeStore::SetValue(const wxVariant& variant,
+ const wxDataViewItem& item,
+ unsigned int WXUNUSED(col))
{
// if (col != 0) return false;
-
+
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return false;
-
+
wxDataViewIconText data;
-
+
data << variant;
-
+
node->SetText( data.GetText() );
node->SetIcon( data.GetIcon() );
-
+
return true;
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return wxDataViewItem(0);
-
+
wxDataViewTreeStoreNode *parent = node->GetParent();
if (!parent) return wxDataViewItem(0);
-
+
if (parent == m_root)
return wxDataViewItem(0);
-
+
return parent->GetItem();
}
{
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return false;
-
+
return node->IsContainer();
}
wxDataViewTreeStoreNode* child = *iter;
children.Add( child->GetItem() );
}
-
+
return node->GetChildren().GetCount();
}
-int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+int wxDataViewTreeStore::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int WXUNUSED(column), bool WXUNUSED(ascending) )
{
wxDataViewTreeStoreNode *node1 = FindNode( item1 );
wxDataViewTreeStoreNode *node2 = FindNode( item2 );
-
+
if (!node1 || !node2)
return 0;
-
- wxDataViewTreeStoreContainerNode* parent1 =
+
+ wxDataViewTreeStoreContainerNode* parent1 =
(wxDataViewTreeStoreContainerNode*) node1->GetParent();
- wxDataViewTreeStoreContainerNode* parent2 =
+ wxDataViewTreeStoreContainerNode* parent2 =
(wxDataViewTreeStoreContainerNode*) node2->GetParent();
-
+
if (parent1 != parent2)
{
wxLogError( wxT("Comparing items with different parent.") );
return 0;
}
-
+
if (node1->IsContainer() && !!node2->IsContainer())
return 1;
-
+
if (node2->IsContainer() && !!node1->IsContainer())
return -1;
-
+
return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 );
}
{
if (!item.IsOk())
return m_root;
-
+
return (wxDataViewTreeStoreNode*) item.GetID();
}
return (wxDataViewTreeStoreContainerNode*) m_root;
wxDataViewTreeStoreNode* node = (wxDataViewTreeStoreNode*) item.GetID();
-
+
if (!node->IsContainer())
return NULL;
-
+
return (wxDataViewTreeStoreContainerNode*) node;
}
-#endif
+#endif // wxUSE_DATAVIEWCTRL
projects / wxWidgets.git / blobdiff