X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d52aad39a4e3b52c5baa50b9cc55caaf91bb026..9b49405777342458dc1666001865eef7309b6c30:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index ffe43b2b1e..afe948e080 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2,7 +2,7 @@ // Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling -// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss +// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence @@ -34,6 +34,7 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/dcscreen.h" + #include "wx/frame.h" #endif #include "wx/stockitem.h" @@ -42,6 +43,11 @@ #include "wx/renderer.h" #include "wx/dcbuffer.h" #include "wx/icon.h" +#include "wx/list.h" +#include "wx/listimpl.cpp" +#include "wx/imaglist.h" +#include "wx/headerctrl.h" +#include "wx/dnd.h" //----------------------------------------------------------------------------- // classes @@ -54,185 +60,153 @@ static const int SCROLL_UNIT_X = 15; // the cell padding on the left/right static const int PADDING_RIGHTLEFT = 3; -// the cell padding on the top/bottom -static const int PADDING_TOPBOTTOM = 1; - // the expander space margin static const int EXPANDER_MARGIN = 4; +#ifdef __WXMSW__ +static const int EXPANDER_OFFSET = 4; +#else +static const int EXPANDER_OFFSET = 1; +#endif + +// Below is the compare stuff. +// For the generic implementation, both the leaf nodes and the nodes are sorted for +// fast search when needed +static wxDataViewModel* g_model; +static int g_column = -2; +static bool g_asending = true; + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 1 - -// NB: for some reason, this class must be dllexport'ed or we get warnings from -// MSVC in DLL build -class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl +class wxDataViewHeaderWindow : public wxHeaderCtrl { public: - wxDataViewHeaderWindowBase() - { m_owner = NULL; } - - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name) + wxDataViewHeaderWindow(wxDataViewCtrl *parent) + : wxHeaderCtrl(parent) { - return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name); } - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } - - // called on column addition/removal - virtual void UpdateDisplay() { /* by default, do nothing */ } - - // returns the n-th column - virtual wxDataViewColumn *GetColumn(unsigned int n) - { - wxASSERT(m_owner); - wxDataViewColumn *ret = m_owner->GetColumn(n); - wxASSERT(ret); - - return ret; - } + wxDataViewCtrl *GetOwner() const + { return static_cast(GetParent()); } protected: - wxDataViewCtrl *m_owner; - - // sends an event generated from the n-th wxDataViewColumn - void SendEvent(wxEventType type, unsigned int n); -}; - -// on wxMSW the header window (only that part however) can be made native! -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW - -#define COLUMN_WIDTH_OFFSET 2 -#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow - -class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase -{ -public: - - wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + // implement/override wxHeaderCtrl functions by forwarding them to the main + // control + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const { - Create(parent, id, pos, size, name); + return *(GetOwner()->GetColumn(idx)); } - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name); - - ~wxDataViewHeaderWindowMSW(); - - // called when any column setting is changed and/or changed - // the column count - virtual void UpdateDisplay(); - - // called when the main window gets scrolled - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); - -protected: - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + // FIXME: currently unused + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) + { + wxDataViewCtrl * const owner = GetOwner(); - unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); + int widthContents = owner->GetBestColumnWidth(idx); + owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents)); + owner->OnColumnChange(idx); - wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) - { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + return true; + } private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) -}; - -#else // !defined(__WXMSW__) - -#define HEADER_WINDOW_HEIGHT 25 -#define HEADER_HORIZ_BORDER 5 -#define HEADER_VERT_BORDER 3 -#define wxGenericDataViewHeaderWindow wxDataViewHeaderWindow - -class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase -{ -public: - wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + bool SendEvent(wxEventType type, unsigned int n) { - Init(); - Create(parent, id, pos, size, name); - } + wxDataViewCtrl * const owner = GetOwner(); + wxDataViewEvent event(type, owner->GetId()); - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name); + event.SetEventObject(owner); + event.SetColumn(n); + event.SetDataViewColumn(owner->GetColumn(n)); + event.SetModel(owner->GetModel()); - ~wxGenericDataViewHeaderWindow() - { - delete m_resizeCursor; + // for events created by wxDataViewHeaderWindow the + // row / value fields are not valid + return owner->GetEventHandler()->ProcessEvent(event); } - virtual void UpdateDisplay() { Refresh(); } - - // event handlers: - - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - - -protected: + void OnClick(wxHeaderCtrlEvent& event) + { + const unsigned idx = event.GetColumn(); - // vars used for column resizing: + if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) + return; - wxCursor *m_resizeCursor; - const wxCursor *m_currentCursor; - bool m_isDragging; + // default handling for the column click is to sort by this column or + // toggle its sort order + wxDataViewCtrl * const owner = GetOwner(); + wxDataViewColumn * const col = owner->GetColumn(idx); + if ( !col->IsSortable() ) + { + // no default handling for non-sortable columns + event.Skip(); + return; + } - bool m_dirty; // needs refresh? - int m_column; // index of the column being resized - int m_currentX; // divider line position in logical (unscrolled) coords - int m_minX; // minimal position beyond which the divider line - // can't be dragged in logical coords + if ( col->IsSortKey() ) + { + // already using this column for sorting, just change the order + col->ToggleSortOrder(); + } + else // not using this column for sorting yet + { + // first unset the old sort column if any + int oldSortKey = owner->GetSortingColumnIndex(); + if ( oldSortKey != wxNOT_FOUND ) + { + owner->GetColumn(oldSortKey)->UnsetAsSortKey(); + owner->OnColumnChange(oldSortKey); + } - // the pen used to draw the current column width drag line - // when resizing the columsn - wxPen m_penCurrent; + owner->SetSortingColumnIndex(idx); + col->SetAsSortKey(); + } + wxDataViewModel * const model = owner->GetModel(); + if ( model ) + model->Resort(); - // internal utilities: + owner->OnColumnChange(idx); + } - void Init() + void OnRClick(wxHeaderCtrlEvent& event) { - m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - - m_isDragging = false; - m_dirty = false; + if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, + event.GetColumn()) ) + event.Skip(); + } - m_column = wxNOT_FOUND; - m_currentX = 0; - m_minX = 0; + void OnResize(wxHeaderCtrlEvent& event) + { + wxDataViewCtrl * const owner = GetOwner(); - wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - m_penCurrent = wxPen(col, 1, wxSOLID); + const unsigned col = event.GetColumn(); + owner->GetColumn(col)->SetWidth(event.GetWidth()); + GetOwner()->OnColumnChange(col); } - void DrawCurrent(); - void AdjustDC(wxDC& dc); + void OnEndReorder(wxHeaderCtrlEvent& event) + { + wxDataViewCtrl * const owner = GetOwner(); + owner->ColumnMoved(owner->GetColumn(event.GetColumn()), + event.GetNewOrder()); + } -private: - DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow) DECLARE_EVENT_TABLE() + wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow); }; -#endif // defined(__WXMSW__) +BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl) + EVT_HEADER_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnClick) + EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxDataViewHeaderWindow::OnRClick) + + EVT_HEADER_RESIZING(wxID_ANY, wxDataViewHeaderWindow::OnResize) + EVT_HEADER_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnResize) + + EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder) +END_EVENT_TABLE() //----------------------------------------------------------------------------- // wxDataViewRenameTimer @@ -251,67 +225,152 @@ public: //----------------------------------------------------------------------------- // wxDataViewTreeNode //----------------------------------------------------------------------------- -class wxDataViewTreeNode; -WX_DEFINE_ARRAY_PTR( wxDataViewTreeNode *, wxDataViewTreeNodes ); + +class wxDataViewTreeNode; +WX_DEFINE_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); +WX_DEFINE_ARRAY( void* , wxDataViewTreeLeaves); + +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, + wxDataViewTreeNode ** node2); +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2); class wxDataViewTreeNode { public: - wxDataViewTreeNode( wxDataViewTreeNode * parent ) - { this->parent = parent; - if( parent == NULL ) - open = true; - else - open = false; - hasChildren = false; - } - //I don't know what I need to do in the destructure + wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) + { + m_parent = parent; + if (!parent) + m_open = true; + else + m_open = false; + m_hasChildren = false; + m_subTreeCount = 0; + } + ~wxDataViewTreeNode() - { } + { + } + + wxDataViewTreeNode * GetParent() const { return m_parent; } + void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } + wxDataViewTreeNodes & GetNodes() { return m_nodes; } + wxDataViewTreeLeaves & GetChildren() { return m_leaves; } + + void AddNode( wxDataViewTreeNode * node ) + { + m_leaves.Add( node->GetItem().GetID() ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + m_nodes.Add( node ); + if (g_column >= -1) + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + } + void AddLeaf( void * leaf ) + { + m_leaves.Add( leaf ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + } + + wxDataViewItem & GetItem() { return m_item; } + const wxDataViewItem & GetItem() const { return m_item; } + void SetItem( const wxDataViewItem & item ) { m_item = item; } + + unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); } + unsigned int GetNodeNumber() const { return m_nodes.GetCount(); } + int GetIndentLevel() const + { + int ret = 0; + const wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; + } + + bool IsOpen() const + { + return m_open; + } - wxDataViewTreeNode * GetParent() { return parent; } - void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; } - wxDataViewTreeNodes & GetChildren() { return children; } - void SetChildren( wxDataViewTreeNodes children ) { this->children = children; } + void ToggleOpen() + { + int len = m_nodes.GetCount(); + int sum = 0; + for ( int i = 0;i < len; i ++) + sum += m_nodes[i]->GetSubTreeCount(); - wxDataViewTreeNode * GetChild( unsigned int n ) { return children.Item( n ); } - void InsertChild( wxDataViewTreeNode * child, unsigned int n) { children.Insert( child, n); } - void AppendChild( wxDataViewTreeNode * child ) { children.Add( child ); } + sum += m_leaves.GetCount(); + if (m_open) + { + ChangeSubTreeCount(-sum); + m_open = !m_open; + } + else + { + m_open = !m_open; + ChangeSubTreeCount(sum); + } + } + bool HasChildren() const { return m_hasChildren; } + void SetHasChildren( bool has ){ m_hasChildren = has; } - wxDataViewItem & GetItem() { return item; } - void SetItem( wxDataViewItem & item ) { this->item = item; } + void SetSubTreeCount( int num ) { m_subTreeCount = num; } + int GetSubTreeCount() const { return m_subTreeCount; } + void ChangeSubTreeCount( int num ) + { + if( !m_open ) + return; + m_subTreeCount += num; + if( m_parent ) + m_parent->ChangeSubTreeCount(num); + } - unsigned int GetChildrenNumber() { return children.GetCount(); } - int GetIndentLevel() + void Resort() { - int ret = 0 ; - wxDataViewTreeNode * node = this; - while( node->GetParent()->GetParent() != NULL ) - { - node = node->GetParent(); - ret ++; - } - return ret; + if (g_column >= -1) + { + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = m_nodes.GetCount(); + for (int i = 0; i < len; i ++) + m_nodes[i]->Resort(); + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + } } - bool IsOpen() { return open; } - void ToggleOpen(){ open = !open; } - bool HasChildren() { return hasChildren; } - void SetHasChildren( bool has ){ hasChildren = has; } private: - wxDataViewTreeNode * parent; - wxDataViewTreeNodes children; - wxDataViewItem item; - bool open; - bool hasChildren; + wxDataViewTreeNode *m_parent; + wxDataViewTreeNodes m_nodes; + wxDataViewTreeLeaves m_leaves; + wxDataViewItem m_item; + bool m_open; + bool m_hasChildren; + int m_subTreeCount; }; +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, + wxDataViewTreeNode ** node2) +{ + return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending ); +} + +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2) +{ + return g_model->Compare( *id1, *id2, g_column, g_asending ); +} + + //----------------------------------------------------------------------------- // wxDataViewMainWindow //----------------------------------------------------------------------------- WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); +WX_DECLARE_LIST(wxDataViewItem, ItemList); +WX_DEFINE_LIST(ItemList) class wxDataViewMainWindow: public wxWindow { @@ -323,17 +382,49 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); + bool IsVirtualList() const { return m_root == NULL; } + // notifications from wxDataViewModel bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); - bool ItemDeleted( const wxDataViewItem &item ); + bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemChanged( const wxDataViewItem &item ); bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); + void Resort() + { + if (!IsVirtualList()) + { + SortPrepare(); + m_root->Resort(); + } + UpdateDisplay(); + } + + void SortPrepare() + { + g_model = GetOwner()->GetModel(); + wxDataViewColumn* col = GetOwner()->GetSortingColumn(); + if( !col ) + { + if (g_model->HasDefaultCompare()) + g_column = -1; + else + g_column = -2; + + g_asending = true; + return; + } + g_column = col->GetModelColumn(); + g_asending = col->IsSortOrderAscending(); + } void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } +#if wxUSE_DRAG_AND_DROP + wxBitmap CreateItemBitmap( unsigned int row, int &indent ); +#endif // wxUSE_DRAG_AND_DROP void OnPaint( wxPaintEvent &event ); void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); void OnChar( wxKeyEvent &event ); @@ -348,6 +439,7 @@ public: void OnRenameTimer(); void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); + void ScrollTo( int rows, int column ); bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); @@ -358,18 +450,24 @@ public: int GetCountPerPage() const; int GetEndOfLastCol() const; unsigned int GetFirstVisibleRow() const; - //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes - unsigned int GetLastVisibleRow(); - unsigned int GetRowCount() ; - wxDataViewItem GetSelection(); + // I change this method to un const because in the tree view, + // the displaying number of the tree are changing along with the + // expanding/collapsing of the tree nodes + unsigned int GetLastVisibleRow(); + unsigned int GetRowCount(); + wxDataViewItem GetSelection() const; + wxDataViewSelection GetSelections(){ return m_selection; } + void SetSelections( const wxDataViewSelection & sel ) + { m_selection = sel; UpdateDisplay(); } void Select( const wxArrayInt& aSelections ); void SelectAllRows( bool on ); void SelectRow( unsigned int row, bool on ); void SelectRows( unsigned int from, unsigned int to, bool on ); void ReverseRowSelection( unsigned int row ); bool IsRowSelected( unsigned int row ); + void SendSelectionChangedEvent( const wxDataViewItem& item); void RefreshRow( unsigned int row ); void RefreshRows( unsigned int from, unsigned int to ); @@ -381,25 +479,48 @@ public: return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); } - //void EnsureVisible( unsigned int row ); wxRect GetLineRect( unsigned int row ) const; - //Some useful functions for row and item mapping - wxDataViewItem GetItemByRow( unsigned int row ); - unsigned int GetRowByItem( const wxDataViewItem & item ); + int GetLineStart( unsigned int row ) const; // row * m_lineHeight in fixed mode + int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode + int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode + + // Some useful functions for row and item mapping + wxDataViewItem GetItemByRow( unsigned int row ) const; + int GetRowByItem( const wxDataViewItem & item ) const; - //Methods for building the mapping tree + // Methods for building the mapping tree void BuildTree( wxDataViewModel * model ); void DestroyTree(); + void HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ); + wxRect GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ); + + void Expand( unsigned int row ); + void Collapse( unsigned int row ); + bool IsExpanded( unsigned int row ) const; + bool HasChildren( unsigned int row ) const; + +#if wxUSE_DRAG_AND_DROP + bool EnableDragSource( const wxDataFormat &format ); + bool EnableDropTarget( const wxDataFormat &format ); + + void RemoveDropHint(); + wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); + bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y ); + wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); + void OnLeave(); +#endif // wxUSE_DRAG_AND_DROP + private: - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); - //We did not need this temporarily - //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; + // We did not need this temporarily + // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); - int RecalculateCount() ; + int RecalculateCount(); - void OnExpanding( unsigned int row ); - void OnCollapsing( unsigned int row ); + wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); + + wxDataViewTreeNode * FindNode( const wxDataViewItem & item ); private: wxDataViewCtrl *m_owner; @@ -415,13 +536,23 @@ private: bool m_hasFocus; +#if wxUSE_DRAG_AND_DROP int m_dragCount; wxPoint m_dragStart; + bool m_dragEnabled; + wxDataFormat m_dragFormat; + + bool m_dropEnabled; + wxDataFormat m_dropFormat; + bool m_dropHint; + unsigned int m_dropHintLine; +#endif // wxUSE_DRAG_AND_DROP + // for double click logic unsigned int m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; + m_lineBeforeLastClicked, + m_lineSelectSingleOnUp; // the pen used to draw horiz/vertical rules wxPen m_penRule; @@ -429,9 +560,13 @@ private: // the pen used to draw the expander and the lines wxPen m_penExpander; - //This is the tree structure of the model - wxDataViewTreeNode * m_root; + // This is the tree structure of the model + wxDataViewTreeNode * m_root; int m_count; + + // This is the tree node under the cursor + wxDataViewTreeNode * m_underMouse; + private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() @@ -449,14 +584,16 @@ public: virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) { return m_mainWindow->ItemAdded( parent , item ); } - virtual bool ItemDeleted( const wxDataViewItem & item ) - { return m_mainWindow->ItemDeleted( item ); } + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) + { return m_mainWindow->ItemDeleted( parent, item ); } virtual bool ItemChanged( const wxDataViewItem & item ) { return m_mainWindow->ItemChanged(item); } virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) { return m_mainWindow->ValueChanged( item, col ); } virtual bool Cleared() { return m_mainWindow->Cleared(); } + virtual void Resort() + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -475,6 +612,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, m_dc = NULL; m_align = align; m_mode = mode; + m_wantsAttr = false; + m_hasAttr = false; } wxDataViewRenderer::~wxDataViewRenderer() @@ -497,6 +636,29 @@ wxDC *wxDataViewRenderer::GetDC() return m_dc; } +void wxDataViewRenderer::SetAlignment( int align ) +{ + m_align=align; +} + +int wxDataViewRenderer::GetAlignment() const +{ + return m_align; +} + +int wxDataViewRenderer::CalculateAlignment() const +{ + if (m_align == wxDVR_DEFAULT_ALIGNMENT) + { + if (GetOwner() == NULL) + return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; + + return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; + } + + return m_align; +} + // --------------------------------------------------------- // wxDataViewCustomRenderer // --------------------------------------------------------- @@ -504,11 +666,24 @@ wxDC *wxDataViewRenderer::GetDC() IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : + wxDataViewCellMode mode, int align ) : wxDataViewRenderer( varianttype, mode, align ) { } +void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, + wxRect cell, wxDC *dc, int state ) +{ + wxDataViewCtrl *view = GetOwner()->GetOwner(); + wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? + wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : + view->GetForegroundColour(); + dc->SetTextForeground(col); + dc->DrawText( text, + cell.x + xoffset, + cell.y + ((cell.height - dc->GetCharHeight()) / 2)); +} + // --------------------------------------------------------- // wxDataViewTextRenderer // --------------------------------------------------------- @@ -533,17 +708,17 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const return false; } -bool wxDataViewTextRenderer::HasEditorCtrl() -{ +bool wxDataViewTextRenderer::HasEditorCtrl() const +{ return true; } wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { - return new wxTextCtrl( parent, wxID_ANY, value, - wxPoint(labelRect.x,labelRect.y), - wxSize(labelRect.width,labelRect.height) ); + return new wxTextCtrl( parent, wxID_ANY, value, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); } bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) @@ -555,14 +730,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - - dc->SetTextForeground(col); - dc->DrawText( m_text, cell.x, cell.y ); - + RenderText( m_text, 0, cell, dc, state ); return true; } @@ -570,14 +738,64 @@ wxSize wxDataViewTextRenderer::GetSize() const { const wxDataViewCtrl *view = GetView(); if (!m_text.empty()) + return view->wxWindowBase::GetTextExtent( m_text ); + return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); +} + +// --------------------------------------------------------- +// wxDataViewTextRendererAttr +// --------------------------------------------------------- + +IMPLEMENT_CLASS(wxDataViewTextRendererAttr, wxDataViewTextRenderer) + +wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype, + wxDataViewCellMode mode, int align ) : + wxDataViewTextRenderer( varianttype, mode, align ) +{ + m_wantsAttr = true; +} + +bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +{ + wxFont font; + wxColour colour; + + if (m_hasAttr) { - int x,y; - view->GetTextExtent( m_text, &x, &y ); - return wxSize( x, y ); + if (m_attr.HasColour()) + { + colour = dc->GetTextForeground(); + dc->SetTextForeground( m_attr.GetColour() ); + } + + if (m_attr.GetBold() || m_attr.GetItalic()) + { + font = dc->GetFont(); + wxFont myfont = font; + if (m_attr.GetBold()) + myfont.SetWeight( wxFONTWEIGHT_BOLD ); + if (m_attr.GetItalic()) + myfont.SetStyle( wxFONTSTYLE_ITALIC ); + dc->SetFont( myfont ); + } } - return wxSize(80,20); + + dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2)); + + // restore dc + if (m_hasAttr) + { + if (m_attr.HasColour()) + dc->SetTextForeground( colour ); + + if (m_attr.GetBold() || m_attr.GetItalic()) + dc->SetFont( font ); + } + + return true; } + // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- @@ -622,7 +840,7 @@ wxSize wxDataViewBitmapRenderer::GetSize() const else if (m_icon.Ok()) return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); - return wxSize(16,16); + return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); } // --------------------------------------------------------- @@ -652,14 +870,6 @@ bool wxDataViewToggleRenderer::GetValue( wxVariant &WXUNUSED(value) ) const bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - // User wxRenderer here - - wxRect rect; - rect.x = cell.x + cell.width/2 - 10; - rect.width = 20; - rect.y = cell.y + cell.height/2 - 10; - rect.height = 20; - int flags = 0; if (m_toggle) flags |= wxCONTROL_CHECKED; @@ -669,15 +879,15 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state wxRendererNative::Get().DrawCheckBox( GetOwner()->GetOwner(), *dc, - rect, + cell, flags ); return true; } bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col) + wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col) { bool value = !m_toggle; wxVariant variant = value; @@ -688,7 +898,9 @@ bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), wxSize wxDataViewToggleRenderer::GetSize() const { - return wxSize(20,20); + // the window parameter is not used by GetCheckBoxSize() so it's + // safe to pass NULL + return wxRendererNative::Get().GetCheckBoxSize(NULL); } // --------------------------------------------------------- @@ -823,12 +1035,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const return true; } -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) { - dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); - dc->DrawText( tmp, cell.x, cell.y ); - + RenderText( tmp, 0, cell, dc, state ); return true; } @@ -842,7 +1052,7 @@ wxSize wxDataViewDateRenderer::GetSize() const } bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col ) + const wxDataViewItem & item, unsigned int col ) { wxVariant variant; model->GetValue( variant, item, col ); @@ -862,809 +1072,860 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m } // --------------------------------------------------------- -// wxDataViewColumn +// wxDataViewIconTextRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) +IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, - unsigned int model_column, - int width, wxAlignment align, int flags ) : - wxDataViewColumnBase( title, cell, model_column, width, align, flags ) +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( +const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { + SetMode(mode); SetAlignment(align); - SetTitle(title); - SetFlags(flags); - - Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } -wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, - unsigned int model_column, - int width, wxAlignment align, int flags ) : - wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags ) +wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() { - SetAlignment(align); - SetFlags(flags); - - Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width); } -wxDataViewColumn::~wxDataViewColumn() +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { + m_value << value; + return true; } -void wxDataViewColumn::Init( int width ) +bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { - m_width = width; - m_minWidth = wxDVC_DEFAULT_MINWIDTH; - m_ascending = true; + return false; } -void wxDataViewColumn::SetResizeable( bool resizeable ) +bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - if (resizeable) - m_flags |= wxDATAVIEW_COL_RESIZABLE; - else - m_flags &= ~wxDATAVIEW_COL_RESIZABLE; -} + int xoffset = 0; + const wxIcon &icon = m_value.GetIcon(); + if (icon.IsOk()) + { + dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2)); + xoffset = icon.GetWidth()+4; + } -void wxDataViewColumn::SetHidden( bool hidden ) -{ - if (hidden) - m_flags |= wxDATAVIEW_COL_HIDDEN; - else - m_flags &= ~wxDATAVIEW_COL_HIDDEN; + RenderText( m_value.GetText(), xoffset, cell, dc, state ); - // tell our owner to e.g. update its scrollbars: - if (GetOwner()) - GetOwner()->OnColumnChange(); + return true; } -void wxDataViewColumn::SetSortable( bool sortable ) +wxSize wxDataViewIconTextRenderer::GetSize() const { - if (sortable) - m_flags |= wxDATAVIEW_COL_SORTABLE; - else - m_flags &= ~wxDATAVIEW_COL_SORTABLE; - - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); -} + const wxDataViewCtrl *view = GetView(); + if (!m_value.GetText().empty()) + { + int x,y; + view->GetTextExtent( m_value.GetText(), &x, &y ); -void wxDataViewColumn::SetSortOrder( bool ascending ) -{ - m_ascending = ascending; - - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); + if (m_value.GetIcon().IsOk()) + x += m_value.GetIcon().GetWidth() + 4; + return wxSize( x, y ); + } + return wxSize(80,20); } -bool wxDataViewColumn::IsSortOrderAscending() const +wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) { - return m_ascending; -} + wxDataViewIconText iconText; + iconText << value; -void wxDataViewColumn::SetInternalWidth( int width ) -{ - m_width = width; + wxString text = iconText.GetText(); + + // adjust the label rect to take the width of the icon into account + if (iconText.GetIcon().IsOk()) + { + int w = iconText.GetIcon().GetWidth() + 4; + labelRect.x += w; + labelRect.width -= w; + } - // the scrollbars of the wxDataViewCtrl needs to be recalculated! - if (m_owner && m_owner->m_clientArea) - m_owner->m_clientArea->RecalculateDisplay(); + return new wxTextCtrl( parent, wxID_ANY, text, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); } -void wxDataViewColumn::SetWidth( int width ) +bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value ) { - m_owner->m_headerArea->UpdateDisplay(); + wxTextCtrl *text = (wxTextCtrl*) editor; - SetInternalWidth(width); + wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon()); + value << iconText; + return true; } - //----------------------------------------------------------------------------- -// wxDataViewHeaderWindowBase +// wxDataViewDropTarget //----------------------------------------------------------------------------- -void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) -{ - wxWindow *parent = GetParent(); - wxDataViewEvent le(type, parent->GetId()); +#if wxUSE_DRAG_AND_DROP - le.SetEventObject(parent); - le.SetColumn(n); - le.SetDataViewColumn(GetColumn(n)); - le.SetModel(GetOwner()->GetModel()); +class wxBitmapCanvas: public wxWindow +{ +public: + wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) : + wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) + { + m_bitmap = bitmap; + Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); + } - // for events created by wxDataViewHeaderWindow the - // row / value fields are not valid + void OnPaint( wxPaintEvent &WXUNUSED(event) ) + { + wxPaintDC dc(this); + dc.DrawBitmap( m_bitmap, 0, 0); + } - parent->GetEventHandler()->ProcessEvent(le); -} + wxBitmap m_bitmap; +}; -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW +class wxDataViewDropSource: public wxDropSource +{ +public: + wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : + wxDropSource( win ) + { + m_win = win; + m_row = row; + m_hint = NULL; + } -// implemented in msw/listctrl.cpp: -int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); + ~wxDataViewDropSource() + { + delete m_hint; + } -IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow) + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) + { + wxPoint pos = wxGetMousePosition(); -bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) -{ - m_owner = parent; - - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) - return false; + if (!m_hint) + { + int liney = m_win->GetLineStart( m_row ); + int linex = 0; + m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney ); + m_win->ClientToScreen( &linex, &liney ); + m_dist_x = pos.x - linex; + m_dist_y = pos.y - liney; + + int indent = 0; + wxBitmap ib = m_win->CreateItemBitmap( m_row, indent ); + m_dist_x -= indent; + m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString, + wxPoint(pos.x - m_dist_x, pos.y + 5 ), + ib.GetSize(), + wxFRAME_TOOL_WINDOW | + wxFRAME_FLOAT_ON_PARENT | + wxFRAME_NO_TASKBAR | + wxNO_BORDER ); + new wxBitmapCanvas( m_hint, ib, ib.GetSize() ); + m_hint->Show(); + } + else + { + m_hint->Move( pos.x - m_dist_x, pos.y + 5 ); + m_hint->SetTransparent( 128 ); + } - int x = pos.x == wxDefaultCoord ? 0 : pos.x, - y = pos.y == wxDefaultCoord ? 0 : pos.y, - w = size.x == wxDefaultCoord ? 1 : size.x, - h = size.y == wxDefaultCoord ? 22 : size.y; - - // create the native WC_HEADER window: - WXHWND hwndParent = (HWND)parent->GetHandle(); - WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; - m_hWnd = CreateWindowEx(0, - WC_HEADER, - (LPCTSTR) NULL, - msStyle, - x, y, w, h, - (HWND)hwndParent, - (HMENU)-1, - wxGetInstance(), - (LPVOID) NULL); - if (m_hWnd == NULL) - { - wxLogLastError(_T("CreateWindowEx")); return false; } - // we need to subclass the m_hWnd to force wxWindow::HandleNotify - // to call wxDataViewHeaderWindow::MSWOnNotify - SubclassWin(m_hWnd); + wxDataViewMainWindow *m_win; + unsigned int m_row; + wxFrame *m_hint; + int m_dist_x,m_dist_y; +}; - // the following is required to get the default win's font for - // header windows and must be done befor sending the HDM_LAYOUT msg - SetFont(GetFont()); - RECT rcParent; - HDLAYOUT hdl; - WINDOWPOS wp; +class wxDataViewDropTarget: public wxDropTarget +{ +public: + wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) : + wxDropTarget( obj ) + { + m_win = win; + } - // Retrieve the bounding rectangle of the parent window's - // client area, and then request size and position values - // from the header control. - ::GetClientRect((HWND)hwndParent, &rcParent); + virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + return m_win->OnDragOver( format, x, y, def); + } - hdl.prc = &rcParent; - hdl.pwpos = ℘ - if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) + virtual bool OnDrop( wxCoord x, wxCoord y ) { - wxLogLastError(_T("SendMessage")); - return false; + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return false; + return m_win->OnDrop( format, x, y ); } - // Set the size, position, and visibility of the header control. - SetWindowPos((HWND)m_hWnd, - wp.hwndInsertAfter, - wp.x, wp.y, - wp.cx, wp.cy, - wp.flags | SWP_SHOWWINDOW); + virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + if (!GetData()) + return wxDragNone; + return m_win->OnData( format, x, y, def ); + } - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, wp.cy)); - SetMaxSize(wxSize(-1, wp.cy)); + virtual void OnLeave() + { m_win->OnLeave(); } - return true; -} + wxDataViewMainWindow *m_win; +}; + +#endif // wxUSE_DRAG_AND_DROP + +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- -wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) { - UnsubclassWin(); + m_owner = owner; } -void wxDataViewHeaderWindowMSW::UpdateDisplay() +void wxDataViewRenameTimer::Notify() { - // remove old columns - for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) - Header_DeleteItem((HWND)m_hWnd, 0); + m_owner->OnRenameTimer(); +} - // add the updated array of columns to the header control - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int added = 0; - for (unsigned int i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetColumn( i ); - if (col->IsHidden()) - continue; // don't add it! - - HDITEM hdi; - hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; - hdi.pszText = (wxChar *) col->GetTitle().wx_str(); - hdi.cxy = col->GetWidth(); - hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); - hdi.fmt = HDF_LEFT | HDF_STRING; - - // lParam is reserved for application's use: - // we store there the column index to use it later in MSWOnNotify - // (since columns may have been hidden) - hdi.lParam = (LPARAM)i; - - // the native wxMSW implementation of the header window - // draws the column separator COLUMN_WIDTH_OFFSET pixels - // on the right: to correct this effect we make the column - // exactly COLUMN_WIDTH_OFFSET wider (for the first column): - if (i == 0) - hdi.cxy += COLUMN_WIDTH_OFFSET; - - switch (col->GetAlignment()) - { - case wxALIGN_LEFT: - hdi.fmt |= HDF_LEFT; - break; - case wxALIGN_CENTER: - case wxALIGN_CENTER_HORIZONTAL: - hdi.fmt |= HDF_CENTER; - break; - case wxALIGN_RIGHT: - hdi.fmt |= HDF_RIGHT; - break; +//----------------------------------------------------------------------------- +// wxDataViewMainWindow +//----------------------------------------------------------------------------- - default: - // such alignment is not allowed for the column header! - wxFAIL; - } +// The tree building helper, declared firstly +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, + wxDataViewTreeNode * node); - SendMessage((HWND)m_hWnd, HDM_INSERTITEM, - (WPARAM)added, (LPARAM)&hdi); - added++; - } +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) +{ + if (row1 > row2) return 1; + if (row1 == row2) return 0; + return -1; } -unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR) -{ - unsigned int idx; +IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) - // NOTE: we don't just return nmHDR->iItem because when there are - // hidden columns, nmHDR->iItem may be different from - // nmHDR->pitem->lParam +BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) + EVT_PAINT (wxDataViewMainWindow::OnPaint) + EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) + EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) + EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) + EVT_CHAR (wxDataViewMainWindow::OnChar) +END_EVENT_TABLE() - if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM) - { - idx = (unsigned int)nmHDR->pitem->lParam; - return idx; - } +wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, + const wxPoint &pos, const wxSize &size, const wxString &name ) : + wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ), + m_selection( wxDataViewSelectionCmp ) - HDITEM item; - item.mask = HDI_LPARAM; - Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item); +{ + SetOwner( parent ); - return (unsigned int)item.lParam; -} + m_lastOnSame = false; + m_renameTimer = new wxDataViewRenameTimer( this ); -bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) -{ - NMHDR *nmhdr = (NMHDR *)lParam; + // TODO: user better initial values/nothing selected + m_currentCol = NULL; + m_currentRow = 0; - // is it a message from the header? - if ( nmhdr->hwndFrom != (HWND)m_hWnd ) - return wxWindow::MSWOnNotify(idCtrl, lParam, result); + m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 - NMHEADER *nmHDR = (NMHEADER *)nmhdr; - switch ( nmhdr->code ) - { - case HDN_BEGINTRACK: - // user has started to resize a column: - // do we need to veto it? - if (!GetColumn(nmHDR->iItem)->IsResizeable()) - { - // veto it! - *result = TRUE; - } - break; +#if wxUSE_DRAG_AND_DROP + m_dragCount = 0; + m_dragStart = wxPoint(0,0); - case HDN_BEGINDRAG: - // user has started to reorder a column - break; + m_dragEnabled = false; + m_dropEnabled = false; + m_dropHint = false; + m_dropHintLine = (unsigned int) -1; +#endif // wxUSE_DRAG_AND_DROP - case HDN_ITEMCHANGING: - if (nmHDR->pitem != NULL && - (nmHDR->pitem->mask & HDI_WIDTH) != 0) - { - int minWidth = GetColumnFromHeader(nmHDR)->GetMinWidth(); - if (nmHDR->pitem->cxy < minWidth) - { - // do not allow the user to resize this column under - // its minimal width: - *result = TRUE; - } - } - break; + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; - case HDN_ITEMCHANGED: // user is resizing a column - case HDN_ENDTRACK: // user has finished resizing a column - case HDN_ENDDRAG: // user has finished reordering a column + m_hasFocus = false; - // update the width of the modified column: - if (nmHDR->pitem != NULL && - (nmHDR->pitem->mask & HDI_WIDTH) != 0) - { - unsigned int idx = GetColumnIdxFromHeader(nmHDR); - unsigned int w = nmHDR->pitem->cxy; - wxDataViewColumn *col = GetColumn(idx); + SetBackgroundColour( *wxWHITE ); - // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET - if (idx == 0 && w > COLUMN_WIDTH_OFFSET) - w -= COLUMN_WIDTH_OFFSET; + SetBackgroundStyle(wxBG_STYLE_CUSTOM); - if (w >= (unsigned)col->GetMinWidth()) - col->SetInternalWidth(w); - } - break; + m_penRule = wxPen(GetRuleColour()); - case HDN_ITEMCLICK: - { - unsigned int idx = GetColumnIdxFromHeader(nmHDR); - wxEventType evt = nmHDR->iButton == 0 ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, idx); - } - break; + // compose a pen whichcan draw black lines + // TODO: maybe there is something system colour to use + m_penExpander = wxPen(wxColour(0,0,0)); - case NM_RCLICK: - { - // NOTE: for some reason (i.e. for a bug in Windows) - // the HDN_ITEMCLICK notification is not sent on - // right clicks, so we need to handle NM_RCLICK + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); - POINT ptClick; - int column = wxMSWGetColumnClicked(nmhdr, &ptClick); - if (column != wxNOT_FOUND) - { - HDITEM item; - item.mask = HDI_LPARAM; - Header_GetItem((HWND)m_hWnd, column, &item); - - // 'idx' may be different from 'column' if there are - // hidden columns... - unsigned int idx = (unsigned int)item.lParam; - SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, - idx); - } - } - break; + // Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1; + m_underMouse = NULL; + UpdateDisplay(); +} - case HDN_GETDISPINFOW: - // see wxListCtrl::MSWOnNotify for more info! - break; +wxDataViewMainWindow::~wxDataViewMainWindow() +{ + DestroyTree(); + delete m_renameTimer; +} - case HDN_ITEMDBLCLICK: - { - unsigned int idx = GetColumnIdxFromHeader(nmHDR); - int w = GetOwner()->GetBestColumnWidth(idx); - - // update the native control: - HDITEM hd; - ZeroMemory(&hd, sizeof(hd)); - hd.mask = HDI_WIDTH; - hd.cxy = w; - Header_SetItem(GetHwnd(), - nmHDR->iItem, // NOTE: we don't want 'idx' here! - &hd); - - // update the wxDataViewColumn class: - GetColumn(idx)->SetInternalWidth(w); - } - break; - default: - return wxWindow::MSWOnNotify(idCtrl, lParam, result); - } +#if wxUSE_DRAG_AND_DROP +bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) +{ + m_dragFormat = format; + m_dragEnabled = format != wxDF_INVALID; return true; } -void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), - const wxRect *WXUNUSED(rect)) +bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) { - wxSize ourSz = GetClientSize(); - wxSize ownerSz = m_owner->GetClientSize(); + m_dropFormat = format; + m_dropEnabled = format != wxDF_INVALID; - // where should the (logical) origin of this window be placed? - int x1 = 0, y1 = 0; - m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1); + if (m_dropEnabled) + SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) ); - // put this window on top of our parent and - SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0, - ownerSz.GetWidth() + x1, ourSz.GetHeight(), - SWP_SHOWWINDOW); + return true; } -void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(w), int WXUNUSED(h), - int WXUNUSED(f)) +void wxDataViewMainWindow::RemoveDropHint() { - // the wxDataViewCtrl's internal wxBoxSizer will call this function when - // the wxDataViewCtrl window gets resized: the following dummy call - // to ScrollWindow() is required in order to get this header window - // correctly repainted when it's (horizontally) scrolled: - - ScrollWindow(0, 0); + if (m_dropHint) + { + m_dropHint = false; + RefreshRow( m_dropHintLine ); + m_dropHintLine = (unsigned int) -1; + } } -#else // !defined(__WXMSW__) +wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, + wxCoord y, wxDragResult def ) +{ + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); -IMPLEMENT_ABSTRACT_CLASS(wxGenericDataViewHeaderWindow, wxWindow) -BEGIN_EVENT_TABLE(wxGenericDataViewHeaderWindow, wxWindow) - EVT_PAINT (wxGenericDataViewHeaderWindow::OnPaint) - EVT_MOUSE_EVENTS (wxGenericDataViewHeaderWindow::OnMouse) - EVT_SET_FOCUS (wxGenericDataViewHeaderWindow::OnSetFocus) -END_EVENT_TABLE() + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + { + RemoveDropHint(); + return wxDragNone; + } -bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) -{ - m_owner = parent; + wxDataViewItem item = GetItemByRow( row ); - if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name)) - return false; + wxDataViewModel *model = GetOwner()->GetModel(); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + if (!m_owner->HandleWindowEvent( event )) + { + RemoveDropHint(); + return wxDragNone; + } + + if (!event.IsAllowed()) + { + RemoveDropHint(); + return wxDragNone; + } - wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont( attr.font ); - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); - SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); + if (m_dropHint && (row != m_dropHintLine)) + RefreshRow( m_dropHintLine ); + m_dropHint = true; + m_dropHintLine = row; + RefreshRow( row ); - return true; + return def; } -void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) { - int w, h; - GetClientSize( &w, &h ); + RemoveDropHint(); - wxAutoBufferedPaintDC dc( this ); + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + return false; - int xpix; - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + wxDataViewItem item = GetItemByRow( row ); - int x; - m_owner->GetViewStart( &x, NULL ); + wxDataViewModel *model = GetOwner()->GetModel(); - // account for the horz scrollbar offset - dc.SetDeviceOrigin( -x * xpix, 0 ); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + if (!m_owner->HandleWindowEvent( event )) + return false; - dc.SetFont( GetFont() ); + if (!event.IsAllowed()) + return false; - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int i; - int xpos = 0; - for (i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetColumn( i ); - if (col->IsHidden()) - continue; // skip it! + return true; +} - int cw = col->GetWidth(); - int ch = h; +wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, + wxDragResult def ) +{ + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; - if (col->IsSortable()) - { - if (col->IsSortOrderAscending()) - sortArrow = wxHDR_SORT_ICON_UP; - else - sortArrow = wxHDR_SORT_ICON_DOWN; - } + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + return wxDragNone; - wxRendererNative::Get().DrawHeaderButton - ( - this, - dc, - wxRect(xpos, 0, cw, ch-1), - m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED, - sortArrow - ); + wxDataViewItem item = GetItemByRow( row ); - // align as required the column title: - int x = xpos; - wxSize titleSz = dc.GetTextExtent(col->GetTitle()); - switch (col->GetAlignment()) - { - case wxALIGN_LEFT: - x += HEADER_HORIZ_BORDER; - break; - case wxALIGN_CENTER: - case wxALIGN_CENTER_HORIZONTAL: - x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2; - break; - case wxALIGN_RIGHT: - x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; - break; - } + wxDataViewModel *model = GetOwner()->GetModel(); - // always center the title vertically: - int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); + wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); - dc.SetClippingRegion( xpos+HEADER_HORIZ_BORDER, - HEADER_VERT_BORDER, - wxMax(cw - 2 * HEADER_HORIZ_BORDER, 1), // width - wxMax(ch - 2 * HEADER_VERT_BORDER, 1)); // height - dc.DrawText( col->GetTitle(), x, y ); - dc.DestroyClippingRegion(); + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + event.SetDataSize( obj->GetSize() ); + event.SetDataBuffer( obj->GetData() ); + if (!m_owner->HandleWindowEvent( event )) + return wxDragNone; - xpos += cw; - } + if (!event.IsAllowed()) + return wxDragNone; + + return def; } -void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) +void wxDataViewMainWindow::OnLeave() { - GetParent()->SetFocus(); - event.Skip(); + RemoveDropHint(); } -void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) +wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) { - // we want to work with logical coords - int x; - m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); - int y = event.GetY(); - - if (m_isDragging) + int height = GetLineHeight( row ); + int width = 0; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) { - // we don't draw the line beyond our window, - // but we allow dragging it there - int w = 0; - GetClientSize( &w, NULL ); - m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); - w -= 6; - - // erase the line if it was drawn - if (m_currentX < w) - DrawCurrent(); - - if (event.ButtonUp()) - { - m_isDragging = false; - if (HasCapture()) - ReleaseMouse(); + wxDataViewColumn *column = GetOwner()->GetColumnAt(col); + if (column->IsHidden()) + continue; // skip it! + width += column->GetWidth(); + } - m_dirty = true; + indent = 0; + if (!IsVirtualList()) + { + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; + // try to use the m_lineHeight as the expander space - GetColumn(m_column)->SetWidth(m_currentX - m_minX); + if(!node->HasChildren()) + delete node; + } + width -= indent; - Refresh(); - GetOwner()->Refresh(); - } - else - { - m_currentX = wxMax(m_minX + 7, x); + wxBitmap bitmap( width, height ); + wxMemoryDC dc( bitmap ); + dc.SetFont( GetFont() ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 0,0,width,height ); - // draw in the new location - if (m_currentX < w) DrawCurrent(); - } + wxDataViewModel *model = m_owner->GetModel(); - } - else // not dragging + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) { - m_minX = 0; - m_column = wxNOT_FOUND; - - bool hit_border = false; - - // end of the current column - int xpos = 0; + // TODO-RTL: last column for RTL support + expander = GetOwner()->GetColumnAt( 0 ); + GetOwner()->SetExpanderColumn(expander); + } - // find the column where this event occured - int countCol = m_owner->GetColumnCount(); - for (int column = 0; column < countCol; column++) - { - wxDataViewColumn *p = GetColumn(column); - if (p->IsHidden()) - continue; // skip if not shown + int x = 0; + for (col = 0; col < cols; col++) + { + wxDataViewColumn *column = GetOwner()->GetColumnAt( col ); + wxDataViewRenderer *cell = column->GetRenderer(); - xpos += p->GetWidth(); - m_column = column; - if ((abs(x-xpos) < 3) && (y < 22)) - { - hit_border = true; - break; - } + if (column->IsHidden()) + continue; // skip it! - if (x < xpos) - { - // inside the column - break; - } + width = column->GetWidth(); - m_minX = xpos; - } + if (column == expander) + width -= indent; - if (m_column == wxNOT_FOUND) - return; + wxVariant value; + wxDataViewItem item = GetItemByRow( row ); + model->GetValue( value, item, column->GetModelColumn()); + cell->SetValue( value ); - bool resizeable = GetColumn(m_column)->IsResizeable(); - if (event.LeftDClick() && resizeable) - { - GetColumn(m_column)->SetWidth(GetOwner()->GetBestColumnWidth(m_column)); - Refresh(); - } - else if (event.LeftDown() || event.RightUp()) + if (cell->GetWantsAttr()) { - if (hit_border && event.LeftDown() && resizeable) - { - m_isDragging = true; - CaptureMouse(); - m_currentX = x; - DrawCurrent(); - } - else // click on a column - { - wxEventType evt = event.LeftDown() ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, m_column); - } + wxDataViewItemAttr attr; + bool ret = model->GetAttr( item, column->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); } - else if (event.Moving()) - { - if (hit_border && resizeable) - m_currentCursor = m_resizeCursor; - else - m_currentCursor = wxSTANDARD_CURSOR; - SetCursor(*m_currentCursor); - } + wxSize size = cell->GetSize(); + size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width ); + size.y = height; + wxRect item_rect(x, 0, size.x, size.y); + + int align = cell->CalculateAlignment(); + // horizontal alignment: + item_rect.x = x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = x + (width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = x + width - size.x; + // else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = 0; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = (height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = height - size.y; + // else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + // dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, 0 ); + // dc.DestroyClippingRegion(); + + x += width; } + + return bitmap; } -void wxGenericDataViewHeaderWindow::DrawCurrent() +#endif // wxUSE_DRAG_AND_DROP + + +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - int x1 = m_currentX; - int y1 = 0; - ClientToScreen (&x1, &y1); + wxDataViewModel *model = GetOwner()->GetModel(); + wxAutoBufferedPaintDC dc( this ); - int x2 = m_currentX-1; #ifdef __WXMSW__ - ++x2; // but why ???? + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.SetBrush( wxBrush( GetBackgroundColour()) ); + dc.SetBrush( *wxWHITE_BRUSH ); + wxSize size( GetClientSize() ); + dc.DrawRectangle( 0,0,size.x,size.y ); #endif - int y2 = 0; - m_owner->GetClientSize( NULL, &y2 ); - m_owner->ClientToScreen( &x2, &y2 ); - wxScreenDC dc; - dc.SetLogicalFunction(wxINVERT); - dc.SetPen(m_penCurrent); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - AdjustDC(dc); - dc.DrawLine(x1, y1, x2, y2); -} + // prepare the DC + GetOwner()->PrepareDC( dc ); + dc.SetFont( GetFont() ); -void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) -{ - int xpix, x; + wxRect update = GetUpdateRegion().GetBox(); + m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); - m_owner->GetViewStart( &x, NULL ); + // compute which items needs to be redrawn + unsigned int item_start = GetLineAt( wxMax(0,update.y) ); + unsigned int item_count = + wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), + (int)(GetRowCount( ) - item_start)); + unsigned int item_last = item_start + item_count; - // shift the DC origin to match the position of the main window horizontal - // scrollbar: this allows us to always use logical coords - dc.SetDeviceOrigin( -x * xpix, 0 ); -} + // compute which columns needs to be redrawn + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col_start = 0; + unsigned int x_start; + for (x_start = 0; col_start < cols; col_start++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start); + if (col->IsHidden()) + continue; // skip it! -#endif // defined(__WXMSW__) + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)update.x) + break; -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- + x_start += w; + } -wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) -{ - m_owner = owner; -} + unsigned int col_last = col_start; + unsigned int x_last = x_start; + for (; col_last < cols; col_last++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last); + if (col->IsHidden()) + continue; // skip it! -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} + if (x_last > (unsigned int)update.GetRight()) + break; -//----------------------------------------------------------------------------- -// wxDataViewMainWindow -//----------------------------------------------------------------------------- + x_last += col->GetWidth(); + } -//The tree building helper, declared firstly -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); + // Draw horizontal rules if required + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); -int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) -{ - if (row1 > row2) return 1; - if (row1 == row2) return 0; - return -1; -} + for (unsigned int i = item_start; i <= item_last; i++) + { + int y = GetLineStart( i ); + dc.DrawLine(x_start, y, x_last, y); + } + } + // Draw vertical rules if required + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); -IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) + int x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(i); + if (col->IsHidden()) + continue; // skip it -BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) - EVT_PAINT (wxDataViewMainWindow::OnPaint) - EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) - EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) - EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) - EVT_CHAR (wxDataViewMainWindow::OnChar) -END_EVENT_TABLE() + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); -wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ), - m_selection( wxDataViewSelectionCmp ) + x += col->GetWidth(); + } -{ - SetOwner( parent ); + // Draw last vertical rule + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); + } - m_lastOnSame = false; - m_renameTimer = new wxDataViewRenameTimer( this ); + // redraw the background for the items which are selected/current + for (unsigned int item = item_start; item < item_last; item++) + { + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) + { + int flags = selected ? (int)wxCONTROL_SELECTED : 0; + if (item == m_currentRow) + flags |= wxCONTROL_CURRENT; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; - // TODO: user better initial values/nothing selected - m_currentCol = NULL; - m_currentRow = 0; + wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) ); + wxRendererNative::Get().DrawItemSelectionRect + ( + this, + dc, + rect, + flags + ); + } + } - // TODO: we need to calculate this smartly - m_lineHeight = -#ifdef __WXMSW__ - 17; -#else - 20; -#endif - wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM); +#if wxUSE_DRAG_AND_DROP + if (m_dropHint) + { + wxRect rect( x_start, GetLineStart( m_dropHintLine ), + x_last, GetLineHeight( m_dropHintLine ) ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); + } +#endif // wxUSE_DRAG_AND_DROP - m_dragCount = 0; - m_dragStart = wxPoint(0,0); - m_lineLastClicked = (unsigned int) -1; - m_lineBeforeLastClicked = (unsigned int) -1; - m_lineSelectSingleOnUp = (unsigned int) -1; + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) + { + // TODO-RTL: last column for RTL support + expander = GetOwner()->GetColumnAt( 0 ); + GetOwner()->SetExpanderColumn(expander); + } - m_hasFocus = false; + // redraw all cells for all rows which must be repainted and all columns + wxRect cell_rect; + cell_rect.x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt( i ); + wxDataViewRenderer *cell = col->GetRenderer(); + cell_rect.width = col->GetWidth(); - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); - SetBackgroundColour( *wxWHITE ); + if (col->IsHidden()) + continue; // skip it! + + for (unsigned int item = item_start; item < item_last; item++) + { + // get the cell value and set it into the renderer + wxVariant value; + wxDataViewTreeNode *node = NULL; + wxDataViewItem dataitem; - m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + if (!IsVirtualList()) + { + node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; - //Here I compose a pen can draw black lines, maybe there are something system colour to use - m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID ); - //Some new added code to deal with the tree structure - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + dataitem = node->GetItem(); - //Make m_count = -1 will cause the class recaculate the real displaying number of rows. - m_count = -1 ; - UpdateDisplay(); -} + if ((i > 0) && model->IsContainer(dataitem) && + !model->HasContainerColumns(dataitem)) + continue; + } + else + { + dataitem = wxDataViewItem( wxUIntToPtr(item) ); + } -wxDataViewMainWindow::~wxDataViewMainWindow() -{ - DestroyTree(); - delete m_renameTimer; + model->GetValue( value, dataitem, col->GetModelColumn()); + cell->SetValue( value ); + + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } + + // update cell_rect + cell_rect.y = GetLineStart( item ); + cell_rect.height = GetLineHeight( item ); + + // Draw the expander here. + int indent = 0; + if ((!IsVirtualList()) && (col == expander)) + { + indent = node->GetIndentLevel(); + + // Calculate the indent first + indent = cell_rect.x + GetOwner()->GetIndent() * indent; + + int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; + + // change the cell_rect.x to the appropriate pos + int expander_x = indent + EXPANDER_MARGIN; + int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) + - (expander_width/2) - EXPANDER_OFFSET; + + indent = indent + m_lineHeight; + // try to use the m_lineHeight as the expander space + + dc.SetPen( m_penExpander ); + dc.SetBrush( wxNullBrush ); + if( node->HasChildren() ) + { + wxRect rect( expander_x , expander_y, expander_width, expander_width); + int flag = 0; + if (m_underMouse == node) + { + flag |= wxCONTROL_CURRENT; + } + if( node->IsOpen() ) + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, + flag|wxCONTROL_EXPANDED ); + else + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); + } + + // force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + } + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + // cannot be bigger than allocated space + wxSize size = cell->GetSize(); + + // Because of the tree structure indent, here we should minus the width + // of the cell for drawing + size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); + // size.y = wxMin( size.y, cell_rect.height ); + size.y = cell_rect.height; + + wxRect item_rect(cell_rect.GetTopLeft(), size); + int align = cell->CalculateAlignment(); + + // horizontal alignment: + item_rect.x = cell_rect.x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = cell_rect.x + cell_rect.width - size.x; + // else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = cell_rect.y; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = cell_rect.y + cell_rect.height - size.y; + // else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + // Here we add the tree indent + item_rect.x += indent; + + int state = 0; + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + state |= wxDATAVIEW_CELL_SELECTED; + + // TODO: it would be much more efficient to create a clipping + // region for the entire column being rendered (in the OnPaint + // of wxDataViewMainWindow) instead of a single clip region for + // each cell. However it would mean that each renderer should + // respect the given wxRect's top & bottom coords, eventually + // violating only the left & right coords - however the user can + // make its own renderer and thus we cannot be sure of that. + dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, state ); + dc.DestroyClippingRegion(); + } + + cell_rect.x += cell_rect.width; + } } void wxDataViewMainWindow::OnRenameTimer() @@ -1672,14 +1933,18 @@ void wxDataViewMainWindow::OnRenameTimer() // We have to call this here because changes may just have // been made and no screen update taken place. if ( m_dirty ) + { + // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead + // (needs to be tested!) wxSafeYield(); + } int xpos = 0; unsigned int cols = GetOwner()->GetColumnCount(); unsigned int i; for (i = 0; i < cols; i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); + wxDataViewColumn *c = GetOwner()->GetColumnAt( i ); if (c->IsHidden()) continue; // skip it! @@ -1687,152 +1952,263 @@ void wxDataViewMainWindow::OnRenameTimer() break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, - m_currentCol->GetWidth(), m_lineHeight ); + + // we have to take an expander column into account and compute its indentation + // to get the editor at the correct x position where the actual text is + int indent = 0; + if (!IsVirtualList() && GetOwner()->GetExpanderColumn() == m_currentCol) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; + + if(!node->HasChildren()) + delete node; + } + + wxRect labelRect( xpos + indent, + GetLineStart( m_currentRow ), + m_currentCol->GetWidth() - indent, + GetLineHeight( m_currentRow ) ); GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, - &labelRect.x, &labelRect.y); + &labelRect.x, &labelRect.y); - // TODO get wxDataViewItem from m_currentRow - m_currentCol->GetRenderer()->StartEditing( m_currentRow, labelRect ); + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); } -//------------------------------------------------------------------ +//----------------------------------------------------------------------------- // Helper class for do operation on the tree node -//------------------------------------------------------------------ +//----------------------------------------------------------------------------- class DoJob { public: - DoJob(){}; - virtual ~DoJob(){}; + DoJob() { } + virtual ~DoJob() { } - //The return value control how the tree-walker tranverse the tree + // The return value control how the tree-walker tranverse the tree // 0: Job done, stop tranverse and return // 1: Ignore the current node's subtree and continue // 2: Job not done, continue enum { OK = 0 , IGR = 1, CONT = 2 }; - virtual int operator() ( wxDataViewTreeNode * node ) = 0 ; + virtual int operator() ( wxDataViewTreeNode * node ) = 0; + virtual int operator() ( void * n ) = 0; }; -class ItemAddJob: public DoJob +bool Walker( wxDataViewTreeNode * node, DoJob & func ) { -public: - ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count ) - { this->parent = parent ; this->item = item ; m_count = count; } - virtual ~ItemAddJob(){}; + if( node==NULL ) + return false; - virtual int operator() ( wxDataViewTreeNode * node ) + switch( func( node ) ) { - if( node->GetItem() == parent ) - { - node->SetHasChildren( true ); - wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); - newnode->SetItem(item); - node->AppendChild( newnode); - *m_count = -1; - return OK; - } - return CONT; + case DoJob::OK : + return true; + case DoJob::IGR: + return false; + case DoJob::CONT: + default: + ; } -private: - int * m_count; - wxDataViewItem parent, item; -}; + wxDataViewTreeNodes nodes = node->GetNodes(); + wxDataViewTreeLeaves leaves = node->GetChildren(); -bool Walker( wxDataViewTreeNode * node, DoJob & func ) -{ - if( node==NULL || !node->HasChildren()) - return false; + int len_nodes = nodes.GetCount(); + int len = leaves.GetCount(); + int i = 0, nodes_i = 0; - wxDataViewTreeNodes nodes = node->GetChildren(); - int len = node->GetChildrenNumber(); - int i = 0 ; - for( ; i < len ; i ++ ) + for(; i < len; i ++ ) { - wxDataViewTreeNode * n = nodes[i]; - switch( func( n ) ) + void * n = leaves[i]; + if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) { - case DoJob::OK : - return true ; - case DoJob::IGR: - continue; - case DoJob::CONT: - default: - ; + wxDataViewTreeNode * nd = nodes[nodes_i]; + nodes_i++; + + if( Walker( nd , func ) ) + return true; + } - - if( Walker( n , func ) ) - return true; + else + switch( func( n ) ) + { + case DoJob::OK : + return true; + case DoJob::IGR: + continue; + case DoJob::CONT: + default: + ; + } } return false; } bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { - ItemAddJob job( parent, item, &m_count); - Walker( m_root , job); - UpdateDisplay(); - return true; -} + if (!m_root) + { + m_count++; + UpdateDisplay(); + return true; + } -class ItemDeleteJob: public DoJob -{ -public: - ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; } - virtual ~ItemDeleteJob(){} - virtual int operator() ( wxDataViewTreeNode * node ) + SortPrepare(); + + wxDataViewTreeNode * node; + node = FindNode(parent); + + if( node == NULL ) + return false; + + node->SetHasChildren( true ); + + if( g_model->IsContainer( item ) ) { - if( node->GetItem() == m_item ) - { - node->GetParent()->GetChildren().Remove( node ); - delete node; - *m_count = -1; - return DoJob::OK; - } - return DoJob::CONT; + wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); + newnode->SetItem(item); + newnode->SetHasChildren( true ); + node->AddNode( newnode); } + else + node->AddLeaf( item.GetID() ); -private: - int * m_count; - wxDataViewItem m_item; -}; + node->ChangeSubTreeCount(1); -bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem & item) -{ - ItemDeleteJob job( item, &m_count); - Walker( m_root, job); + m_count = -1; UpdateDisplay(); - return true; -} -bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) -{ - unsigned int row = GetRowByItem(item); - RefreshRow( row ); return true; } -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) ) +static void DestroyTreeHelper( wxDataViewTreeNode * node); + +bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, + const wxDataViewItem& item) { - // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 -/*#define MAX_VIRTUAL_WIDTH 100000 + if (!m_root) + { + m_count--; + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; - wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - Refresh( true, &rect ); + m_selection.Empty(); - return true; -*/ - unsigned int row = GetRowByItem(item); - RefreshRow( row ); - return true; -} + UpdateDisplay(); + + return true; + } + + wxDataViewTreeNode * node = FindNode(parent); + + wxCHECK_MSG( node != NULL, false, "item not found" ); + wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, + false, "item not found" ); + + int sub = -1; + node->GetChildren().Remove( item.GetID() ); + // Manipolate selection + if( m_selection.GetCount() > 1 ) + { + m_selection.Empty(); + } + bool isContainer = false; + wxDataViewTreeNodes nds = node->GetNodes(); + for (size_t i = 0; i < nds.GetCount(); i ++) + { + if (nds[i]->GetItem() == item) + { + isContainer = true; + break; + } + } + if( isContainer ) + { + wxDataViewTreeNode * n = NULL; + wxDataViewTreeNodes nodes = node->GetNodes(); + int len = nodes.GetCount(); + for( int i = 0; i < len; i ++) + { + if( nodes[i]->GetItem() == item ) + { + n = nodes[i]; + break; + } + } + + wxCHECK_MSG( n != NULL, false, "item not found" ); + + node->GetNodes().Remove( n ); + sub -= n->GetSubTreeCount(); + ::DestroyTreeHelper(n); + } + // Make the row number invalid and get a new valid one when user call GetRowCount + m_count = -1; + node->ChangeSubTreeCount(sub); + + // Change the current row to the last row if the current exceed the max row number + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; + + UpdateDisplay(); + + return true; +} + +bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) +{ + SortPrepare(); + g_model->Resort(); + + // Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + parent->GetEventHandler()->ProcessEvent(le); + + return true; +} + +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) +{ + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 +/*#define MAX_VIRTUAL_WIDTH 100000 + + wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + Refresh( true, &rect ); + + return true; +*/ + SortPrepare(); + g_model->Resort(); + + // Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + le.SetColumn(col); + le.SetDataViewColumn(GetOwner()->GetColumn(col)); + parent->GetEventHandler()->ProcessEvent(le); + + return true; +} + +bool wxDataViewMainWindow::Cleared() +{ + DestroyTree(); + + SortPrepare(); + BuildTree( GetOwner()->GetModel() ); + + UpdateDisplay(); -bool wxDataViewMainWindow::Cleared() -{ - DestroyTree(); - UpdateDisplay(); return true; } @@ -1862,7 +2238,7 @@ void wxDataViewMainWindow::RecalculateDisplay() } int width = GetEndOfLastCol(); - int height = GetRowCount() * m_lineHeight; + int height = GetLineStart( GetRowCount() ); SetVirtualSize( width, height ); GetOwner()->SetScrollRate( 10, m_lineHeight ); @@ -1878,232 +2254,41 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); } -void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +void wxDataViewMainWindow::ScrollTo( int rows, int column ) { - wxDataViewModel *model = GetOwner()->GetModel(); - wxAutoBufferedPaintDC dc( this ); - - // prepare the DC - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); - GetOwner()->PrepareDC( dc ); - dc.SetFont( GetFont() ); - - wxRect update = GetUpdateRegion().GetBox(); - m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - - // compute which items needs to be redrawn - unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) ); - unsigned int item_count = - wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), - (int)(GetRowCount( )- item_start) ); - unsigned int item_last = item_start + item_count; - - // compute which columns needs to be redrawn - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col_start = 0; - unsigned int x_start = 0; - for (x_start = 0; col_start < cols; col_start++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_start); - if (col->IsHidden()) - continue; // skip it! - - unsigned int w = col->GetWidth(); - if (x_start+w >= (unsigned int)update.x) - break; - - x_start += w; - } - - unsigned int col_last = col_start; - unsigned int x_last = x_start; - for (; col_last < cols; col_last++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_last); - if (col->IsHidden()) - continue; // skip it! - - if (x_last > (unsigned int)update.GetRight()) - break; - - x_last += col->GetWidth(); - } - - // Draw horizontal rules if required - if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - for (unsigned int i = item_start; i <= item_last+1; i++) - { - int y = i * m_lineHeight; - dc.DrawLine(x_start, y, x_last, y); - } - } - - // Draw vertical rules if required - if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + int x, y; + m_owner->GetScrollPixelsPerUnit( &x, &y ); + int sy = GetLineStart( rows )/y; + int sx = 0; + if( column != -1 ) { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - int x = x_start; - for (unsigned int i = col_start; i < col_last; i++) + wxRect rect = GetClientRect(); + int colnum = 0; + int x_start, w = 0; + int xx, yy, xe; + m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); + for (x_start = 0; colnum < column; colnum++) { - wxDataViewColumn *col = GetOwner()->GetColumn(i); + wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum); if (col->IsHidden()) - continue; // skip it + continue; // skip it! - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - - x += col->GetWidth(); + w = col->GetWidth(); + x_start += w; } - // Draw last vertical rule - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - } - - // redraw the background for the items which are selected/current - for (unsigned int item = item_start; item < item_last; item++) - { - bool selected = m_selection.Index( item ) != wxNOT_FOUND; - if (selected || item == m_currentRow) + int x_end = x_start + w; + xe = xx + rect.width; + if( x_end > xe ) { - int flags = selected ? (int)wxCONTROL_SELECTED : 0; - if (item == m_currentRow) - flags |= wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - - wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); + sx = ( xx + x_end - xe )/x; } - } - - // redraw all cells for all rows which must be repainted and for all columns - wxRect cell_rect; - cell_rect.x = x_start; - cell_rect.height = m_lineHeight; // -1 is for the horizontal rules - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - wxDataViewRenderer *cell = col->GetRenderer(); - cell_rect.width = col->GetWidth(); - - if (col->IsHidden()) - continue; // skipt it! - - for (unsigned int item = item_start; item < item_last; item++) + if( x_start < xx ) { - // get the cell value and set it into the renderer - wxVariant value; - wxDataViewTreeNode * node = GetTreeNodeByRow(item); - if( node == NULL ) - continue; - - wxDataViewItem dataitem = node->GetItem(); - model->GetValue( value, dataitem, col->GetModelColumn()); - cell->SetValue( value ); - - // update the y offset - cell_rect.y = item * m_lineHeight; - - //Draw the expander here. Please notice that I use const number for all pixel data. When the final API are determined - //I will change this to the data member of the class wxDataViewCtrl - int indent = node->GetIndentLevel(); - if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() ) - { - //Calculate the indent first - indent = cell_rect.x + GetOwner()->GetIndent() * indent; - - int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; - // change the cell_rect.x to the appropriate pos - int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ; - indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space - dc.SetPen( m_penExpander ); - dc.SetBrush( wxNullBrush ); - if( node->HasChildren() ) - { - //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0); - //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 ); - wxRect rect( expander_x , expander_y, expander_width, expander_width); - if( node->IsOpen() ) - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED ); - else - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect ); - } - else - { - // I am wandering whether we should draw dot lines between tree nodes - } - - //force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); - } - - - // cannot be bigger than allocated space - wxSize size = cell->GetSize(); - // Because of the tree structure indent, here we should minus the width of the cell for drawing - size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); - size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height ); - - wxRect item_rect(cell_rect.GetTopLeft(), size); - int align = cell->GetAlignment(); - - // horizontal alignment: - item_rect.x = cell_rect.x; - if (align & wxALIGN_CENTER_HORIZONTAL) - item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); - else if (align & wxALIGN_RIGHT) - item_rect.x = cell_rect.x + cell_rect.width - size.x; - //else: wxALIGN_LEFT is the default - - // vertical alignment: - item_rect.y = cell_rect.y; - if (align & wxALIGN_CENTER_VERTICAL) - item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); - else if (align & wxALIGN_BOTTOM) - item_rect.y = cell_rect.y + cell_rect.height - size.y; - //else: wxALIGN_TOP is the default - - // add padding - item_rect.x += PADDING_RIGHTLEFT; - item_rect.y += PADDING_TOPBOTTOM; - item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; - item_rect.height = size.y - 2 * PADDING_TOPBOTTOM; - - //Here we add the tree indent - item_rect.x += indent; - - int state = 0; - if (m_selection.Index(item) != wxNOT_FOUND) - state |= wxDATAVIEW_CELL_SELECTED; - - // TODO: it would be much more efficient to create a clipping - // region for the entire column being rendered (in the OnPaint - // of wxDataViewMainWindow) instead of a single clip region for - // each cell. However it would mean that each renderer should - // respect the given wxRect's top & bottom coords, eventually - // violating only the left & right coords - however the user can - // make its own renderer and thus we cannot be sure of that. - dc.SetClippingRegion( item_rect ); - cell->Render( item_rect, &dc, state ); - dc.DestroyClippingRegion(); + sx = x_start/x; } - - cell_rect.x += cell_rect.width; } + m_owner->Scroll( sx, sy ); } int wxDataViewMainWindow::GetCountPerPage() const @@ -2119,7 +2304,7 @@ int wxDataViewMainWindow::GetEndOfLastCol() const for (i = 0; i < GetOwner()->GetColumnCount(); i++) { const wxDataViewColumn *c = - wx_const_cast(wxDataViewCtrl*, GetOwner())->GetColumn( i ); + const_cast(GetOwner())->GetColumnAt( i ); if (!c->IsHidden()) width += c->GetWidth(); @@ -2133,28 +2318,27 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const int y = 0; m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - return y / m_lineHeight; + return GetLineAt( y ); } -unsigned int wxDataViewMainWindow::GetLastVisibleRow() +unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, - &client_size.x, &client_size.y ); + &client_size.x, &client_size.y ); - return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 ); + // we should deal with the pixel here + unsigned int row = GetLineAt(client_size.y) - 1; + + return wxMin( GetRowCount()-1, row ); } -unsigned int wxDataViewMainWindow::GetRowCount() +unsigned int wxDataViewMainWindow::GetRowCount() { if ( m_count == -1 ) { m_count = RecalculateCount(); - int width, height; - GetVirtualSize( &width, &height ); - height = m_count * m_lineHeight; - - SetVirtualSize( width, height ); + UpdateDisplay(); } return m_count; } @@ -2264,344 +2448,957 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) return (m_selection.Index( row ) != wxNOT_FOUND); } +void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); + + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); + + parent->GetEventHandler()->ProcessEvent(le); +} + void wxDataViewMainWindow::RefreshRow( unsigned int row ) { - wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight ); + wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + + wxSize client_size = GetClientSize(); + wxRect client_rect( 0, 0, client_size.x, client_size.y ); + wxRect intersect_rect = client_rect.Intersect( rect ); + if (intersect_rect.width > 0) + Refresh( true, &intersect_rect ); +} + +void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) +{ + if (from > to) + { + unsigned int tmp = to; + to = from; + from = tmp; + } + + wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); + wxSize client_size = GetClientSize(); + wxRect client_rect( 0, 0, client_size.x, client_size.y ); + wxRect intersect_rect = client_rect.Intersect( rect ); + if (intersect_rect.width > 0) + Refresh( true, &intersect_rect ); +} + +void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) +{ + wxSize client_size = GetClientSize(); + int start = GetLineStart( firstRow ); + m_owner->CalcScrolledPosition( start, 0, &start, NULL ); + if (start > client_size.y) return; + + wxRect rect( 0, start, client_size.x, client_size.y - start ); + + Refresh( true, &rect ); +} + +void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +{ + wxCHECK_RET( newCurrent < GetRowCount(), + _T("invalid item index in OnArrowChar()") ); + + // if there is no selection, we cannot move it anywhere + if (!HasCurrentRow()) + return; + + unsigned int oldCurrent = m_currentRow; + + // in single selection we just ignore Shift as we can't select several + // items anyhow + if ( event.ShiftDown() && !IsSingleSel() ) + { + RefreshRow( oldCurrent ); + + ChangeCurrentRow( newCurrent ); + + // select all the items between the old and the new one + if ( oldCurrent > newCurrent ) + { + newCurrent = oldCurrent; + oldCurrent = m_currentRow; + } + + SelectRows( oldCurrent, newCurrent, true ); + if (oldCurrent!=newCurrent) + SendSelectionChangedEvent(GetItemByRow(m_selection[0])); + } + else // !shift + { + RefreshRow( oldCurrent ); + + // all previously selected items are unselected unless ctrl is held + if ( !event.ControlDown() ) + SelectAllRows(false); + + ChangeCurrentRow( newCurrent ); + + if ( !event.ControlDown() ) + { + SelectRow( m_currentRow, true ); + SendSelectionChangedEvent(GetItemByRow(m_currentRow)); + } + else + RefreshRow( m_currentRow ); + } + + GetOwner()->EnsureVisible( m_currentRow, -1 ); +} + +wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +{ + wxRect rect; + rect.x = 0; + rect.y = GetLineStart( row ); + rect.width = GetEndOfLastCol(); + rect.height = GetLineHeight( row ); + + return rect; +} + +int wxDataViewMainWindow::GetLineStart( unsigned int row ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + // TODO make more efficient + + int start = 0; + + unsigned int r; + for (r = 0; r < row; r++) + { + const wxDataViewTreeNode* node = GetTreeNodeByRow(r); + if (!node) return start; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && + model->IsContainer(item) && + !model->HasContainerColumns(item)) + continue; // skip it! + + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } + + start += height; + } + + return start; + } + else + { + return row * m_lineHeight; + } +} + +int wxDataViewMainWindow::GetLineAt( unsigned int y ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + // check for the easy case first + if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + return y / m_lineHeight; + + // TODO make more efficient + unsigned int row = 0; + unsigned int yy = 0; + for (;;) + { + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) + { + // not really correct... + return row + ((y-yy) / m_lineHeight); + } + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && + model->IsContainer(item) && + !model->HasContainerColumns(item)) + continue; // skip it! + + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } + + yy += height; + if (y < yy) + return row; + + row++; + } +} + +int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + wxASSERT( !IsVirtualList() ); + + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + // wxASSERT( node ); + if (!node) return m_lineHeight; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + int height = m_lineHeight; + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && + model->IsContainer(item) && + !model->HasContainerColumns(item)) + continue; // skip it! + + wxVariant value; + model->GetValue( value, item, column->GetModelColumn() ); + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->SetValue( value ); + height = wxMax( height, renderer->GetSize().y ); + } + + return height; + } + else + { + return m_lineHeight; + } +} + +class RowToItemJob: public DoJob +{ +public: + RowToItemJob( unsigned int row , int current ) + { this->row = row; this->current = current; } + virtual ~RowToItemJob() {} + + virtual int operator() ( wxDataViewTreeNode * node ) + { + current ++; + if( current == static_cast(row)) + { + ret = node->GetItem(); + return DoJob::OK; + } + + if( node->GetSubTreeCount() + current < static_cast(row) ) + { + current += node->GetSubTreeCount(); + return DoJob::IGR; + } + else + { + // If the current has no child node, we can find the desired item of the row + // number directly. + // This if can speed up finding in some case, and will has a very good effect + // when it comes to list view + if( node->GetNodes().GetCount() == 0) + { + int index = static_cast(row) - current - 1; + ret = node->GetChildren().Item( index ); + return DoJob::OK; + } + return DoJob::CONT; + } + } + + virtual int operator() ( void * n ) + { + current ++; + if( current == static_cast(row)) + { + ret = wxDataViewItem( n ); + return DoJob::OK; + } + return DoJob::CONT; + } + + wxDataViewItem GetResult() const + { return ret; } + +private: + unsigned int row; + int current; + wxDataViewItem ret; +}; + +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const +{ + if (!m_root) + { + return wxDataViewItem( wxUIntToPtr(row) ); + } + else + { + RowToItemJob job( row, -2 ); + Walker( m_root , job ); + return job.GetResult(); + } +} + +class RowToTreeNodeJob: public DoJob +{ +public: + RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node ) + { + this->row = row; + this->current = current; + ret = NULL; + parent = node; + } + virtual ~RowToTreeNodeJob(){ } + + virtual int operator() ( wxDataViewTreeNode * node ) + { + current ++; + if( current == static_cast(row)) + { + ret = node; + return DoJob::OK; + } + + if( node->GetSubTreeCount() + current < static_cast(row) ) + { + current += node->GetSubTreeCount(); + return DoJob::IGR; + } + else + { + parent = node; + + // If the current node has no children, we can find the desired item of the + // row number directly. + // This if can speed up finding in some case, and will have a very good + // effect for list views. + if( node->GetNodes().GetCount() == 0) + { + int index = static_cast(row) - current - 1; + void * n = node->GetChildren().Item( index ); + ret = new wxDataViewTreeNode( parent ); + ret->SetItem( wxDataViewItem( n )); + ret->SetHasChildren(false); + return DoJob::OK; + } + return DoJob::CONT; + } + } + + virtual int operator() ( void * n ) + { + current ++; + if( current == static_cast(row)) + { + ret = new wxDataViewTreeNode( parent ); + ret->SetItem( wxDataViewItem( n )); + ret->SetHasChildren(false); + return DoJob::OK; + } + + return DoJob::CONT; + } + + wxDataViewTreeNode * GetResult() const + { return ret; } + +private: + unsigned int row; + int current; + wxDataViewTreeNode * ret; + wxDataViewTreeNode * parent; +}; + +wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const +{ + wxASSERT( !IsVirtualList() ); + + RowToTreeNodeJob job( row , -2, m_root ); + Walker( m_root , job ); + return job.GetResult(); +} + +wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, + const wxDataViewItem & item ) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(type, parent->GetId()); + + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); + + parent->GetEventHandler()->ProcessEvent(le); + return le; +} + +bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const +{ + if (IsVirtualList()) + return false; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return false; + + if (!node->HasChildren()) + { + delete node; + return false; + } + + return node->IsOpen(); +} + +bool wxDataViewMainWindow::HasChildren( unsigned int row ) const +{ + if (IsVirtualList()) + return false; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return false; + + if (!node->HasChildren()) + { + delete node; + return false; + } + + return true; } -void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) +void wxDataViewMainWindow::Expand( unsigned int row ) { - if (from > to) + if (IsVirtualList()) + return; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return; + + if (!node->HasChildren()) { - unsigned int tmp = to; - to = from; - from = tmp; + delete node; + return; } - wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + if (!node->IsOpen()) + { + wxDataViewEvent e = + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()); - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); -} + // Check if the user prevent expanding + if( e.GetSkipped() ) + return; -void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) -{ - unsigned int count = GetRowCount(); - if (firstRow > count) - return; + node->ToggleOpen(); - wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + // build the children of current node + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + } - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); + // By expanding the node all row indices that are currently in the selection list + // and are greater than our node have become invalid. So we have to correct that now. + const unsigned rowAdjustment = node->GetSubTreeCount(); + for(unsigned i=0; i row) + ChangeCurrentRow(m_currentRow + rowAdjustment); + + m_count = -1; + UpdateDisplay(); + // Send the expanded event + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + } } -void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) +void wxDataViewMainWindow::Collapse(unsigned int row) { - wxCHECK_RET( newCurrent < GetRowCount(), - _T("invalid item index in OnArrowChar()") ); - - // if there is no selection, we cannot move it anywhere - if (!HasCurrentRow()) + if (IsVirtualList()) return; - unsigned int oldCurrent = m_currentRow; + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + if (!node) + return; - // in single selection we just ignore Shift as we can't select several - // items anyhow - if ( event.ShiftDown() && !IsSingleSel() ) + if (!node->HasChildren()) { - RefreshRow( oldCurrent ); - - ChangeCurrentRow( newCurrent ); + delete node; + return; + } - // select all the items between the old and the new one - if ( oldCurrent > newCurrent ) + if (node->IsOpen()) { - newCurrent = oldCurrent; - oldCurrent = m_currentRow; - } + wxDataViewEvent e = + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); + if( e.GetSkipped() ) + return; + + // Find out if there are selected items below the current node. + bool selectCollapsingRow = false; + const unsigned rowAdjustment = node->GetSubTreeCount(); + unsigned maxRowToBeTested = row + rowAdjustment; + for(unsigned i=0; i row && testRow <= maxRowToBeTested) + { + selectCollapsingRow = true; + // get out as soon as we have found a node that is selected + break; + } + } - SelectRows( oldCurrent, newCurrent, true ); - } - else // !shift - { - RefreshRow( oldCurrent ); + node->ToggleOpen(); - // all previously selected items are unselected unless ctrl is held - if ( !event.ControlDown() ) - SelectAllRows(false); + // If the node to be closed has selected items the user won't see those any longer. + // We select the collapsing node in this case. + if(selectCollapsingRow) + { + SelectAllRows(false); + ChangeCurrentRow(row); + SelectRow(row, true); + SendSelectionChangedEvent(GetItemByRow(row)); + } + else + { + // if there were no selected items below our node we still need to "fix" the + // selection list to adjust for the changing of the row indices. + // We actually do the opposite of what we are doing in Expand(). + for(unsigned i=0; i row && m_currentRow <= maxRowToBeTested) + ChangeCurrentRow(row); + else if(m_currentRow > row) + ChangeCurrentRow(m_currentRow - rowAdjustment); + } - //EnsureVisible( m_currentRow ); + m_count = -1; + UpdateDisplay(); + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem()); + } } -wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const +wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) { - wxRect rect; - rect.x = 0; - rect.y = m_lineHeight * row; - rect.width = GetEndOfLastCol(); - rect.height = m_lineHeight; + wxDataViewModel * model = GetOwner()->GetModel(); + if( model == NULL ) + return NULL; - return rect; -} + if (!item.IsOk()) + return m_root; -class RowToItemJob: public DoJob -{ -public: - RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;} - virtual ~RowToItemJob(){}; + // Compose the a parent-chain of the finding item + ItemList list; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + wxDataViewItem * pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } - virtual int operator() ( wxDataViewTreeNode * node ) - { - if( current == static_cast(row)) - { - ret = node->GetItem() ; - return DoJob::OK; - } - current ++; - if ( node->IsOpen()) - return DoJob::CONT; - else - return DoJob::IGR; - } - - wxDataViewItem GetResult(){ return ret; } -private: - unsigned int row; - int current ; - wxDataViewItem ret; -}; + // Find the item along the parent-chain. + // This algorithm is designed to speed up the node-finding method + wxDataViewTreeNode * node = m_root; + for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ ) + { + if( node->HasChildren() ) + { + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + ::BuildTreeHelper(model, node->GetItem(), node); + } -wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) -{ - RowToItemJob job( row, 0 ); - Walker( m_root , job ); - return job.GetResult(); -} + wxDataViewTreeNodes nodes = node->GetNodes(); + unsigned int i; + bool found = false; -class RowToTreeNodeJob: public DoJob -{ -public: - RowToTreeNodeJob( unsigned int row , int current ) { this->row = row; this->current = current ; ret = NULL ; } - virtual ~RowToTreeNodeJob(){}; + for (i = 0; i < nodes.GetCount(); i ++) + { + if (nodes[i]->GetItem() == (**iter)) + { + if (nodes[i]->GetItem() == item) + return nodes[i]; - virtual int operator() ( wxDataViewTreeNode * node ) - { - if( current == static_cast(row)) - { - ret = node ; - return DoJob::OK; + node = nodes[i]; + found = true; + break; + } + } + if (!found) + return NULL; } - current ++; - if ( node->IsOpen()) - return DoJob::CONT; else - return DoJob::IGR; + return NULL; } + return NULL; +} - wxDataViewTreeNode * GetResult(){ return ret; } -private: - unsigned int row; - int current ; - wxDataViewTreeNode * ret; -}; +void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, + wxDataViewColumn* &column ) +{ + wxDataViewColumn *col = NULL; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int colnum = 0; + int x, y; + m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); + for (unsigned x_start = 0; colnum < cols; colnum++) + { + col = GetOwner()->GetColumnAt(colnum); + if (col->IsHidden()) + continue; // skip it! + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)x) + break; -wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) -{ - RowToTreeNodeJob job( row , 0 ); - Walker( m_root , job ); - return job.GetResult(); + x_start += w; + } + + column = col; + item = GetItemByRow( GetLineAt( y ) ); } -class CountJob : public DoJob +wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, + const wxDataViewColumn* column ) { -public: - CountJob(){ count = 0 ; } - virtual ~CountJob(){}; - - virtual int operator () ( wxDataViewTreeNode * node ) + int xpos = 0; + int width = 0; + + unsigned int cols = GetOwner()->GetColumnCount(); + // If column is null the loop will compute the combined width of all columns. + // Otherwise, it will compute the x position of the column we are looking for. + for (unsigned int i = 0; i < cols; i++) { - count ++; - if ( node->IsOpen()) - return DoJob::CONT; - else - return DoJob::IGR; + wxDataViewColumn* col = GetOwner()->GetColumnAt( i ); + + if (col == column) + break; + + if (col->IsHidden()) + continue; // skip it! + + xpos += col->GetWidth(); + width += col->GetWidth(); } - unsigned int GetResult() + if(column != 0) { - return count ; + // If we have a column, we need can get its width directly. + if(column->IsHidden()) + width = 0; + else + width = column->GetWidth(); + + } + else + { + // If we have no column, we reset the x position back to zero. + xpos = 0; } -private: - unsigned int count; -}; -void wxDataViewMainWindow::OnExpanding( unsigned int row ) -{ - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if( node != NULL ) + // we have to take an expander column into account and compute its indentation + // to get the correct x position where the actual text is + int indent = 0; + int row = GetRowByItem(item); + if (!IsVirtualList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) ) { - if( node->HasChildren()) - if( !node->IsOpen()) - { - node->ToggleOpen(); - //Here I build the children of current node - if( node->GetChildrenNumber() == 0 ) - BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); - m_count = -1; - Refresh(); - } + wxDataViewTreeNode* node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander + + if(!node->HasChildren()) + delete node; } + + wxRect itemRect( xpos + indent, + GetLineStart( row ), + width - indent, + GetLineHeight( row ) ); + + GetOwner()->CalcScrolledPosition( itemRect.x, itemRect.y, + &itemRect.x, &itemRect.y ); + + return itemRect; } -void wxDataViewMainWindow::OnCollapsing(unsigned int row) +int wxDataViewMainWindow::RecalculateCount() { - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if( node != NULL ) + if (!m_root) { - if( node->HasChildren() && node->IsOpen() ) - { - node->ToggleOpen(); - m_count = -1; - Refresh(); - //RefreshRows(row,GetLastVisibleRow()); - } - else - { - node = node->GetParent(); - if( node != NULL ) - { - int parent = GetRowByItem( node->GetItem()) ; - SelectRow( row, false); - SelectRow(parent , true ); - ChangeCurrentRow( parent ); - } - } - } -} - -int wxDataViewMainWindow::RecalculateCount() -{ - CountJob job; - Walker( m_root, job ); - return job.GetResult(); + wxDataViewIndexListModel *list_model = + (wxDataViewIndexListModel*) GetOwner()->GetModel(); +#ifndef __WXMAC__ + return list_model->GetLastIndex() + 1; +#else + return list_model->GetLastIndex() - 1; +#endif + } + else + { + return m_root->GetSubTreeCount(); + } } class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item){ this->item = item ; ret = 0 ; } - virtual ~ItemToRowJob(){}; + ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) + : m_iter(iter), + item(item_) + { + ret = -1; + } + // Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) { - ret ++; - if( node->GetItem() == item ) - return DoJob::OK; + ret ++; + if( node->GetItem() == item ) + { + return DoJob::OK; + } + + if( node->GetItem() == **m_iter ) + { + m_iter++; + return DoJob::CONT; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::IGR; + } - if( node->IsOpen()) - return DoJob::CONT; - else - return DoJob::IGR; } - //the row number is begin from zero - int GetResult(){ return ret -1 ; } + virtual int operator() ( void * n ) + { + ret ++; + if( n == item.GetID() ) + return DoJob::OK; + return DoJob::CONT; + } + + // the row number is begin from zero + int GetResult() const + { return ret -1; } + private: + ItemList::const_iterator m_iter; wxDataViewItem item; int ret; + }; -unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const { - ItemToRowJob job( item ); - Walker(m_root , job ); - return job.GetResult(); + const wxDataViewModel * model = GetOwner()->GetModel(); + if( model == NULL ) + return -1; + + if (!m_root) + { + return wxPtrToUInt( item.GetID() ); + } + else + { + if( !item.IsOk() ) + return -1; + + // Compose the a parent-chain of the finding item + ItemList list; + wxDataViewItem * pItem; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + pItem = new wxDataViewItem( ); + list.Insert( pItem ); + + ItemToRowJob job( item, list.begin() ); + Walker(m_root , job ); + return job.GetResult(); + } } -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, + wxDataViewTreeNode * node) { - if( !model->HasChildren( item ) ) - return ; - - wxDataViewItem i = model->GetFirstChild( item ); - while( i.IsOk() ) + if( !model->IsContainer( item ) ) + return; + + wxDataViewItemArray children; + unsigned int num = model->GetChildren( item, children); + + unsigned int index = 0; + while( index < num ) { - wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); - n->SetItem(i); - n->SetHasChildren( model->HasChildren( i )) ; - node->AppendChild(n); - //BuildTreeHelper( model, i, n) ; - i = model->GetNextSibling( i ); + if( model->IsContainer( children[index] ) ) + { + wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); + n->SetItem(children[index]); + n->SetHasChildren( true ); + node->AddNode( n ); + } + else + { + node->AddLeaf( children[index].GetID() ); + } + index ++; } + node->SetSubTreeCount( num ); + wxDataViewTreeNode * n = node->GetParent(); + if( n != NULL) + n->ChangeSubTreeCount(num); + } void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { - //First we define a invalid item to fetch the top-level elements + DestroyTree(); + + if (GetOwner()->GetModel()->IsVirtualListModel()) + { + m_count = -1; + return; + } + + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); + + // First we define a invalid item to fetch the top-level elements wxDataViewItem item; + SortPrepare(); BuildTreeHelper( model, item, m_root); - m_count = -1 ; + m_count = -1; } -void DestroyTreeHelper( wxDataViewTreeNode * node ) +static void DestroyTreeHelper( wxDataViewTreeNode * node ) { - if( node->HasChildren() ) + if( node->GetNodeNumber() != 0 ) { - int len = node->GetChildrenNumber(); - int i = 0 ; - wxDataViewTreeNodes nodes = node->GetChildren(); - for( ; i < len; i ++ ) - { + int len = node->GetNodeNumber(); + wxDataViewTreeNodes& nodes = node->GetNodes(); + for (int i = 0; i < len; i++) DestroyTreeHelper(nodes[i]); - } } delete node; } void wxDataViewMainWindow::DestroyTree() { - DestroyTreeHelper(m_root); - m_count = 0 ; + if (!IsVirtualList()) + { + ::DestroyTreeHelper(m_root); + m_count = 0; + m_root = NULL; + } } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { - if (event.GetKeyCode() == WXK_TAB) - { - wxNavigationKeyEvent nevent; - nevent.SetWindowChange( event.ControlDown() ); - nevent.SetDirection( !event.ShiftDown() ); - nevent.SetEventObject( GetParent()->GetParent() ); - nevent.SetCurrentFocus( m_parent ); - if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) - return; - } + if ( GetParent()->HandleAsNavigationKey(event) ) + return; // no item -> nothing to do if (!HasCurrentRow()) @@ -2616,27 +3413,81 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { + case WXK_RETURN: + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, + parent->GetId()); + le.SetItem( GetItemByRow(m_currentRow) ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); + } + break; + case WXK_UP: if ( m_currentRow > 0 ) OnArrowChar( m_currentRow - 1, event ); break; - case WXK_DOWN: - if ( m_currentRow < GetRowCount() - 1 ) - OnArrowChar( m_currentRow + 1, event ); + case WXK_DOWN: + if ( m_currentRow < GetRowCount() - 1 ) + OnArrowChar( m_currentRow + 1, event ); + break; + // Add the process for tree expanding/collapsing + case WXK_LEFT: + { + if (IsVirtualList()) + break; + + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + if (!node) + break; + + if (node->HasChildren()) + { + Collapse(m_currentRow); + } + else + { + wxDataViewTreeNode *parent_node = node->GetParent(); + delete node; + if (parent_node) + { + int parent = GetRowByItem( parent_node->GetItem() ); + if ( parent >= 0 ) + { + unsigned int row = m_currentRow; + SelectRow( row, false); + SelectRow( parent, true ); + ChangeCurrentRow( parent ); + SendSelectionChangedEvent( parent_node->GetItem() ); + } + } + } break; - //Add the process for tree expanding/collapsing - case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + } + case WXK_RIGHT: + { + if (!IsExpanded( m_currentRow )) + Expand( m_currentRow ); + else + { + unsigned int row = m_currentRow; + SelectRow( row, false ); + SelectRow( row + 1, true ); + ChangeCurrentRow( row + 1 ); + SendSelectionChangedEvent( GetItemByRow(row+1) ); + } + break; + } case WXK_END: + { if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); break; - + } case WXK_HOME: if (!IsEmpty()) OnArrowChar( 0, event ); @@ -2682,7 +3533,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - wxDataViewColumn *col = NULL; int xpos = 0; @@ -2690,7 +3540,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) unsigned int i; for (i = 0; i < cols; i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); + wxDataViewColumn *c = GetOwner()->GetColumnAt( i ); if (c->IsHidden()) continue; // skip it! @@ -2703,18 +3553,63 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewRenderer *cell = col->GetRenderer(); - - unsigned int current = y / m_lineHeight; - if ((current > GetRowCount()) || (x > GetEndOfLastCol())) + wxDataViewRenderer *cell = col->GetRenderer(); + unsigned int current = GetLineAt( y ); + if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? return; } + // Test whether the mouse is hovered on the tree item button + bool hoverOverExpander = false; + if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) + { + wxDataViewTreeNode * node = GetTreeNodeByRow(current); + if( node!=NULL && node->HasChildren() ) + { + int indent = node->GetIndentLevel(); + indent = GetOwner()->GetIndent()*indent; + + // we make the rectangle we are looking in a bit bigger than the actual + // visual expander so the user can hit that little thing reliably + wxRect rect( xpos + indent, + GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, + m_lineHeight, m_lineHeight); + if( rect.Contains(x, y) ) + { + // So the mouse is over the expander + hoverOverExpander = true; + if (m_underMouse && m_underMouse != node) + { + // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + } + if (m_underMouse != node) + { + // wxLogMessage("Do the row: %d", current); + RefreshRow(current); + } + m_underMouse = node; + } + } + if (node!=NULL && !node->HasChildren()) + delete node; + } + if (!hoverOverExpander) + { + if (m_underMouse != NULL) + { + // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + m_underMouse = NULL; + } + } + wxDataViewModel *model = GetOwner()->GetModel(); +#if wxUSE_DRAG_AND_DROP if (event.Dragging()) { if (m_dragCount == 0) @@ -2732,7 +3627,30 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (event.LeftIsDown()) { + m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, + &m_dragStart.x, &m_dragStart.y ); + unsigned int drag_item_row = GetLineAt( m_dragStart.y ); + wxDataViewItem item = GetItemByRow( drag_item_row ); + // Notify cell about drag + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + if (!m_owner->HandleWindowEvent( event )) + return; + + if (!event.IsAllowed()) + return; + + wxDataObject *obj = event.GetDataObject(); + if (!obj) + return; + + wxDataViewDropSource drag( this, drag_item_row ); + drag.SetData( *obj ); + /* wxDragResult res = */ drag.DoDragDrop(); + delete obj; } return; } @@ -2740,8 +3658,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { m_dragCount = 0; } +#endif // wxUSE_DRAG_AND_DROP - bool forceClick = false; + bool simulateClick = false; if (event.ButtonDClick()) { @@ -2749,19 +3668,39 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; } + wxDataViewItem item = GetItemByRow(current); + bool ignore_other_columns = + ((GetOwner()->GetExpanderColumn() != col) && + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); + if (event.LeftDClick()) { - if ( current == m_lineLastClicked ) + if(hoverOverExpander) { - if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + // a double click on the expander will be converted into a "simulated" normal click + simulateClick = true; + } + else if ( current == m_lineLastClicked ) + { + if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) { wxVariant value; - model->GetValue( value, col->GetModelColumn(), current ); + model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, - col->GetWidth(), m_lineHeight ); - wxDataViewItem dataitem = GetItemByRow(current); - cell->Activate( cell_rect, model, dataitem, col->GetModelColumn() ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); + cell->Activate( cell_rect, model, item, col->GetModelColumn() ); + } + else + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); } return; } @@ -2769,42 +3708,26 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { // The first click was on another item, so don't interpret this as // a double click, but as a simple click instead - forceClick = true; + simulateClick = true; } } - if (event.LeftUp()) + if (event.LeftUp() && !hoverOverExpander) { if (m_lineSelectSingleOnUp != (unsigned int)-1) { // select single line SelectAllRows( false ); SelectRow( m_lineSelectSingleOnUp, true ); + SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) ); } - //Process the event of user clicking the expander - bool expander = false; - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) - { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN); - if( rect.Contains( x, y) ) - { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); - } - } - - //If the user click the expander, we do not do editing even if the column with expander are editable - if (m_lastOnSame && !expander ) + // If the user click the expander, we do not do editing even if the column + // with expander are editable + if (m_lastOnSame && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && - (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) + (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -2813,7 +3736,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; m_lineSelectSingleOnUp = (unsigned int)-1; } - else + else if(!event.LeftUp()) { // This is necessary, because after a DnD operation in // from and to ourself, the up event is swallowed by the @@ -2834,24 +3757,38 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SelectAllRows(false); ChangeCurrentRow(current); SelectRow(m_currentRow,true); + SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } - // notify cell about right click - // cell->... - - // Allow generation of context menu event - event.Skip(); + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetValue(value); + parent->GetEventHandler()->ProcessEvent(le); } else if (event.MiddleDown()) { - // notify cell about middle click - // cell->... } - if (event.LeftDown() || forceClick) + + if((event.LeftDown() || simulateClick) && hoverOverExpander) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(current); + + // hoverOverExpander being true tells us that our node must be + // valid and have children. + // So we don't need any extra checks. + if( node->IsOpen() ) + Collapse(current); + else + Expand(current); + } + else if ((event.LeftDown() || simulateClick) && !hoverOverExpander) { -#ifdef __WXMSW__ SetFocus(); -#endif m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -2865,10 +3802,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if ( IsSingleSel() || !IsRowSelected(current) ) { SelectAllRows( false ); - ChangeCurrentRow(current); - SelectRow(m_currentRow,true); + SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } else // multi sel & current is highlighted & no mod keys { @@ -2881,15 +3817,15 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (cmdModifierDown) { ChangeCurrentRow(current); - ReverseRowSelection(m_currentRow); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else if (event.ShiftDown()) { ChangeCurrentRow(current); unsigned int lineFrom = oldCurrentRow, - lineTo = current; + lineTo = current; if ( lineTo < lineFrom ) { @@ -2898,6 +3834,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } SelectRows(lineFrom, lineTo, true); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else // !ctrl, !shift { @@ -2914,8 +3851,21 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + + // Call LeftClick after everything else as under GTK+ + if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE) + { + // notify cell about right click + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + cell->SetValue( value ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); + /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, + model, item, col->GetModelColumn()); + } } } @@ -2939,19 +3889,21 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } -wxDataViewItem wxDataViewMainWindow::GetSelection() +wxDataViewItem wxDataViewMainWindow::GetSelection() const { if( m_selection.GetCount() != 1 ) return wxDataViewItem(); - return GetItemByRow( m_selection.Item( 0 ) ); + + return GetItemByRow( m_selection.Item(0)); } //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) +WX_DEFINE_LIST(wxDataViewColumnList) +IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase) EVT_SIZE(wxDataViewCtrl::OnSize) END_EVENT_TABLE() @@ -2960,25 +3912,38 @@ wxDataViewCtrl::~wxDataViewCtrl() { if (m_notifier) GetModel()->RemoveNotifier( m_notifier ); + + m_cols.Clear(); } void wxDataViewCtrl::Init() { + m_cols.DeleteContents(true); m_notifier = NULL; + + // No sorting column at start + m_sortingColumnIdx = wxNOT_FOUND; + + m_headerArea = NULL; } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) + const wxPoint& pos, const wxSize& size, + long style, const wxValidator& validator ) { +// if ( (style & wxBORDER_MASK) == 0) +// style |= wxBORDER_SUNKEN; + + Init(); + if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + style | wxScrolledWindowStyle, validator)) return false; - Init(); + SetInitialSize(size); #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren( true ); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); @@ -2986,7 +3951,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, if (HasFlag(wxDV_NO_HEADER)) m_headerArea = NULL; else - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY ); + m_headerArea = new wxDataViewHeaderWindow(this); SetTargetWindow( m_clientArea ); @@ -2999,10 +3964,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return true; } +wxBorder wxDataViewCtrl::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + #ifdef __WXMSW__ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam); @@ -3018,6 +3988,15 @@ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, } #endif +wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) +{ + wxSize newsize = size; + if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea)) + newsize.y -= m_headerArea->GetSize().y; + + return newsize; +} + void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) { // We need to override OnSize so that our scrolled @@ -3032,6 +4011,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) AdjustScrollbars(); } +void wxDataViewCtrl::SetFocus() +{ + if (m_clientArea) + m_clientArea->SetFocus(); +} + bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) @@ -3041,6 +4026,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); + m_clientArea->DestroyTree(); + m_clientArea->BuildTree(model); m_clientArea->UpdateDisplay(); @@ -3048,19 +4035,62 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) return true; } +#if wxUSE_DRAG_AND_DROP + +bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) +{ + return m_clientArea->EnableDragSource( format ); +} + +bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) +{ + return m_clientArea->EnableDropTarget( format ); +} + +#endif // wxUSE_DRAG_AND_DROP + bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) return false; - OnColumnChange(); + m_cols.Append( col ); + OnColumnsCountChanged(); + return true; +} + +bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::PrependColumn(col)) + return false; + + m_cols.Insert( col ); + OnColumnsCountChanged(); + return true; +} + +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + m_cols.Insert( pos, col ); + OnColumnsCountChanged(); return true; } -void wxDataViewCtrl::OnColumnChange() +void wxDataViewCtrl::OnColumnChange(unsigned int idx) +{ + if ( m_headerArea ) + m_headerArea->UpdateColumn(idx); + + m_clientArea->UpdateDisplay(); +} + +void wxDataViewCtrl::OnColumnsCountChanged() { if (m_headerArea) - m_headerArea->UpdateDisplay(); + m_headerArea->SetColumnCount(GetColumnCount()); m_clientArea->UpdateDisplay(); } @@ -3075,55 +4105,334 @@ void wxDataViewCtrl::DoSetIndent() m_clientArea->UpdateDisplay(); } -wxDataViewItem wxDataViewCtrl::GetSelection() +unsigned int wxDataViewCtrl::GetColumnCount() const +{ + return m_cols.GetCount(); +} + +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const +{ + return m_cols[idx]; +} + +wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const +{ + // columns can't be reordered if there is no header window which allows + // to do this + const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos] + : pos; + + return GetColumn(idx); +} + +int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const +{ + const unsigned count = m_cols.size(); + for ( unsigned n = 0; n < count; n++ ) + { + if ( m_cols[n] == column ) + return n; + } + + return wxNOT_FOUND; +} + +void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), + unsigned int WXUNUSED(new_pos)) +{ + // do _not_ reorder m_cols elements here, they should always be in the + // order in which columns were added, we only display the columns in + // different order + m_clientArea->UpdateDisplay(); +} + +bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) +{ + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); + if (!ret) + return false; + + m_cols.Erase(ret); + OnColumnsCountChanged(); + + return true; +} + +bool wxDataViewCtrl::ClearColumns() +{ + m_cols.Clear(); + OnColumnsCountChanged(); + return true; +} + +int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const +{ + int ret = 0, + dummy = 0; + unsigned int len = GetColumnCount(); + for ( unsigned int i = 0; i < len; i++ ) + { + wxDataViewColumn * col = GetColumnAt(i); + if (col->IsHidden()) + continue; + ret += col->GetWidth(); + if (column==col) + { + CalcScrolledPosition( ret, dummy, &ret, &dummy ); + break; + } + } + return ret; +} + +wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const +{ + return m_sortingColumnIdx == wxNOT_FOUND ? NULL + : GetColumn(m_sortingColumnIdx); +} + +// Selection code with wxDataViewItem as parameters +wxDataViewItem wxDataViewCtrl::GetSelection() const { return m_clientArea->GetSelection(); } -/******************************************************************** -void wxDataViewCtrl::SetSelection( int row ) +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const +{ + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( m_clientArea->GetItemByRow( row ) ); + } + return len; +} + +void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) +{ + wxDataViewSelection selection(wxDataViewSelectionCmp); + + wxDataViewItem last_parent; + + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + wxDataViewItem item = sel[i]; + wxDataViewItem parent = GetModel()->GetParent( item ); + if (parent) + { + if (parent != last_parent) + ExpandAncestors(item); + } + + last_parent = parent; + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + + m_clientArea->SetSelections( selection ); +} + +void wxDataViewCtrl::Select( const wxDataViewItem & item ) +{ + ExpandAncestors( item ); + + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + // Unselect all rows before select another in the single select mode + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow(row, true); + } +} + +void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) { - m_clientArea->SelectRow(row, true); + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + m_clientArea->SelectRow(row, false); } -void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const { - m_clientArea->SelectRows(from, to, true); + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + return m_clientArea->IsRowSelected(row); + } + return false; +} + +// Selection code with row number as parameter +int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const +{ + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( row ); + } + return len; } -void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections ) +void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) { - m_clientArea->Select(aSelections); + wxDataViewSelection selection(wxDataViewSelectionCmp); + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + int row = sel[i]; + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + m_clientArea->SetSelections( selection ); } -void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) ) +void wxDataViewCtrl::Select( int row ) { - // FIXME - TODO + if( row >= 0 ) + { + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow( row, true ); + } } -bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const +void wxDataViewCtrl::Unselect( int row ) { - // FIXME - TODO + if( row >= 0 ) + m_clientArea->SelectRow(row, false); +} +bool wxDataViewCtrl::IsSelected( int row ) const +{ + if( row >= 0 ) + return m_clientArea->IsRowSelected(row); return false; } -int wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::SelectRange( int from, int to ) { - // FIXME - TODO + wxArrayInt sel; + for( int i = from; i < to; i ++ ) + sel.Add( i ); + m_clientArea->Select(sel); +} - return -1; +void wxDataViewCtrl::UnselectRange( int from, int to ) +{ + wxDataViewSelection sel = m_clientArea->GetSelections(); + for( int i = from; i < to; i ++ ) + if( sel.Index( i ) != wxNOT_FOUND ) + sel.Remove( i ); + m_clientArea->SetSelections(sel); } -int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const +void wxDataViewCtrl::SelectAll() { - // FIXME - TODO + m_clientArea->SelectAllRows(true); +} - return 0; +void wxDataViewCtrl::UnselectAll() +{ + m_clientArea->SelectAllRows(false); } -*********************************************************************/ -#endif - // !wxUSE_GENERICDATAVIEWCTRL -#endif - // wxUSE_DATAVIEWCTRL +void wxDataViewCtrl::EnsureVisible( int row, int column ) +{ + if( row < 0 ) + row = 0; + if( row > (int) m_clientArea->GetRowCount() ) + row = m_clientArea->GetRowCount(); + + int first = m_clientArea->GetFirstVisibleRow(); + int last = m_clientArea->GetLastVisibleRow(); + if( row < first ) + m_clientArea->ScrollTo( row, column ); + else if( row > last ) + m_clientArea->ScrollTo( row - last + first, column ); + else + m_clientArea->ScrollTo( first, column ); +} + +void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) +{ + ExpandAncestors( item ); + + m_clientArea->RecalculateDisplay(); + + int row = m_clientArea->GetRowByItem(item); + if( row >= 0 ) + { + if( column == NULL ) + EnsureVisible(row, -1); + else + EnsureVisible( row, GetColumnIndex(column) ); + } + +} + +void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, + wxDataViewColumn* &column ) const +{ + m_clientArea->HitTest(point, item, column); +} + +wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, + const wxDataViewColumn* column ) const +{ + return m_clientArea->GetItemRect(item, column); +} + +wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const +{ + return m_clientArea->GetItemByRow( row ); +} + +int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const +{ + return m_clientArea->GetRowByItem( item ); +} + +void wxDataViewCtrl::Expand( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Expand(row); +} + +void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Collapse(row); +} + +bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + return m_clientArea->IsExpanded(row); + return false; +} + +void wxDataViewCtrl::StartEditor( const wxDataViewItem & item, unsigned int column ) +{ + wxDataViewColumn* col = GetColumn( column ); + if (!col) + return; + + wxRect itemRect = GetItemRect(item, col); + wxDataViewRenderer* renderer = col->GetRenderer(); + renderer->StartEditing(item, itemRect); +} + +#endif // !wxUSE_GENERICDATAVIEWCTRL + +#endif // wxUSE_DATAVIEWCTRL