#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(wxT("item %s: %l\n"), text.GetData(), (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 )
{
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::Reset( unsigned int new_size )
+{
+ if (m_useHash)
+ {
+ m_hash.Clear();
+
+ // IDs are ordered until an item gets deleted or inserted
+ m_ordered = true;
+
+ // build initial index
+ unsigned int i;
+ for (i = 1; i < new_size+1; i++)
+ m_hash.Add( (void*) i );
+ m_lastIndex = new_size + 1;
+ }
+ else
+ {
+ m_lastIndex = new_size-1;
+ }
+
+ wxDataViewModel::Cleared();
+}
+
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)
+ {
+ m_ordered = false;
+
+ 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++;
+ }
+}
+
+static int my_sort( int *v1, int *v2 )
+{
+ return *v2-*v1;
+}
+
+void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows )
+{
+ wxArrayInt sorted = rows;
+ sorted.Sort( my_sort );
+
+ if (m_useHash)
+ {
+ m_ordered = false;
+
+ wxDataViewItemArray array;
+ unsigned int i;
+ for (i = 0; i < rows.GetCount(); i++)
+ {
+ wxDataViewItem item( m_hash[rows[i]] );
+ array.Add( item );
+ }
+ wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+
+ for (i = 0; i < sorted.GetCount(); i++)
+ m_hash.RemoveAt( sorted[i] );
+ }
+ else
+ {
+ wxDataViewItemArray array;
+ unsigned int i;
+ for (i = 0; i < sorted.GetCount(); i++)
+ {
+ wxDataViewItem item( (void*) sorted[i] );
+ array.Add( item );
+ }
+ wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array );
+
+ m_lastIndex -= rows.GetCount();
+ }
}
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;
children = m_hash;
-
+
return m_hash.GetCount();
}
SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
+ SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0);
}
// ---------------------------------------------------------
return m_model;
}
+const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
+{
+ return m_model;
+}
+
wxDataViewColumn *
wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU)
+
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_COLUMN_REORDERED)
// -------------------------------------
// -------------------------------------
wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) :
- wxDataViewCustomRenderer( "long", mode, alignment )
+ wxDataViewCustomRenderer(wxT("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,
- labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l );
+ wxSize size = labelRect.GetSize();
+#ifdef __WXMAC__
+ size = wxSize( wxMax(70,labelRect.width ), -1 );
+#endif
+ wxString str;
+ str.Printf( wxT("%d\n"), (int) l );
+ wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
+ labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l );
+#ifdef __WXMAC__
+ size = sc->GetSize();
+ wxPoint pt = sc->GetPosition();
+ sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
+#endif
+
+ return sc;
}
bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state )
{
wxString str;
- str.Printf( "%d", (int) m_data );
+ str.Printf(wxT("%d"), (int) m_data );
RenderText( str, 0, rect, dc, state );
return true;
}
}
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxDataViewTreeStoreNodeList);
+WX_DEFINE_LIST(wxDataViewTreeStoreNodeList)
wxDataViewTreeStoreContainerNode::wxDataViewTreeStoreContainerNode(
wxDataViewTreeStoreNode *parent, const wxString &text,
wxDataViewTreeStoreNode( parent, text, icon, data )
{
m_iconExpanded = expanded;
+ m_isExpanded = false;
m_children.DeleteContents(true);
}
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
- wxDataViewIconText data( node->GetText(), node->GetIcon() );
+ wxIcon icon( node->GetIcon());
+ if (node->IsContainer())
+ {
+ wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node;
+ if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
+ icon = container->GetExpandedIcon();
+ }
+
+ wxDataViewIconText data( node->GetText(), icon );
variant << data;
}
return (wxDataViewTreeStoreContainerNode*) node;
}
+//-----------------------------------------------------------------------------
+// wxDataViewTreeCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl)
+
+BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
+ EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded)
+ EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed)
+ EVT_SIZE( wxDataViewTreeCtrl::OnSize )
+END_EVENT_TABLE()
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl()
+{
+ m_imageList = NULL;
+}
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+ m_imageList = NULL;
+ Create( parent, id, pos, size, style, validator );
+
+ wxDataViewTreeStore *store = new wxDataViewTreeStore;
+ AssociateModel( store );
+ store->DecRef();
+
+ AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
+}
+
+wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
+{
+ if (m_imageList)
+ delete m_imageList;
+}
+
+bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+ return wxDataViewCtrl::Create( parent, id, pos, size, style, validator );
+}
+
+void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
+{
+ if (m_imageList)
+ delete m_imageList;
+
+ m_imageList = imagelist;
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->AppendItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->PrependItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->InsertItem( parent, previous, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->PrependContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->AppendContainer( parent, text, icon, expanded, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ wxIcon expanded = wxNullIcon;
+ if (m_imageList && (expandedIndex != -1))
+ expanded = m_imageList->GetIcon( expandedIndex );
+
+ return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data );
+}
+
+void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event )
+{
+ if (m_imageList) return;
+
+ wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+ if (!container) return;
+
+ container->SetExpanded( true );
+ GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event )
+{
+ if (m_imageList) return;
+
+ wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() );
+ if (!container) return;
+
+ container->SetExpanded( false );
+ GetStore()->ItemChanged( event.GetItem() );
+}
+
+void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
+{
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+ wxSize size = GetClientSize();
+ wxDataViewColumn *col = GetColumn( 0 );
+ if (col)
+ col->SetWidth( size.x );
+#endif
+ event.Skip( true );
+}
+
#endif // wxUSE_DATAVIEWCTRL
projects / wxWidgets.git / blobdiff