X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/981cd83efc80aaaadd4521b044f95602cef9c65c..a39815bd30c62e13089f318028c9ee547940c4ad:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index f9f0346f8b..5fd5797d8c 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -34,10 +34,10 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/dcscreen.h" + #include "wx/frame.h" #endif #include "wx/stockitem.h" -#include "wx/calctrl.h" #include "wx/popupwin.h" #include "wx/renderer.h" #include "wx/dcbuffer.h" @@ -45,13 +45,23 @@ #include "wx/list.h" #include "wx/listimpl.cpp" #include "wx/imaglist.h" +#include "wx/headerctrl.h" +#include "wx/dnd.h" +#include "wx/stopwatch.h" +#include "wx/weakref.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- +class wxDataViewColumn; +class wxDataViewHeaderWindow; class wxDataViewCtrl; +//----------------------------------------------------------------------------- +// classes +//----------------------------------------------------------------------------- + static const int SCROLL_UNIT_X = 15; // the cell padding on the left/right @@ -66,200 +76,223 @@ static const int EXPANDER_OFFSET = 4; static const int EXPANDER_OFFSET = 1; #endif -//----------------------------------------------------------------------------- -// wxDataViewHeaderWindow -//----------------------------------------------------------------------------- - -// on wxMSW the header window (only that part however) can be made native! -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #define USE_NATIVE_HEADER_WINDOW -#endif - -//Below is the compare stuff -//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed -static wxDataViewModel * g_model; +// 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; -// 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 +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +namespace { -public: - wxDataViewHeaderWindowBase() - { m_owner = NULL; } - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name) +// Return the expander column or, if it is not set, the first column and also +// set it as the expander one for the future. +wxDataViewColumn* GetExpanderColumnOrFirstOne(wxDataViewCtrl* dataview) +{ + wxDataViewColumn* expander = dataview->GetExpanderColumn(); + if (!expander) { - return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name); + // TODO-RTL: last column for RTL support + expander = dataview->GetColumnAt( 0 ); + dataview->SetExpanderColumn(expander); } - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } - - // called on column addition/removal - virtual void UpdateDisplay() { /* by default, do nothing */ } + return expander; +} - // returns the n-th column - virtual wxDataViewColumn *GetColumn(unsigned int n) - { - wxASSERT(m_owner); - wxDataViewColumn *ret = m_owner->GetColumn(n); - wxASSERT(ret); +} // anonymous namespace - return ret; - } +//----------------------------------------------------------------------------- +// wxDataViewColumn +//----------------------------------------------------------------------------- -protected: - wxDataViewCtrl *m_owner; +void wxDataViewColumn::Init(int width, wxAlignment align, int flags) +{ + m_width = width; + m_minWidth = 0; + m_align = align; + m_flags = flags; + m_sort = false; + m_sortAscending = true; +} - // sends an event generated from the n-th wxDataViewColumn - void SendEvent(wxEventType type, unsigned int n); -}; +int wxDataViewColumn::GetWidth() const +{ + switch ( m_width ) + { + case wxCOL_WIDTH_DEFAULT: + return wxDVC_DEFAULT_WIDTH; -#ifdef USE_NATIVE_HEADER_WINDOW + case wxCOL_WIDTH_AUTOSIZE: + wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" ); + return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this)); -#define COLUMN_WIDTH_OFFSET 2 -#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow + default: + return m_width; + } +} -class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase +void wxDataViewColumn::UpdateDisplay() { -public: - - wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + if (m_owner) { - Create(parent, id, pos, size, name); + int idx = m_owner->GetColumnIndex( this ); + m_owner->OnColumnChange( 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(); - - virtual void OnInternalIdle(); - - // called Refresh afterwards - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); - - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - -protected: - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); - - wxSize DoGetBestSize() const; - - unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); +void wxDataViewColumn::SetSortOrder(bool ascending) +{ + if ( !m_owner ) + return; - wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) - { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + // First unset the old sort column if any. + int oldSortKey = m_owner->GetSortingColumnIndex(); + if ( oldSortKey != wxNOT_FOUND ) + { + m_owner->GetColumn(oldSortKey)->UnsetAsSortKey(); + } - int m_scrollOffsetX; - int m_buttonHeight; - bool m_delayedUpdate; - wxImageList *m_imageList; + // Now set this one as the new sort column. + const int idx = m_owner->GetColumnIndex(this); + m_owner->SetSortingColumnIndex(idx); -private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) -}; + m_sort = true; + m_sortAscending = ascending; -#else // !defined(__WXMSW__) + // Call this directly instead of using UpdateDisplay() as we already have + // the column index, no need to look it up again. + m_owner->OnColumnChange(idx); +} -#define HEADER_WINDOW_HEIGHT 25 -#define HEADER_HORIZ_BORDER 5 -#define HEADER_VERT_BORDER 3 -#define wxGenericDataViewHeaderWindow wxDataViewHeaderWindow +//----------------------------------------------------------------------------- +// wxDataViewHeaderWindow +//----------------------------------------------------------------------------- -class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase +class wxDataViewHeaderWindow : public wxHeaderCtrl { public: - wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + wxDataViewHeaderWindow(wxDataViewCtrl *parent) + : wxHeaderCtrl(parent) { - Init(); - Create(parent, id, pos, size, name); } - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name); + wxDataViewCtrl *GetOwner() const + { return static_cast(GetParent()); } - ~wxGenericDataViewHeaderWindow() +protected: + // implement/override wxHeaderCtrl functions by forwarding them to the main + // control + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const { - delete m_resizeCursor; + return *(GetOwner()->GetColumn(idx)); } - virtual void UpdateDisplay() { Refresh(); } + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) + { + wxDataViewCtrl * const owner = GetOwner(); - // event handlers: + int widthContents = owner->GetBestColumnWidth(idx); + owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents)); + owner->OnColumnChange(idx); - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); + return true; + } +private: + bool SendEvent(wxEventType type, unsigned int n) + { + wxDataViewCtrl * const owner = GetOwner(); + wxDataViewEvent event(type, owner->GetId()); -protected: + event.SetEventObject(owner); + event.SetColumn(n); + event.SetDataViewColumn(owner->GetColumn(n)); + event.SetModel(owner->GetModel()); - // vars used for column resizing: + // for events created by wxDataViewHeaderWindow the + // row / value fields are not valid + return owner->ProcessWindowEvent(event); + } - wxCursor *m_resizeCursor; - const wxCursor *m_currentCursor; - bool m_isDragging; + void OnClick(wxHeaderCtrlEvent& event) + { + const unsigned idx = event.GetColumn(); - bool m_dirty; // needs refresh? - int m_hover; // index of the column under the mouse - 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 ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) + return; - // the pen used to draw the current column width drag line - // when resizing the columsn - wxPen m_penCurrent; + // 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; + } + if ( col->IsSortKey() ) + { + // already using this column for sorting, just change the order + col->ToggleSortOrder(); + } + else // not using this column for sorting yet + { + col->SetSortOrder(true); + } - // internal utilities: + wxDataViewModel * const model = owner->GetModel(); + if ( model ) + model->Resort(); - void Init() - { - m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); + owner->OnColumnChange(idx); - m_isDragging = false; - m_dirty = false; + SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, idx); + } + + void OnRClick(wxHeaderCtrlEvent& event) + { + if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, + event.GetColumn()) ) + event.Skip(); + } - m_hover = wxNOT_FOUND; - 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 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 @@ -278,61 +311,95 @@ public: //----------------------------------------------------------------------------- // wxDataViewTreeNode //----------------------------------------------------------------------------- + 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); +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, + wxDataViewTreeNode ** node2); class wxDataViewTreeNode { public: - wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) + wxDataViewTreeNode(wxDataViewTreeNode *parent, const wxDataViewItem& item) + : m_parent(parent), + m_item(item), + m_branchData(NULL) { - m_parent = parent; - if (!parent) - m_open = true; - else - m_open = false; - m_hasChildren = false; - m_subTreeCount = 0; } ~wxDataViewTreeNode() { + if ( m_branchData ) + { + wxDataViewTreeNodes& nodes = m_branchData->children; + for ( wxDataViewTreeNodes::iterator i = nodes.begin(); + i != nodes.end(); + ++i ) + { + delete *i; + } + + delete m_branchData; + } + } + + static wxDataViewTreeNode* CreateRootNode() + { + wxDataViewTreeNode *n = new wxDataViewTreeNode(NULL, wxDataViewItem()); + n->SetHasChildren(true); + n->m_branchData->open = true; + return n; } 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 ) + const wxDataViewTreeNodes& GetChildNodes() const { - 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 ); + wxASSERT( m_branchData != NULL ); + return m_branchData->children; } - void AddLeaf( void * leaf ) + + void InsertChild(wxDataViewTreeNode *node, unsigned index) { - m_leaves.Add( leaf ); + if ( !m_branchData ) + m_branchData = new BranchNodeData; + + m_branchData->children.Insert(node, index); + + // TODO: insert into sorted array directly in O(log n) instead of resorting in O(n log n) if (g_column >= -1) - m_leaves.Sort( &wxGenericTreeModelItemCmp ); + m_branchData->children.Sort( &wxGenericTreeModelNodeCmp ); + } + + void RemoveChild(wxDataViewTreeNode *node) + { + wxCHECK_RET( m_branchData != NULL, "leaf node doesn't have children" ); + m_branchData->children.Remove(node); + } + + // returns position of child node for given item in children list or wxNOT_FOUND + int FindChildByItem(const wxDataViewItem& item) const + { + if ( !m_branchData ) + return wxNOT_FOUND; + + const wxDataViewTreeNodes& nodes = m_branchData->children; + const int len = nodes.size(); + for ( int i = 0; i < len; i++ ) + { + if ( nodes[i]->m_item == item ) + return i; + } + return wxNOT_FOUND; } - 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 ; + int ret = 0; const wxDataViewTreeNode * node = this; while( node->GetParent()->GetParent() != NULL ) { @@ -344,84 +411,136 @@ public: bool IsOpen() const { - return m_open ; + return m_branchData && m_branchData->open; } void ToggleOpen() { - int len = m_nodes.GetCount(); + wxCHECK_RET( m_branchData != NULL, "can't open leaf node" ); + int sum = 0; - for ( int i = 0 ;i < len ; i ++) - sum += m_nodes[i]->GetSubTreeCount(); - sum += m_leaves.GetCount(); - if (m_open) + const wxDataViewTreeNodes& nodes = m_branchData->children; + const int len = nodes.GetCount(); + for ( int i = 0;i < len; i ++) + sum += 1 + nodes[i]->GetSubTreeCount(); + + if (m_branchData->open) { ChangeSubTreeCount(-sum); - m_open = !m_open; + m_branchData->open = !m_branchData->open; } else { - m_open = !m_open; - ChangeSubTreeCount(sum); + m_branchData->open = !m_branchData->open; + ChangeSubTreeCount(+sum); + } + } + + // "HasChildren" property corresponds to model's IsContainer(). Note that it may be true + // even if GetChildNodes() is empty; see below. + bool HasChildren() const + { + return m_branchData != NULL; + } + + void SetHasChildren(bool has) + { + if ( !has ) + { + wxDELETE(m_branchData); + } + else if ( m_branchData == NULL ) + { + m_branchData = new BranchNodeData; } } - bool HasChildren() const { return m_hasChildren; } - void SetHasChildren( bool has ){ m_hasChildren = has; } - void SetSubTreeCount( int num ) { m_subTreeCount = num; } - int GetSubTreeCount() const { return m_subTreeCount; } + int GetSubTreeCount() const + { + return m_branchData ? m_branchData->subTreeCount : 0; + } + void ChangeSubTreeCount( int num ) { - if( !m_open ) - return ; - m_subTreeCount += num; + wxASSERT( m_branchData != NULL ); + + if( !m_branchData->open ) + return; + + m_branchData->subTreeCount += num; + wxASSERT( m_branchData->subTreeCount >= 0 ); + if( m_parent ) m_parent->ChangeSubTreeCount(num); } void Resort() { + if ( !m_branchData ) + return; + if (g_column >= -1) { - m_nodes.Sort( &wxGenericTreeModelNodeCmp ); - int len = m_nodes.GetCount(); + wxDataViewTreeNodes& nodes = m_branchData->children; + + nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = nodes.GetCount(); for (int i = 0; i < len; i ++) - m_nodes[i]->Resort(); - m_leaves.Sort( &wxGenericTreeModelItemCmp ); + { + if ( nodes[i]->HasChildren() ) + nodes[i]->Resort(); + } } } + private: wxDataViewTreeNode *m_parent; - wxDataViewTreeNodes m_nodes; - wxDataViewTreeLeaves m_leaves; + + // Corresponding model item. wxDataViewItem m_item; - bool m_open; - bool m_hasChildren; - int m_subTreeCount; + + // Data specific to non-leaf (branch, inner) nodes. They are kept in a + // separate struct in order to conserve memory. + struct BranchNodeData + { + BranchNodeData() + : open(false), + subTreeCount(0) + { + } + + // Child nodes. Note that this may be empty even if m_hasChildren in + // case this branch of the tree wasn't expanded and realized yet. + wxDataViewTreeNodes children; + + // Is the branch node currently open (expanded)? + bool open; + + // Total count of expanded (i.e. visible with the help of some + // scrolling) items in the subtree, but excluding this node. I.e. it is + // 0 for leaves and is the number of rows the subtree occupies for + // branch nodes. + int subTreeCount; + }; + + BranchNodeData *m_branchData; }; -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) +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, + wxDataViewTreeNode ** node2) { - return g_model->Compare( *id1, *id2, g_column, g_asending ); + return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), 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) +WX_DEFINE_SORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection); class wxDataViewMainWindow: public wxWindow { @@ -432,14 +551,15 @@ public: const wxSize &size = wxDefaultSize, const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); - + + bool IsList() const { return GetModel()->IsListModel(); } bool IsVirtualList() const { return m_root == NULL; } // notifications from wxDataViewModel bool ItemAdded( const wxDataViewItem &parent, 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 ValueChanged( const wxDataViewItem &item, unsigned int model_column ); bool Cleared(); void Resort() { @@ -453,7 +573,7 @@ public: void SortPrepare() { - g_model = GetOwner()->GetModel(); + g_model = GetModel(); wxDataViewColumn* col = GetOwner()->GetSortingColumn(); if( !col ) { @@ -473,9 +593,18 @@ public: wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } + wxDataViewModel* GetModel() { return GetOwner()->GetModel(); } + const wxDataViewModel* GetModel() const { return GetOwner()->GetModel(); } + +#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 OnCharHook( wxKeyEvent &event ); void OnChar( wxKeyEvent &event ); + void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event); + void OnLeftKey(); + void OnRightKey(); void OnMouse( wxMouseEvent &event ); void OnSetFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event ); @@ -489,8 +618,13 @@ public: void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); void ScrollTo( int rows, int column ); + unsigned GetCurrentRow() const { return m_currentRow; } bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); + bool TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward); + + wxDataViewColumn *GetCurrentColumn() const { return m_currentCol; } + void ClearCurrentColumn() { m_currentCol = NULL; } bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); } bool IsEmpty() { return GetRowCount() == 0; } @@ -498,13 +632,16 @@ 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 + + // 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() ; + unsigned int GetRowCount(); - wxDataViewItem GetSelection() const; - wxDataViewSelection GetSelections(){ return m_selection; } - void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); } + const wxDataViewSelection& GetSelections() const { 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 ); @@ -524,36 +661,64 @@ public: } wxRect GetLineRect( unsigned int row ) const; - + 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 + void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } + int GetRowHeight() const { return m_lineHeight; } + + // 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 + + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; + // We did not need this temporarily + // wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + + // 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 ) { OnExpanding( row ); } - void Collapse( unsigned int row ) { OnCollapsing( row ); } -private: - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; - //We did not need this temporarily - //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); + 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 ); - int RecalculateCount() ; + 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 - wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); - void OnExpanding( unsigned int row ); - void OnCollapsing( unsigned int row ); + void OnColumnsCountChanged(); + + // Called by wxDataViewCtrl and our own OnRenameTimer() to start edit the + // specified item in the given column. + void StartEditing(const wxDataViewItem& item, const wxDataViewColumn* col); + +private: + int RecalculateCount(); + + // Return false only if the event was vetoed by its handler. + bool SendExpanderEvent(wxEventType type, const wxDataViewItem& item); wxDataViewTreeNode * FindNode( const wxDataViewItem & item ); + wxDataViewColumn *FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode); + + bool IsCellEditableInMode(const wxDataViewItem& item, const wxDataViewColumn *col, wxDataViewCellMode mode) const; + + void DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ); + private: wxDataViewCtrl *m_owner; int m_lineHeight; @@ -567,14 +732,26 @@ private: bool m_lastOnSame; bool m_hasFocus; + bool m_useCellFocus; + bool m_currentColSetByKeyboard; +#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; @@ -582,11 +759,19 @@ private: // the pen used to draw the expander and the lines wxPen m_penExpander; - //This is the tree structure of the model + // This is the tree structure of the model wxDataViewTreeNode * m_root; int m_count; - //This is the tree node under the cursor + + // This is the tree node under the cursor wxDataViewTreeNode * m_underMouse; + + // The control used for editing or NULL. + wxWeakRef m_editorCtrl; + + // Id m_editorCtrl is non-NULL, pointer to the associated renderer. + wxDataViewRenderer* m_editorRenderer; + private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() @@ -613,7 +798,7 @@ public: virtual bool Cleared() { return m_mainWindow->Cleared(); } virtual void Resort() - { m_mainWindow->Resort(); } + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -627,19 +812,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer, wxDataViewRendererBase) wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align) : - wxDataViewRendererBase( varianttype, mode, align ) + wxDataViewCustomRendererBase( varianttype, mode, align ) { - m_dc = NULL; m_align = align; m_mode = mode; - m_wantsAttr = false; - m_hasAttr = false; + m_ellipsizeMode = wxELLIPSIZE_MIDDLE; + m_dc = NULL; } wxDataViewRenderer::~wxDataViewRenderer() { - if (m_dc) - delete m_dc; + delete m_dc; } wxDC *wxDataViewRenderer::GetDC() @@ -657,7 +840,7 @@ wxDC *wxDataViewRenderer::GetDC() } void wxDataViewRenderer::SetAlignment( int align ) -{ +{ m_align=align; } @@ -666,19 +849,6 @@ 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 // --------------------------------------------------------- @@ -686,30 +856,20 @@ int wxDataViewRenderer::CalculateAlignment() const 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 // --------------------------------------------------------- -IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewCustomRenderer) +IMPLEMENT_CLASS(wxDataViewTextRenderer, wxDataViewRenderer) wxDataViewTextRenderer::wxDataViewTextRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) + wxDataViewRenderer( varianttype, mode, align ) { } @@ -725,107 +885,56 @@ bool wxDataViewTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const return false; } -bool wxDataViewTextRenderer::HasEditorCtrl() +bool wxDataViewTextRenderer::HasEditorCtrl() const { return true; } -wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, +wxWindow* 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) ); + wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height), + wxTE_PROCESS_ENTER ); + + // select the text in the control an place the cursor at the end + ctrl->SetInsertionPointEnd(); + ctrl->SelectAll(); + + return ctrl; } -bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) +bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value ) { wxTextCtrl *text = (wxTextCtrl*) editor; value = text->GetValue(); return true; } -bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewTextRenderer::Render(wxRect rect, wxDC *dc, int state) { - RenderText( m_text, 0, cell, dc, state ); + RenderText(m_text, 0, rect, dc, state); return true; } wxSize wxDataViewTextRenderer::GetSize() const { - const wxDataViewCtrl *view = GetView(); if (!m_text.empty()) - { - int x,y; - view->GetTextExtent( m_text, &x, &y ); - return wxSize( x, y ); - } - return wxSize(80,20); -} - -// --------------------------------------------------------- -// 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) - { - 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 ); - } - } - - 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; + return GetTextExtent(m_text); + else + return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); } - // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- -IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewCustomRenderer) +IMPLEMENT_CLASS(wxDataViewBitmapRenderer, wxDataViewRenderer) wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) + wxDataViewRenderer( varianttype, mode, align ) { } @@ -846,9 +955,9 @@ bool wxDataViewBitmapRenderer::GetValue( wxVariant& WXUNUSED(value) ) const bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) dc->DrawBitmap( m_bitmap, cell.x, cell.y ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) dc->DrawIcon( m_icon, cell.x, cell.y ); return true; @@ -856,23 +965,23 @@ bool wxDataViewBitmapRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state wxSize wxDataViewBitmapRenderer::GetSize() const { - if (m_bitmap.Ok()) + if (m_bitmap.IsOk()) return wxSize( m_bitmap.GetWidth(), m_bitmap.GetHeight() ); - else if (m_icon.Ok()) + else if (m_icon.IsOk()) return wxSize( m_icon.GetWidth(), m_icon.GetHeight() ); - return wxSize(16,16); + return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE); } // --------------------------------------------------------- // wxDataViewToggleRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewCustomRenderer) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer, wxDataViewRenderer) wxDataViewToggleRenderer::wxDataViewToggleRenderer( const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) + wxDataViewRenderer( varianttype, mode, align ) { m_toggle = false; } @@ -891,63 +1000,66 @@ 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; - if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE) + if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE || + GetEnabled() == false) flags |= wxCONTROL_DISABLED; + // check boxes we draw must always have the same, standard size (if it's + // bigger than the cell size the checkbox will be truncated because the + // caller had set the clipping rectangle to prevent us from drawing outside + // the cell) + cell.SetSize(GetSize()); + 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) +bool wxDataViewToggleRenderer::WXActivateCell(const wxRect& WXUNUSED(cell), + wxDataViewModel *model, + const wxDataViewItem& item, + unsigned int col, + const wxMouseEvent *mouseEvent) { - bool value = !m_toggle; - wxVariant variant = value; - model->SetValue( variant, item, col); - model->ValueChanged( item, col ); + if ( mouseEvent ) + { + // only react to clicks directly on the checkbox, not elsewhere in the same cell: + if ( !wxRect(GetSize()).Contains(mouseEvent->GetPosition()) ) + return false; + } + + model->ChangeValue(!m_toggle, item, col); return true; } 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); } // --------------------------------------------------------- // wxDataViewProgressRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewCustomRenderer) +IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer, wxDataViewRenderer) wxDataViewProgressRenderer::wxDataViewProgressRenderer( const wxString &label, const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) + wxDataViewRenderer( varianttype, mode, align ) { m_label = label; m_value = 0; } -wxDataViewProgressRenderer::~wxDataViewProgressRenderer() -{ -} - bool wxDataViewProgressRenderer::SetValue( const wxVariant &value ) { m_value = (long) value; @@ -964,18 +1076,23 @@ bool wxDataViewProgressRenderer::GetValue( wxVariant &value ) const return true; } -bool wxDataViewProgressRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool +wxDataViewProgressRenderer::Render(wxRect rect, wxDC *dc, int WXUNUSED(state)) { - double pct = (double)m_value / 100.0; - wxRect bar = cell; - bar.width = (int)(cell.width * pct); - dc->SetPen( *wxTRANSPARENT_PEN ); - dc->SetBrush( *wxBLUE_BRUSH ); - dc->DrawRectangle( bar ); + // deflate the rect to leave a small border between bars in adjacent rows + wxRect bar = rect.Deflate(0, 1); dc->SetBrush( *wxTRANSPARENT_BRUSH ); dc->SetPen( *wxBLACK_PEN ); - dc->DrawRectangle( cell ); + dc->DrawRectangle( bar ); + + bar.width = (int)(bar.width * m_value / 100.); + dc->SetPen( *wxTRANSPARENT_PEN ); + + const wxDataViewItemAttr& attr = GetAttr(); + dc->SetBrush( attr.HasColour() ? wxBrush(attr.GetColour()) + : *wxBLUE_BRUSH ); + dc->DrawRectangle( bar ); return true; } @@ -986,136 +1103,19 @@ wxSize wxDataViewProgressRenderer::GetSize() const } // --------------------------------------------------------- -// wxDataViewDateRenderer +// wxDataViewIconTextRenderer // --------------------------------------------------------- -#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN) +IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewRenderer) -#if wxUSE_DATE_RENDERER_POPUP - -class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow -{ -public: - wxDataViewDateRendererPopupTransient( wxWindow* parent, wxDateTime *value, - wxDataViewModel *model, const wxDataViewItem & item, unsigned int col) : - wxPopupTransientWindow( parent, wxBORDER_SIMPLE ), - m_item( item ) - { - m_model = model; - m_col = col; - m_cal = new wxCalendarCtrl( this, wxID_ANY, *value ); - wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); - sizer->Add( m_cal, 1, wxGROW ); - SetSizer( sizer ); - sizer->Fit( this ); - } - - void OnCalendar( wxCalendarEvent &event ); - - wxCalendarCtrl *m_cal; - wxDataViewModel *m_model; - unsigned int m_col; - const wxDataViewItem & m_item; - -protected: - virtual void OnDismiss() - { - } - -private: - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(wxDataViewDateRendererPopupTransient,wxPopupTransientWindow) - EVT_CALENDAR( wxID_ANY, wxDataViewDateRendererPopupTransient::OnCalendar ) -END_EVENT_TABLE() - -void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event ) -{ - wxDateTime date = event.GetDate(); - wxVariant value = date; - m_model->SetValue( value, m_item, m_col ); - m_model->ValueChanged( m_item, m_col ); - DismissAndNotify(); -} - -#endif // wxUSE_DATE_RENDERER_POPUP - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer) - -wxDataViewDateRenderer::wxDataViewDateRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) -{ -} - -bool wxDataViewDateRenderer::SetValue( const wxVariant &value ) -{ - m_date = value.GetDateTime(); - - return true; -} - -bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const -{ - value = m_date; - return true; -} - -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) -{ - wxString tmp = m_date.FormatDate(); - RenderText( tmp, 0, cell, dc, state ); - return true; -} - -wxSize wxDataViewDateRenderer::GetSize() const -{ - const wxDataViewCtrl* view = GetView(); - wxString tmp = m_date.FormatDate(); - wxCoord x,y,d; - view->GetTextExtent( tmp, &x, &y, &d ); - return wxSize(x,y+d); -} - -bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col ) -{ - wxVariant variant; - model->GetValue( variant, item, col ); - wxDateTime value = variant.GetDateTime(); - -#if wxUSE_DATE_RENDERER_POPUP - wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient( - GetOwner()->GetOwner()->GetParent(), &value, model, item, col); - wxPoint pos = wxGetMousePosition(); - popup->Move( pos ); - popup->Layout(); - popup->Popup( popup->m_cal ); -#else // !wxUSE_DATE_RENDERER_POPUP - wxMessageBox(value.Format()); -#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP - return true; -} - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) - -wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( - const wxString &varianttype, wxDataViewCellMode mode, int align ) : - wxDataViewCustomRenderer( varianttype, mode, align ) +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( +const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewRenderer( varianttype, mode, align ) { SetMode(mode); SetAlignment(align); } -wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() -{ -} - bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { m_value << value; @@ -1127,935 +1127,565 @@ bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const return false; } -bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) +bool wxDataViewIconTextRenderer::Render(wxRect rect, wxDC *dc, int state) { int xoffset = 0; - const wxIcon &icon = m_value.GetIcon(); - if (icon.IsOk()) + + 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; + dc->DrawIcon(icon, rect.x, rect.y + (rect.height - icon.GetHeight())/2); + xoffset = icon.GetWidth()+4; } - RenderText( m_value.GetText(), xoffset, cell, dc, state ); + RenderText(m_value.GetText(), xoffset, rect, dc, state); return true; } wxSize wxDataViewIconTextRenderer::GetSize() const { - const wxDataViewCtrl *view = GetView(); if (!m_value.GetText().empty()) { - int x,y; - view->GetTextExtent( m_value.GetText(), &x, &y ); + wxSize size = GetTextExtent(m_value.GetText()); if (m_value.GetIcon().IsOk()) - x += m_value.GetIcon().GetWidth() + 4; - return wxSize( x, y ); + size.x += m_value.GetIcon().GetWidth() + 4; + return size; } return wxSize(80,20); } -wxControl * -wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), - wxRect WXUNUSED(labelRect), - const wxVariant& WXUNUSED(value)) +wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value) { - return NULL; + wxDataViewIconText iconText; + iconText << value; + + 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; + } + + wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, text, + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height), + wxTE_PROCESS_ENTER ); + + // select the text in the control an place the cursor at the end + ctrl->SetInsertionPointEnd(); + ctrl->SelectAll(); + + return ctrl; } -bool -wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), - wxVariant& WXUNUSED(value)) +bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value ) { - return false; + wxTextCtrl *text = (wxTextCtrl*) editor; + + wxDataViewIconText iconText(text->GetValue(), m_value.GetIcon()); + value << iconText; + return true; } -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- +//----------------------------------------------------------------------------- +// wxDataViewDropTarget +//----------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) +#if wxUSE_DRAG_AND_DROP -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 ) +class wxBitmapCanvas: public wxWindow { - SetAlignment(align); - SetTitle(title); - SetFlags(flags); +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) ); + } - m_autosize = width < 0; // TODO + void OnPaint( wxPaintEvent &WXUNUSED(event) ) + { + wxPaintDC dc(this); + dc.DrawBitmap( m_bitmap, 0, 0); + } - Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); -} + wxBitmap m_bitmap; +}; -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 ) +class wxDataViewDropSource: public wxDropSource { - SetAlignment(align); - SetFlags(flags); +public: + wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : + wxDropSource( win ) + { + m_win = win; + m_row = row; + m_hint = NULL; + } - Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); -} + ~wxDataViewDropSource() + { + delete m_hint; + } -wxDataViewColumn::~wxDataViewColumn() -{ -} + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) + { + wxPoint pos = wxGetMousePosition(); -void wxDataViewColumn::Init( int width ) -{ - m_width = width; - m_minWidth = wxDVC_DEFAULT_MINWIDTH; - m_ascending = true; -} + 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; -void wxDataViewColumn::SetResizeable( bool resizeable ) -{ - if (resizeable) - m_flags |= wxDATAVIEW_COL_RESIZABLE; - else - m_flags &= ~wxDATAVIEW_COL_RESIZABLE; -} + 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 ); + } -void wxDataViewColumn::SetHidden( bool hidden ) -{ - if (hidden) - m_flags |= wxDATAVIEW_COL_HIDDEN; - else - m_flags &= ~wxDATAVIEW_COL_HIDDEN; + return false; + } - // tell our owner to e.g. update its scrollbars: - if (GetOwner()) - GetOwner()->OnColumnChange(); -} + wxDataViewMainWindow *m_win; + unsigned int m_row; + wxFrame *m_hint; + int m_dist_x,m_dist_y; +}; -void wxDataViewColumn::SetSortable( bool sortable ) + +class wxDataViewDropTarget: public wxDropTarget { - if (sortable) - m_flags |= wxDATAVIEW_COL_SORTABLE; - else - m_flags &= ~wxDATAVIEW_COL_SORTABLE; +public: + wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) : + wxDropTarget( obj ) + { + m_win = win; + } - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); -} + 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); + } -void wxDataViewColumn::SetReorderable( bool reorderable ) -{ - if (reorderable) - m_flags |= wxDATAVIEW_COL_REORDERABLE; - else - m_flags &= ~wxDATAVIEW_COL_REORDERABLE; -} + virtual bool OnDrop( wxCoord x, wxCoord y ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return false; + return m_win->OnDrop( format, x, y ); + } -void wxDataViewColumn::SetSortOrder( bool ascending ) -{ - m_ascending = ascending; + 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 ); + } - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); -} + virtual void OnLeave() + { m_win->OnLeave(); } -bool wxDataViewColumn::IsSortOrderAscending() const -{ - return m_ascending; -} + wxDataViewMainWindow *m_win; +}; -void wxDataViewColumn::SetInternalWidth( int width ) -{ - m_width = width; +#endif // wxUSE_DRAG_AND_DROP - // the scrollbars of the wxDataViewCtrl needs to be recalculated! - if (m_owner && m_owner->m_clientArea) - m_owner->m_clientArea->RecalculateDisplay(); -} +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- -void wxDataViewColumn::SetWidth( int width ) +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) { - if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay(); - - SetInternalWidth(width); + m_owner = owner; } +void wxDataViewRenameTimer::Notify() +{ + m_owner->OnRenameTimer(); +} //----------------------------------------------------------------------------- -// wxDataViewHeaderWindowBase +// wxDataViewMainWindow //----------------------------------------------------------------------------- -void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) +// The tree building helper, declared firstly +static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item, + wxDataViewTreeNode * node); + +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) { - wxWindow *parent = GetParent(); - wxDataViewEvent le(type, parent->GetId()); + if (row1 > row2) return 1; + if (row1 == row2) return 0; + return -1; +} - le.SetEventObject(parent); - le.SetColumn(n); - le.SetDataViewColumn(GetColumn(n)); - le.SetModel(GetOwner()->GetModel()); +IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) - // for events created by wxDataViewHeaderWindow the - // row / value fields are not valid +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_HOOK (wxDataViewMainWindow::OnCharHook) + EVT_CHAR (wxDataViewMainWindow::OnChar) +END_EVENT_TABLE() - parent->GetEventHandler()->ProcessEvent(le); -} +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 ) -#ifdef USE_NATIVE_HEADER_WINDOW +{ + SetOwner( parent ); -#ifndef HDS_DRAGDROP - #define HDS_DRAGDROP 0x0040 -#endif -#ifndef HDS_FULLDRAG - #define HDS_FULLDRAG 0x0080 -#endif + m_editorRenderer = NULL; -// implemented in msw/listctrl.cpp: -int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); + m_lastOnSame = false; + m_renameTimer = new wxDataViewRenameTimer( this ); -IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow) + // TODO: user better initial values/nothing selected + m_currentCol = NULL; + m_currentColSetByKeyboard = false; + m_useCellFocus = false; + m_currentRow = 0; -bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) -{ - m_owner = parent; + m_lineHeight = wxMax( 17, GetCharHeight() + 4 ); // 17 = mini icon height + 1 - m_scrollOffsetX = 0; - m_delayedUpdate = false; - m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ); +#if wxUSE_DRAG_AND_DROP + m_dragCount = 0; + m_dragStart = wxPoint(0,0); - int x = pos.x == wxDefaultCoord ? 0 : pos.x, - y = pos.y == wxDefaultCoord ? 0 : pos.y, - w = size.x == wxDefaultCoord ? 1 : size.x, - h = m_buttonHeight; + m_dragEnabled = false; + m_dropEnabled = false; + m_dropHint = false; + m_dropHintLine = (unsigned int) -1; +#endif // wxUSE_DRAG_AND_DROP - wxSize new_size(w,h); + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; - if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) ) - return false; + m_hasFocus = false; - // create the native WC_HEADER window: - WXHWND hwndParent = (HWND)parent->GetHandle(); - WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; - - if ( m_isShown ) - msStyle |= WS_VISIBLE; - - 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; - } + SetBackgroundColour( *wxWHITE ); - m_imageList = new wxImageList( 16, 16 ); - Header_SetImageList( (HWND) m_hWnd, m_imageList->GetHIMAGELIST() ); + SetBackgroundStyle(wxBG_STYLE_CUSTOM); - // we need to subclass the m_hWnd to force wxWindow::HandleNotify - // to call wxDataViewHeaderWindow::MSWOnNotify - SubclassWin(m_hWnd); + m_penRule = wxPen(GetRuleColour()); - // 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()); + // compose a pen whichcan draw black lines + // TODO: maybe there is something system colour to use + m_penExpander = wxPen(wxColour(0,0,0)); - return true; -} + m_root = wxDataViewTreeNode::CreateRootNode(); -wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() -{ - delete m_imageList; - UnsubclassWin(); + // Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1; + m_underMouse = NULL; + UpdateDisplay(); } -wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const +wxDataViewMainWindow::~wxDataViewMainWindow() { - return wxSize( 80, m_buttonHeight+2 ); + DestroyTree(); + delete m_renameTimer; } -void wxDataViewHeaderWindowMSW::OnInternalIdle() -{ - if (m_delayedUpdate) - { - m_delayedUpdate = false; - UpdateDisplay(); - } -} -void wxDataViewHeaderWindowMSW::UpdateDisplay() +#if wxUSE_DRAG_AND_DROP +bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) { - // remove old columns - for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) - Header_DeleteItem((HWND)m_hWnd, 0); - - m_imageList->RemoveAll(); + m_dragFormat = format; + m_dragEnabled = format != wxDF_INVALID; - // 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; - if (col->GetBitmap().IsOk()) - { - m_imageList->Add( col->GetBitmap() ); - hdi.mask |= HDI_IMAGE; - hdi.iImage = m_imageList->GetImageCount()-1; - } - 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; - if (col->GetBitmap().IsOk()) - hdi.fmt |= HDF_IMAGE; - - //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP); - - if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) - { - //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default - //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail - // VZ: works with 5.81 - hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN; - } - - // 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; + return true; +} - 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; +bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) +{ + m_dropFormat = format; + m_dropEnabled = format != wxDF_INVALID; - default: - // such alignment is not allowed for the column header! - break; // wxFAIL; - } + if (m_dropEnabled) + SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) ); - SendMessage((HWND)m_hWnd, HDM_INSERTITEM, - (WPARAM)added, (LPARAM)&hdi); - added++; - } + return true; } -unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR) +void wxDataViewMainWindow::RemoveDropHint() { - unsigned int idx; - - // NOTE: we don't just return nmHDR->iItem because when there are - // hidden columns, nmHDR->iItem may be different from - // nmHDR->pitem->lParam - - if (nmHDR->pitem && nmHDR->pitem->mask & HDI_LPARAM) + if (m_dropHint) { - idx = (unsigned int)nmHDR->pitem->lParam; - return idx; + m_dropHint = false; + RefreshRow( m_dropHintLine ); + m_dropHintLine = (unsigned int) -1; } - - HDITEM item; - item.mask = HDI_LPARAM; - Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item); - - return (unsigned int)item.lParam; } -bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, + wxCoord y, wxDragResult def ) { - NMHDR *nmhdr = (NMHDR *)lParam; - - // is it a message from the header? - if ( nmhdr->hwndFrom != (HWND)m_hWnd ) - return wxWindow::MSWOnNotify(idCtrl, lParam, result); + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); - NMHEADER *nmHDR = (NMHEADER *)nmhdr; - switch ( nmhdr->code ) + if ((row >= GetRowCount()) || (xx > GetEndOfLastCol())) { - 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; - - case HDN_BEGINDRAG: - // user has started to reorder a column - if ((nmHDR->iItem != -1) && (!GetColumn(nmHDR->iItem)->IsReorderable())) - { - // veto it! - *result = TRUE; - } - break; - - case HDN_ENDDRAG: // user has finished reordering a column - { - wxDataViewColumn *col = GetColumn(nmHDR->iItem); - unsigned int new_pos = nmHDR->pitem->iOrder; - m_owner->ColumnMoved( col, new_pos ); - m_delayedUpdate = true; - } - break; - - 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; - - case HDN_ITEMCHANGED: // user is resizing a column - case HDN_ENDTRACK: // user has finished resizing a column - - // 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); - - // see UpdateDisplay() for more info about COLUMN_WIDTH_OFFSET - if (idx == 0 && w > COLUMN_WIDTH_OFFSET) - w -= COLUMN_WIDTH_OFFSET; - - if (w >= (unsigned)col->GetMinWidth()) - col->SetInternalWidth(w); - } - break; - - case HDN_ITEMCLICK: - { - unsigned int idx = GetColumnIdxFromHeader(nmHDR); - wxDataViewModel * model = GetOwner()->GetModel(); - - if(nmHDR->iButton == 0) - { - wxDataViewColumn *col = GetColumn(idx); - if(col->IsSortable()) - { - if(model && m_owner->GetSortingColumn() == col) - { - bool order = col->IsSortOrderAscending(); - col->SetSortOrder(!order); - } - else if(model) - { - m_owner->SetSortingColumn(col); - } - } - UpdateDisplay(); - if(model) - model->Resort(); - } - - wxEventType evt = nmHDR->iButton == 0 ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, idx); - } - break; - - 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 + RemoveDropHint(); + return wxDragNone; + } - 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; + wxDataViewItem item = GetItemByRow( row ); - case HDN_GETDISPINFOW: - // see wxListCtrl::MSWOnNotify for more info! - break; + wxDataViewModel *model = GetModel(); - 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; + 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; + } - default: - return wxWindow::MSWOnNotify(idCtrl, lParam, result); + if (!event.IsAllowed()) + { + RemoveDropHint(); + return wxDragNone; } - return true; -} -void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy), - const wxRect * WXUNUSED(rect)) -{ - m_scrollOffsetX += dx; + if (m_dropHint && (row != m_dropHintLine)) + RefreshRow( m_dropHintLine ); + m_dropHint = true; + m_dropHintLine = row; + RefreshRow( row ); - GetParent()->Layout(); + return def; } -void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y, - int w, int h, - int f) +bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) { - // TODO: why is there a border + 2px around it? - wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f ); -} + RemoveDropHint(); -#else // !defined(__WXMSW__) + 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()) || (xx > GetEndOfLastCol())) + return false; -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 = GetModel(); - wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont( attr.font ); + 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; - // 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 (!event.IsAllowed()) + return false; return true; } -void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) +wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, + wxDragResult def ) { - int w, h; - GetClientSize( &w, &h ); - - wxAutoBufferedPaintDC dc( this ); - - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); - int xpix; - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + if ((row >= GetRowCount()) || (xx > GetEndOfLastCol())) + return wxDragNone; - int x; - m_owner->GetViewStart( &x, NULL ); + wxDataViewItem item = GetItemByRow( row ); - // account for the horz scrollbar offset - dc.SetDeviceOrigin( -x * xpix, 0 ); + wxDataViewModel *model = GetModel(); - dc.SetFont( GetFont() ); - - 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! - - int cw = col->GetWidth(); - int ch = h; - - wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE; - if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) - { - if (col->IsSortOrderAscending()) - sortArrow = wxHDR_SORT_ICON_UP; - else - sortArrow = wxHDR_SORT_ICON_DOWN; - } - - int state = 0; - if (m_parent->IsEnabled()) - { - if ((int) i == m_hover) - state = wxCONTROL_CURRENT; - } - else - { - state = (int) wxCONTROL_DISABLED; - } - - wxRendererNative::Get().DrawHeaderButton - ( - this, - dc, - wxRect(xpos, 0, cw, ch-1), - state, - sortArrow - ); - - // 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_RIGHT: - x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; - break; - default: - case wxALIGN_CENTER: - case wxALIGN_CENTER_HORIZONTAL: - x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2; - break; - } + wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); - // always center the title vertically: - int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); + 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; - 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(); + if (!event.IsAllowed()) + return wxDragNone; - xpos += cw; - } + 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; - - if (event.ButtonUp()) - { - m_isDragging = false; - if (HasCapture()) - ReleaseMouse(); - - m_dirty = true; - } - m_currentX = wxMax(m_minX + 7, x); - - if (m_currentX < w) - { - GetColumn(m_column)->SetWidth(m_currentX - m_minX); - Refresh(); - GetOwner()->Refresh(); - } - + wxDataViewColumn *column = GetOwner()->GetColumnAt(col); + if (column->IsHidden()) + continue; // skip it! + width += column->GetWidth(); } - else // not dragging + + indent = 0; + if (!IsList()) { - m_minX = 0; - m_column = wxNOT_FOUND; + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; + // try to use the m_lineHeight as the expander space + } + width -= indent; - bool hit_border = false; + wxBitmap bitmap( width, height ); + wxMemoryDC dc( bitmap ); + dc.SetFont( GetFont() ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 0,0,width,height ); - // end of the current column - int xpos = 0; + wxDataViewModel *model = m_owner->GetModel(); - // find the column where this event occured - int countCol = m_owner->GetColumnCount(); - for (int column = 0; column < countCol; column++) - { - wxDataViewColumn *p = GetColumn(column); + wxDataViewColumn * const + expander = GetExpanderColumnOrFirstOne(GetOwner()); - 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; - int old_hover = m_hover; - m_hover = m_column; - if (event.Leaving()) - m_hover = wxNOT_FOUND; - if (old_hover != m_hover) - Refresh(); + wxDataViewItem item = GetItemByRow( row ); + cell->PrepareForItem(model, item, column->GetModelColumn()); - if (m_column == wxNOT_FOUND) - return; + wxRect item_rect(x, 0, width, height); + item_rect.Deflate(PADDING_RIGHTLEFT, 0); - 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 (hit_border && event.LeftDown() && resizeable) - { - m_isDragging = true; - CaptureMouse(); - m_currentX = x; - } - else // click on a column - { - wxDataViewModel * model = GetOwner()->GetModel(); - wxEventType evt = event.LeftDown() ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, m_column); - - //Left click the header - if(event.LeftDown()) - { - wxDataViewColumn *col = GetColumn(m_column); - if(col->IsSortable()) - { - wxDataViewColumn* sortCol = m_owner->GetSortingColumn(); - if(model && sortCol == col) - { - bool order = col->IsSortOrderAscending(); - col->SetSortOrder(!order); - } - else if(model) - { - m_owner->SetSortingColumn(col); - } - } - UpdateDisplay(); - if(model) - model->Resort(); - //Send the column sorted event - SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, m_column); - } - } - } - else if (event.Moving()) - { - if (hit_border && resizeable) - m_currentCursor = m_resizeCursor; - else - m_currentCursor = wxSTANDARD_CURSOR; + // dc.SetClippingRegion( item_rect ); + cell->WXCallRender(item_rect, &dc, 0); + // dc.DestroyClippingRegion(); - SetCursor(*m_currentCursor); - } + x += width; } -} - -void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) -{ - int xpix, x; - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); - m_owner->GetViewStart( &x, NULL ); - - // 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 ); -} - -#endif // defined(__WXMSW__) - -//----------------------------------------------------------------------------- -// wxDataViewRenameTimer -//----------------------------------------------------------------------------- - -wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) -{ - m_owner = owner; + return bitmap; } -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} - -//----------------------------------------------------------------------------- -// wxDataViewMainWindow -//----------------------------------------------------------------------------- - -//The tree building helper, declared firstly -static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); - -int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) -{ - if (row1 > row2) return 1; - if (row1 == row2) return 0; - return -1; -} - - -IMPLEMENT_ABSTRACT_CLASS(wxDataViewMainWindow, wxWindow) - -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() - -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 ) - -{ - SetOwner( parent ); - - m_lastOnSame = false; - m_renameTimer = new wxDataViewRenameTimer( this ); - - // TODO: user better initial values/nothing selected - m_currentCol = NULL; - m_currentRow = 0; +#endif // wxUSE_DRAG_AND_DROP - m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 - m_dragCount = 0; - m_dragStart = wxPoint(0,0); - m_lineLastClicked = (unsigned int) -1; - m_lineBeforeLastClicked = (unsigned int) -1; - m_lineSelectSingleOnUp = (unsigned int) -1; +// Draw focus rect for individual cell. Unlike native focus rect, we render +// this in foreground text color (typically white) to enhance contrast and +// make it visible. +static void DrawSelectedCellFocusRect(wxDC& dc, const wxRect& rect) +{ + // (This code is based on wxRendererGeneric::DrawFocusRect and modified.) - m_hasFocus = false; + // draw the pixels manually because the "dots" in wxPen with wxDOT style + // may be short traits and not really dots + // + // note that to behave in the same manner as DrawRect(), we must exclude + // the bottom and right borders from the rectangle + wxCoord x1 = rect.GetLeft(), + y1 = rect.GetTop(), + x2 = rect.GetRight(), + y2 = rect.GetBottom(); - SetBackgroundColour( *wxWHITE ); + wxDCPenChanger pen(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); - SetBackgroundStyle(wxBG_STYLE_CUSTOM); + wxCoord z; + for ( z = x1 + 1; z < x2; z += 2 ) + dc.DrawPoint(z, rect.GetTop()); - m_penRule = wxPen(GetRuleColour()); + wxCoord shift = z == x2 ? 0 : 1; + for ( z = y1 + shift; z < y2; z += 2 ) + dc.DrawPoint(x2, z); - //Here I compose a pen can draw black lines, maybe there are something system colour to use - m_penExpander = wxPen(wxColour(0,0,0)); - //Some new added code to deal with the tree structure - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + shift = z == y2 ? 0 : 1; + for ( z = x2 - shift; z > x1; z -= 2 ) + dc.DrawPoint(z, y2); - //Make m_count = -1 will cause the class recaculate the real displaying number of rows. - m_count = -1 ; - m_underMouse = NULL; - UpdateDisplay(); + shift = z == x1 ? 0 : 1; + for ( z = y2 - shift; z > y1; z -= 2 ) + dc.DrawPoint(x1, z); } -wxDataViewMainWindow::~wxDataViewMainWindow() -{ - DestroyTree(); - delete m_renameTimer; -} void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); wxAutoBufferedPaintDC dc( this ); #ifdef __WXMSW__ + dc.SetBrush(GetOwner()->GetBackgroundColour()); dc.SetPen( *wxTRANSPARENT_PEN ); - dc.SetBrush( wxBrush( GetBackgroundColour()) ); - dc.SetBrush( *wxWHITE_BRUSH ); - wxSize size( GetClientSize() ); - dc.DrawRectangle( 0,0,size.x,size.y ); + dc.DrawRectangle(GetClientSize()); #endif + if ( IsEmpty() ) + { + // No items to draw. + return; + } + // prepare the DC GetOwner()->PrepareDC( dc ); dc.SetFont( GetFont() ); @@ -2067,16 +1697,30 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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)); + (int)(GetRowCount( ) - item_start)); unsigned int item_last = item_start + item_count; + // Send the event to wxDataViewCtrl itself. + wxWindow * const parent = GetParent(); + wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId()); + cache_event.SetEventObject(parent); + cache_event.SetCache(item_start, item_last - 1); + parent->ProcessWindowEvent(cache_event); + // compute which columns needs to be redrawn unsigned int cols = GetOwner()->GetColumnCount(); + if ( !cols ) + { + // we assume that we have at least one column below and painting an + // empty control is unnecessary anyhow + return; + } + unsigned int col_start = 0; - unsigned int x_start = 0; + unsigned int x_start; for (x_start = 0; col_start < cols; col_start++) { - wxDataViewColumn *col = GetOwner()->GetColumn(col_start); + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start); if (col->IsHidden()) continue; // skip it! @@ -2091,7 +1735,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) unsigned int x_last = x_start; for (; col_last < cols; col_last++) { - wxDataViewColumn *col = GetOwner()->GetColumn(col_last); + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last); if (col->IsHidden()) continue; // skip it! @@ -2107,7 +1751,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetPen(m_penRule); dc.SetBrush(*wxTRANSPARENT_BRUSH); - for (unsigned int i = item_start; i <= item_last+1; i++) + for (unsigned int i = item_start; i <= item_last; i++) { int y = GetLineStart( i ); dc.DrawLine(x_start, y, x_last, y); @@ -2120,72 +1764,152 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetPen(m_penRule); dc.SetBrush(*wxTRANSPARENT_BRUSH); - int x = x_start; + // NB: Vertical rules are drawn in the last pixel of a column so that + // they align perfectly with native MSW wxHeaderCtrl as well as for + // consistency with MSW native list control. There's no vertical + // rule at the most-left side of the control. + + int x = x_start - 1; for (unsigned int i = col_start; i < col_last; i++) { - wxDataViewColumn *col = GetOwner()->GetColumn(i); + wxDataViewColumn *col = GetOwner()->GetColumnAt(i); if (col->IsHidden()) continue; // skip it + x += col->GetWidth(); + dc.DrawLine(x, GetLineStart( item_start ), x, GetLineStart( item_last ) ); - - x += col->GetWidth(); } - - // Draw last vertical rule - dc.DrawLine(x, GetLineStart( item_start ), - x, GetLineStart( item_last ) ); } // 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; - - wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); + wxRect rect( x_start, GetLineStart( item ), + x_last - x_start, GetLineHeight( item ) ); + + // draw selection and whole-item focus: + if ( selected ) + { + int flags = wxCONTROL_SELECTED; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; + + wxRendererNative::Get().DrawItemSelectionRect + ( + this, + dc, + rect, + flags + ); + } + + // draw keyboard focus rect if applicable + if ( item == m_currentRow && m_hasFocus ) + { + bool renderColumnFocus = false; + + if ( m_useCellFocus && m_currentCol && m_currentColSetByKeyboard ) + { + renderColumnFocus = true; + + // If this is container node without columns, render full-row focus: + if ( !IsList() ) + { + wxDataViewTreeNode *node = GetTreeNodeByRow(item); + if ( node->HasChildren() && !model->HasContainerColumns(node->GetItem()) ) + renderColumnFocus = false; + } + } + + if ( renderColumnFocus ) + { + for ( unsigned int i = col_start; i < col_last; i++ ) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(i); + if ( col->IsHidden() ) + continue; + + rect.width = col->GetWidth(); + + if ( col == m_currentCol ) + { + // make the rect more visible by adding a small + // margin around it: + rect.Deflate(1, 1); + + if ( selected ) + { + // DrawFocusRect() uses XOR and is all but + // invisible against dark-blue background. Use + // the same color used for selected text. + DrawSelectedCellFocusRect(dc, rect); + } + else + { + wxRendererNative::Get().DrawFocusRect + ( + this, + dc, + rect, + 0 + ); + } + break; + } + + rect.x += rect.width; + } + } + else + { + // render focus rectangle for the whole row + wxRendererNative::Get().DrawFocusRect + ( + this, + dc, + rect, + selected ? (int)wxCONTROL_SELECTED : 0 + ); + } + } } } - wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); - if (!expander) +#if wxUSE_DRAG_AND_DROP + if (m_dropHint) { - // TODO: last column for RTL support - expander = GetOwner()->GetColumn( 0 ); - GetOwner()->SetExpanderColumn(expander); + wxRect rect( x_start, GetLineStart( m_dropHintLine ), + x_last - x_start, GetLineHeight( m_dropHintLine ) ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); } +#endif // wxUSE_DRAG_AND_DROP + + wxDataViewColumn * const + expander = GetExpanderColumnOrFirstOne(GetOwner()); // 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()->GetColumn( i ); + wxDataViewColumn *col = GetOwner()->GetColumnAt( i ); wxDataViewRenderer *cell = col->GetRenderer(); cell_rect.width = col->GetWidth(); - if (col->IsHidden()) + if ( col->IsHidden() || cell_rect.width <= 0 ) 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; @@ -2197,104 +1921,83 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dataitem = node->GetItem(); - if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + // Skip all columns of "container" rows except the expander + // column itself unless HasContainerColumns() overrides this. + if ( col != expander && + model->IsContainer(dataitem) && + !model->HasContainerColumns(dataitem) ) continue; } else { - dataitem = wxDataViewItem( (void*) item ); + dataitem = wxDataViewItem( wxUIntToPtr(item+1) ); } - 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 ); - } + cell->PrepareForItem(model, dataitem, col->GetModelColumn()); // update cell_rect cell_rect.y = GetLineStart( item ); - cell_rect.height = GetLineHeight( item ); // -1 is for the horizontal rules (?) + cell_rect.height = GetLineHeight( item ); - //Draw the expander here. + // draw the background + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if ( !selected ) + DrawCellBackground( cell, dc, cell_rect ); + + // deal with the expander int indent = 0; - if ((!IsVirtualList()) && (col == expander)) + if ((!IsList()) && (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() ) + // Calculate the indent first + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + + // we reserve m_lineHeight of horizontal space for the expander + // but leave EXPANDER_MARGIN around the expander itself + int exp_x = cell_rect.x + indent + EXPANDER_MARGIN; + + indent += m_lineHeight; + + // draw expander if needed and visible + if ( node->HasChildren() && exp_x < cell_rect.GetRight() ) { - wxRect rect( expander_x , expander_y, expander_width, expander_width); + dc.SetPen( m_penExpander ); + dc.SetBrush( wxNullBrush ); + + int exp_size = m_lineHeight - 2*EXPANDER_MARGIN; + int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2 + + EXPANDER_MARGIN - EXPANDER_OFFSET; + + const wxRect rect(exp_x, exp_y, exp_size, exp_size); + int flag = 0; - if (m_underMouse == node) - { + 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); + if ( node->IsOpen() ) + flag |= wxCONTROL_EXPANDED; + + // ensure that we don't overflow the cell (which might + // happen if the column is very narrow) + wxDCClipper clip(dc, cell_rect); + + 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) + + // 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, 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 + wxRect item_rect = cell_rect; + item_rect.Deflate(PADDING_RIGHTLEFT, 0); + + // account for the tree indent (harmless if we're not indented) item_rect.x += indent; + item_rect.width -= indent; + + if ( item_rect.width <= 0 ) + continue; int state = 0; - if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + if (m_hasFocus && selected) state |= wxDATAVIEW_CELL_SELECTED; // TODO: it would be much more efficient to create a clipping @@ -2304,221 +2007,331 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // 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(); + wxDCClipper clip(dc, item_rect); + + cell->WXCallRender(item_rect, &dc, state); } cell_rect.x += cell_rect.width; } } + +void wxDataViewMainWindow::DrawCellBackground( wxDataViewRenderer* cell, wxDC& dc, const wxRect& rect ) +{ + wxRect rectBg( rect ); + + // don't overlap the horizontal rules + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + rectBg.x++; + rectBg.width--; + } + + // don't overlap the vertical rules + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + rectBg.y++; + rectBg.height--; + } + + cell->RenderBackground(&dc, rectBg); +} + 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 ) - wxSafeYield(); - - int xpos = 0; - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int i; - for (i = 0; i < cols; i++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); - if (c->IsHidden()) - continue; // skip it! - - if (c == m_currentCol) - break; - xpos += c->GetWidth(); + // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead + // (needs to be tested!) + wxSafeYield(); } - wxRect labelRect( xpos, - GetLineStart( m_currentRow ), - m_currentCol->GetWidth(), - GetLineHeight( m_currentRow ) ); - - GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, - &labelRect.x, &labelRect.y); wxDataViewItem item = GetItemByRow( m_currentRow ); - m_currentCol->GetRenderer()->StartEditing( item, labelRect ); + StartEditing( item, m_currentCol ); +} + +void +wxDataViewMainWindow::StartEditing(const wxDataViewItem& item, + const wxDataViewColumn* col) +{ + wxDataViewRenderer* renderer = col->GetRenderer(); + if ( !IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) + return; + + const wxRect itemRect = GetItemRect(item, col); + if ( renderer->StartEditing(item, itemRect) ) + { + // Save the renderer to be able to finish/cancel editing it later and + // save the control to be able to detect if we're still editing it. + m_editorRenderer = renderer; + m_editorCtrl = renderer->GetEditorCtrl(); + } } -//------------------------------------------------------------------ +//----------------------------------------------------------------------------- // Helper class for do operation on the tree node -//------------------------------------------------------------------ +//----------------------------------------------------------------------------- class DoJob { public: - DoJob(){}; - virtual ~DoJob(){}; - - //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() ( void * n ) = 0; + DoJob() { } + virtual ~DoJob() { } + + // The return value control how the tree-walker tranverse the tree + enum + { + DONE, // Job done, stop traversing and return + SKIP_SUBTREE, // Ignore the current node's subtree and continue + CONTINUE // Job not done, continue + }; + + virtual int operator() ( wxDataViewTreeNode * node ) = 0; }; bool Walker( wxDataViewTreeNode * node, DoJob & func ) { - if( node==NULL ) - return false; + wxCHECK_MSG( node, false, "can't walk NULL node" ); switch( func( node ) ) { - case DoJob::OK : - return true ; - case DoJob::IGR: + case DoJob::DONE: + return true; + case DoJob::SKIP_SUBTREE: return false; - case DoJob::CONT: - default: - ; + case DoJob::CONTINUE: + break; } - wxDataViewTreeNodes nodes = node->GetNodes(); - wxDataViewTreeLeaves leaves = node->GetChildren(); - - int len_nodes = nodes.GetCount(); - int len = leaves.GetCount(); - int i = 0, nodes_i = 0; - - for( ; i < len ; i ++ ) + if ( node->HasChildren() ) { - void * n = leaves[i]; - if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) - { - wxDataViewTreeNode * nd = nodes[nodes_i]; - nodes_i++; + const wxDataViewTreeNodes& nodes = node->GetChildNodes(); - if( Walker( nd , func ) ) + for ( wxDataViewTreeNodes::const_iterator i = nodes.begin(); + i != nodes.end(); + ++i ) + { + if ( Walker(*i, 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) { - if (!m_root) + if (IsVirtualList()) { - m_count++; - UpdateDisplay(); - return true; + wxDataViewVirtualListModel *list_model = + (wxDataViewVirtualListModel*) GetModel(); + m_count = list_model->GetCount(); } + else + { + SortPrepare(); - SortPrepare(); + wxDataViewTreeNode *parentNode = FindNode(parent); - wxDataViewTreeNode * node; - node = FindNode(parent); + if ( !parentNode ) + return false; - if( node == NULL ) - return false; + wxDataViewItemArray modelSiblings; + GetModel()->GetChildren(parent, modelSiblings); + const int modelSiblingsSize = modelSiblings.size(); - node->SetHasChildren( true ); + int posInModel = modelSiblings.Index(item, /*fromEnd=*/true); + wxCHECK_MSG( posInModel != wxNOT_FOUND, false, "adding non-existent item?" ); - if( g_model->IsContainer( item ) ) - { - wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); - newnode->SetItem(item); - newnode->SetHasChildren( true ); - node->AddNode( newnode); - } - else - node->AddLeaf( item.GetID() ); + wxDataViewTreeNode *itemNode = new wxDataViewTreeNode(parentNode, item); + itemNode->SetHasChildren(GetModel()->IsContainer(item)); - node->ChangeSubTreeCount(1); + parentNode->SetHasChildren(true); - m_count = -1; + const wxDataViewTreeNodes& nodeSiblings = parentNode->GetChildNodes(); + const int nodeSiblingsSize = nodeSiblings.size(); + + int nodePos = 0; + + if ( posInModel == modelSiblingsSize - 1 ) + { + nodePos = nodeSiblingsSize; + } + else if ( modelSiblingsSize == nodeSiblingsSize + 1 ) + { + // This is the simple case when our node tree already matches the + // model and only this one item is missing. + nodePos = posInModel; + } + else + { + // It's possible that a larger discrepancy between the model and + // our realization exists. This can happen e.g. when adding a bunch + // of items to the model and then calling ItemsAdded() just once + // afterwards. In this case, we must find the right position by + // looking at sibling items. + + // append to the end if we won't find a better position: + nodePos = nodeSiblingsSize; + + for ( int nextItemPos = posInModel + 1; + nextItemPos < modelSiblingsSize; + nextItemPos++ ) + { + int nextNodePos = parentNode->FindChildByItem(modelSiblings[nextItemPos]); + if ( nextNodePos != wxNOT_FOUND ) + { + nodePos = nextNodePos; + break; + } + } + } + + parentNode->ChangeSubTreeCount(+1); + parentNode->InsertChild(itemNode, nodePos); + + m_count = -1; + } + + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; } -static void DestroyTreeHelper( wxDataViewTreeNode * node); - bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { - if (!m_root) + if (IsVirtualList()) { - m_count--; - if( m_currentRow > GetRowCount() ) - m_currentRow = m_count - 1; + wxDataViewVirtualListModel *list_model = + (wxDataViewVirtualListModel*) GetModel(); + m_count = list_model->GetCount(); - m_selection.Empty(); - - UpdateDisplay(); - - return true; - } + if ( !m_selection.empty() ) + { + const int row = GetRowByItem(item); - wxDataViewTreeNode * node = FindNode(parent); + int rowIndexInSelection = wxNOT_FOUND; - wxCHECK_MSG( node != NULL, false, "item not found" ); - wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" ); + const size_t selCount = m_selection.size(); + for ( size_t i = 0; i < selCount; i++ ) + { + if ( m_selection[i] == (unsigned)row ) + rowIndexInSelection = i; + else if ( m_selection[i] > (unsigned)row ) + m_selection[i]--; + } - int sub = -1; - node->GetChildren().Remove( item.GetID() ); - //Manuplate 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 ( rowIndexInSelection != wxNOT_FOUND ) + m_selection.RemoveAt(rowIndexInSelection); } + } - if( isContainer ) + else // general case { - wxDataViewTreeNode * n = NULL; - wxDataViewTreeNodes nodes = node->GetNodes(); - int len = nodes.GetCount(); - for( int i = 0 ; i < len; i ++) + wxDataViewTreeNode *parentNode = FindNode(parent); + + // Notice that it is possible that the item being deleted is not in the + // tree at all, for example we could be deleting a never shown (because + // collapsed) item in a tree model. So it's not an error if we don't know + // about this item, just return without doing anything then. + if ( !parentNode ) + return true; + + wxCHECK_MSG( parentNode->HasChildren(), false, "parent node doesn't have children?" ); + const wxDataViewTreeNodes& parentsChildren = parentNode->GetChildNodes(); + + // We can't use FindNode() to find 'item', because it was already + // removed from the model by the time ItemDeleted() is called, so we + // have to do it manually. We keep track of its position as well for + // later use. + int itemPosInNode = 0; + wxDataViewTreeNode *itemNode = NULL; + for ( wxDataViewTreeNodes::const_iterator i = parentsChildren.begin(); + i != parentsChildren.end(); + ++i, ++itemPosInNode ) { - if( nodes[i]->GetItem() == item ) + if( (*i)->GetItem() == item ) { - n = nodes[i]; + itemNode = *i; break; } } - wxCHECK_MSG( n != NULL, false, "item not found" ); + // If the parent wasn't expanded, it's possible that we didn't have a + // node corresponding to 'item' and so there's nothing left to do. + if ( !itemNode ) + { + // If this was the last child to be removed, it's possible the parent + // node became a leaf. Let's ask the model about it. + if ( parentNode->GetChildNodes().empty() ) + parentNode->SetHasChildren(GetModel()->IsContainer(parent)); + + return true; + } + + // Delete the item from wxDataViewTreeNode representation: + const int itemsDeleted = 1 + itemNode->GetSubTreeCount(); + + parentNode->RemoveChild(itemNode); + delete itemNode; + parentNode->ChangeSubTreeCount(-itemsDeleted); + + // Make the row number invalid and get a new valid one when user call GetRowCount + m_count = -1; + + // If this was the last child to be removed, it's possible the parent + // node became a leaf. Let's ask the model about it. + if ( parentNode->GetChildNodes().empty() ) + parentNode->SetHasChildren(GetModel()->IsContainer(parent)); + + // Update selection by removing 'item' and its entire children tree from the selection. + if ( !m_selection.empty() ) + { + // we can't call GetRowByItem() on 'item', as it's already deleted, so compute it from + // the parent ('parentNode') and position in its list of children + int itemRow; + if ( itemPosInNode == 0 ) + { + // 1st child, row number is that of the parent parentNode + 1 + itemRow = GetRowByItem(parentNode->GetItem()) + 1; + } + else + { + // row number is that of the sibling above 'item' + its subtree if any + 1 + const wxDataViewTreeNode *siblingNode = parentNode->GetChildNodes()[itemPosInNode - 1]; + + itemRow = GetRowByItem(siblingNode->GetItem()) + + siblingNode->GetSubTreeCount() + + 1; + } + + wxDataViewSelection newsel(wxDataViewSelectionCmp); + + const size_t numSelections = m_selection.size(); + for ( size_t i = 0; i < numSelections; ++i ) + { + const int s = m_selection[i]; + if ( s < itemRow ) + newsel.push_back(s); + else if ( s >= itemRow + itemsDeleted ) + newsel.push_back(s - itemsDeleted); + // else: deleted item, remove from selection + } - node->GetNodes().Remove( n ); - sub -= n->GetSubTreeCount(); - ::DestroyTreeHelper(n); + m_selection = newsel; + } } - //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 + // 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; + ChangeCurrentRow(m_count - 1); + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; @@ -2529,19 +2342,35 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) SortPrepare(); g_model->Resort(); - //Send event + GetOwner()->InvalidateColBestWidths(); + + // Send event wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem(item); - parent->GetEventHandler()->ProcessEvent(le); + parent->ProcessWindowEvent(le); return true; } -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column ) { + int view_column = -1; + unsigned int n_col = m_owner->GetColumnCount(); + for (unsigned i = 0; i < n_col; i++) + { + wxDataViewColumn *column = m_owner->GetColumn( i ); + if (column->GetModelColumn() == model_column) + { + view_column = (int) i; + break; + } + } + if (view_column == -1) + return false; + // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 /*#define MAX_VIRTUAL_WIDTH 100000 @@ -2554,15 +2383,17 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i SortPrepare(); g_model->Resort(); - //Send event + GetOwner()->InvalidateColBestWidth(view_column); + + // Send event wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem(item); - le.SetColumn(col); - le.SetDataViewColumn(GetOwner()->GetColumn(col)); - parent->GetEventHandler()->ProcessEvent(le); + le.SetColumn(view_column); + le.SetDataViewColumn(GetOwner()->GetColumn(view_column)); + parent->ProcessWindowEvent(le); return true; } @@ -2570,10 +2401,12 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i bool wxDataViewMainWindow::Cleared() { DestroyTree(); + m_selection.Clear(); SortPrepare(); - BuildTree( GetOwner()->GetModel() ); + BuildTree( GetModel() ); + GetOwner()->InvalidateColBestWidths(); UpdateDisplay(); return true; @@ -2582,6 +2415,7 @@ bool wxDataViewMainWindow::Cleared() void wxDataViewMainWindow::UpdateDisplay() { m_dirty = true; + m_underMouse = NULL; } void wxDataViewMainWindow::OnInternalIdle() @@ -2597,7 +2431,7 @@ void wxDataViewMainWindow::OnInternalIdle() void wxDataViewMainWindow::RecalculateDisplay() { - wxDataViewModel *model = GetOwner()->GetModel(); + wxDataViewModel *model = GetModel(); if (!model) { Refresh(); @@ -2615,6 +2449,8 @@ void wxDataViewMainWindow::RecalculateDisplay() void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) { + m_underMouse = NULL; + wxWindow::ScrollWindow( dx, dy, rect ); if (GetOwner()->m_headerArea) @@ -2623,20 +2459,22 @@ void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) void wxDataViewMainWindow::ScrollTo( int rows, int column ) { + m_underMouse = NULL; + int x, y; m_owner->GetScrollPixelsPerUnit( &x, &y ); int sy = GetLineStart( rows )/y; - int sx = 0; + int sx = -1; if( column != -1 ) { wxRect rect = GetClientRect(); int colnum = 0; - int x_start = 0, x_end = 0, w = 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(colnum); + wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum); if (col->IsHidden()) continue; // skip it! @@ -2644,7 +2482,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column ) x_start += w; } - x_end = x_start + w; + int x_end = x_start + w; xe = xx + rect.width; if( x_end > xe ) { @@ -2671,7 +2509,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(); @@ -2692,9 +2530,9 @@ 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 ); - //we should deal with the pixel here + // we should deal with the pixel here unsigned int row = GetLineAt(client_size.y) - 1; return wxMin( GetRowCount()-1, row ); @@ -2821,10 +2659,10 @@ void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem( item ); - parent->GetEventHandler()->ProcessEvent(le); + parent->ProcessWindowEvent(le); } void wxDataViewMainWindow::RefreshRow( unsigned int row ) @@ -2863,63 +2701,11 @@ 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 (start > client_size.y) return; - if ( !event.ControlDown() ) - { - SelectRow( m_currentRow, true ); - SendSelectionChangedEvent(GetItemByRow(m_currentRow)); - } - else - RefreshRow( m_currentRow ); - } + wxRect rect( 0, start, client_size.x, client_size.y - start ); - GetOwner()->EnsureVisible( m_currentRow, -1 ); + Refresh( true, &rect ); } wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const @@ -2935,45 +2721,46 @@ wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const int wxDataViewMainWindow::GetLineStart( unsigned int row ) const { - const wxDataViewModel *model = GetOwner()->GetModel(); - + const wxDataViewModel *model = 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(); - - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - int height = m_lineHeight; - for (col = 0; col < cols; col++) - { + const wxDataViewTreeNode* node = GetTreeNodeByRow(r); + if (!node) return start; + + wxDataViewItem item = node->GetItem(); + + 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)) + + if ((col != 0) && + model->IsContainer(item) && + !model->HasContainerColumns(item)) continue; // skip it! - - const wxDataViewRenderer *renderer = column->GetRenderer(); - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer2 = const_cast(renderer); - renderer2->SetValue( value ); + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + height = wxMax( height, renderer->GetSize().y ); - } - - start += height; + } + + start += height; } - + return start; } else @@ -2984,76 +2771,71 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const int wxDataViewMainWindow::GetLineAt( unsigned int y ) const { - const wxDataViewModel *model = GetOwner()->GetModel(); + const wxDataViewModel *model = GetModel(); - if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + // 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 (;;) { - // TODO make more efficient - - unsigned int row = 0; - unsigned int yy = 0; - for (;;) + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) { - const wxDataViewTreeNode* node = GetTreeNodeByRow(row); - if (!node) - { - // not really correct... - return row + ((y-yy) / m_lineHeight); - } - - wxDataViewItem item = node->GetItem(); - - 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! - - const wxDataViewRenderer *renderer = column->GetRenderer(); - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer2 = const_cast(renderer); - renderer2->SetValue( value ); - height = wxMax( height, renderer->GetSize().y ); - } - - yy += height; - if (y < yy) - return row; - - row++; + // not really correct... + return row + ((y-yy) / m_lineHeight); } - - return -1; - } - else - { - return y / m_lineHeight; + + wxDataViewItem item = node->GetItem(); + + 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! + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + + 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(); - + const wxDataViewModel *model = 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(); - + int height = m_lineHeight; - + unsigned int cols = GetOwner()->GetColumnCount(); unsigned int col; for (col = 0; col < cols; col++) @@ -3062,14 +2844,15 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const if (column->IsHidden()) continue; // skip it! - if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + if ((col != 0) && + model->IsContainer(item) && + !model->HasContainerColumns(item)) continue; // skip it! - - const wxDataViewRenderer *renderer = column->GetRenderer(); - wxVariant value; - model->GetValue( value, item, column->GetModelColumn() ); - wxDataViewRenderer *renderer2 = const_cast(renderer); - renderer2->SetValue( value ); + + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + renderer->PrepareForItem(model, item, column->GetModelColumn()); + height = wxMax( height, renderer->GetSize().y ); } @@ -3081,70 +2864,6 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const } } -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(){ return ret; } -private: - unsigned int row; - int current ; - wxDataViewItem ret; -}; - -wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const -{ - if (!m_root) - { - return wxDataViewItem( (void*) row ); - } - else - { - RowToItemJob job( row, -2 ); - Walker( m_root , job ); - return job.GetResult(); - } -} class RowToTreeNodeJob: public DoJob { @@ -3152,208 +2871,292 @@ public: RowToTreeNodeJob( unsigned int row , int current, wxDataViewTreeNode * node ) { this->row = row; - this->current = current ; - ret = NULL ; + 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; + { + ret = node; + return DoJob::DONE; } if( node->GetSubTreeCount() + current < static_cast(row) ) { current += node->GetSubTreeCount(); - return DoJob::IGR; + return DoJob::SKIP_SUBTREE; } else { parent = node; - //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) + + // If the current node has only leaf children, we can find the + // desired node directly. This can speed up finding the node + // in some cases, and will have a very good effect for list views. + if ( node->HasChildren() && + (int)node->GetChildNodes().size() == node->GetSubTreeCount() ) { - 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; + const int index = static_cast(row) - current - 1; + ret = node->GetChildNodes()[index]; + return DoJob::DONE; } - return DoJob::CONT; - } - + return DoJob::CONTINUE; + } } - 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; - } + wxDataViewTreeNode * GetResult() const + { return ret; } - return DoJob::CONT; - } - wxDataViewTreeNode * GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewTreeNode * ret; - wxDataViewTreeNode * parent ; + 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 ) +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const +{ + if (IsVirtualList()) + { + return wxDataViewItem( wxUIntToPtr(row+1) ); + } + else + { + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + return node ? node->GetItem() : wxDataViewItem(); + } +} + +bool +wxDataViewMainWindow::SendExpanderEvent(wxEventType type, + const wxDataViewItem& item) { wxWindow *parent = GetParent(); wxDataViewEvent le(type, parent->GetId()); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); le.SetItem( item ); - parent->GetEventHandler()->ProcessEvent(le); - return le; + return !parent->ProcessWindowEvent(le) || le.IsAllowed(); } -void wxDataViewMainWindow::OnExpanding( unsigned int row ) +bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const { + if (IsList()) + return false; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if( node != NULL ) - { - if( node->HasChildren()) - { - if( !node->IsOpen()) + if (!node) + return false; + + if (!node->HasChildren()) + return false; + + return node->IsOpen(); +} + +bool wxDataViewMainWindow::HasChildren( unsigned int row ) const +{ + if (IsList()) + return false; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return false; + + if (!node->HasChildren()) + return false; + + return true; +} + +void wxDataViewMainWindow::Expand( unsigned int row ) +{ + if (IsList()) + return; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return; + + if (!node->HasChildren()) + return; + + if (!node->IsOpen()) { - wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); - //Check if the user prevent expanding - if( e.GetSkipped() ) + if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, node->GetItem()) ) + { + // Vetoed by the event handler. return; + } - node->ToggleOpen(); - //Here I build the children of current node - if( node->GetChildrenNumber() == 0 ) - { - SortPrepare(); - ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); - } - m_count = -1; - UpdateDisplay(); - //Send the expanded event - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); - } - else - { - SelectRow( row, false ); - SelectRow( row + 1, true ); - ChangeCurrentRow( row + 1 ); - SendSelectionChangedEvent( GetItemByRow(row+1)); + node->ToggleOpen(); + + // build the children of current node + if( node->GetChildNodes().empty() ) + { + SortPrepare(); + ::BuildTreeHelper(GetModel(), node->GetItem(), node); + } + + // 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()); } - } - else - delete node; - } } -void wxDataViewMainWindow::OnCollapsing(unsigned int row) +void wxDataViewMainWindow::Collapse(unsigned int row) { - wxDataViewTreeNode * node = GetTreeNodeByRow(row); - if( node != NULL ) - { - wxDataViewTreeNode * nd = node; + if (IsList()) + return; + + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + if (!node) + return; + + if (!node->HasChildren()) + return; - if( node->HasChildren() && node->IsOpen() ) + if (node->IsOpen()) { - wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); - if( e.GetSkipped() ) + if ( !SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()) ) + { + // Vetoed by the event handler. 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; + } + } + node->ToggleOpen(); - m_count = -1; - UpdateDisplay(); - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem()); - } - else - { - node = node->GetParent(); - if( node != NULL ) + + // 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 { - int parent = GetRowByItem( node->GetItem() ) ; - if( parent >= 0 ) + // 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; iGetItem() ); + const unsigned testRow = m_selection[i]; + // all rows above us are not affected, so skip them + if(testRow <= row) + continue; + + m_selection[i] -= rowAdjustment; } + + // if the "current row" is being collapsed away we change it to the current row ;-) + if(m_currentRow > row && m_currentRow <= maxRowToBeTested) + ChangeCurrentRow(row); + else if(m_currentRow > row) + ChangeCurrentRow(m_currentRow - rowAdjustment); } + + m_count = -1; + UpdateDisplay(); + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,node->GetItem()); } - if( !nd->HasChildren()) - delete nd; - } } wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item ) { - wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetModel(); if( model == NULL ) return NULL; - //Compose the a parent-chain of the finding item - ItemList list; - list.DeleteContents( true ); + if (!item.IsOk()) + return m_root; + + // Compose the parent-chain for the item we are looking for + wxVector parentChain; wxDataViewItem it( item ); while( it.IsOk() ) { - wxDataViewItem * pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + parentChain.push_back(it); + it = model->GetParent(it); } - //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++ ) + // Find the item along the parent-chain. + // This algorithm is designed to speed up the node-finding method + wxDataViewTreeNode* node = m_root; + for( unsigned iter = parentChain.size()-1; ; --iter ) { if( node->HasChildren() ) { - if( node->GetChildrenNumber() == 0 ) + if( node->GetChildNodes().empty() ) { + // Even though the item is a container, it doesn't have any + // child nodes in the control's representation yet. We have + // to realize its subtree now. SortPrepare(); ::BuildTreeHelper(model, node->GetItem(), node); } - wxDataViewTreeNodes nodes = node->GetNodes(); - unsigned int i; + const wxDataViewTreeNodes& nodes = node->GetChildNodes(); bool found = false; - - for (i = 0; i < nodes.GetCount(); i ++) + + for (unsigned i = 0; i < nodes.GetCount(); ++i) { - if (nodes[i]->GetItem() == (**iter)) + wxDataViewTreeNode* currentNode = nodes[i]; + if (currentNode->GetItem() == parentChain[iter]) { - if (nodes[i]->GetItem() == item) - return nodes[i]; - - node = nodes[i]; + if (currentNode->GetItem() == item) + return currentNode; + + node = currentNode; found = true; break; } @@ -3363,21 +3166,24 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item } else return NULL; + + if ( !iter ) + break; } return NULL; } -void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) +void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, + wxDataViewColumn* &column ) { wxDataViewColumn *col = NULL; unsigned int cols = GetOwner()->GetColumnCount(); unsigned int colnum = 0; - unsigned int x_start = 0; int x, y; m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); - for (x_start = 0; colnum < cols; colnum++) + for (unsigned x_start = 0; colnum < cols; colnum++) { - col = GetOwner()->GetColumn(colnum); + col = GetOwner()->GetColumnAt(colnum); if (col->IsHidden()) continue; // skip it! @@ -3392,35 +3198,75 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item item = GetItemByRow( GetLineAt( y ) ); } -wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) +wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, + const wxDataViewColumn* column ) { + 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++) + { + wxDataViewColumn* col = GetOwner()->GetColumnAt( i ); + + if (col == column) + break; + + if (col->IsHidden()) + continue; // skip it! + + xpos += col->GetWidth(); + width += col->GetWidth(); + } + + if(column != 0) + { + // 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; + } + + // 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); - int y = GetLineStart( row ); - int h = GetLineHeight( m_lineHeight ); - int x = 0; - wxDataViewColumn *col = NULL; - for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ ) + if (!IsList() && + (column == 0 || GetExpanderColumnOrFirstOne(GetOwner()) == column) ) { - col = GetOwner()->GetColumn( i ); - x += col->GetWidth(); - if( GetOwner()->GetColumn(i+1) == column ) - break; + wxDataViewTreeNode* node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; // use m_lineHeight as the width of the expander } - int w = col->GetWidth(); - m_owner->CalcScrolledPosition( x, y, &x, &y ); - return wxRect(x, y, w, h); + + wxRect itemRect( xpos + indent, + GetLineStart( row ), + width - indent, + GetLineHeight( row ) ); + + GetOwner()->CalcScrolledPosition( itemRect.x, itemRect.y, + &itemRect.x, &itemRect.y ); + + return itemRect; } int wxDataViewMainWindow::RecalculateCount() { - if (!m_root) + if (IsVirtualList()) { - wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel(); -#ifndef __WXMAC__ - return list_model->GetLastIndex() + 1; -#else - return list_model->GetLastIndex() - 1; -#endif + wxDataViewVirtualListModel *list_model = + (wxDataViewVirtualListModel*) GetModel(); + + return list_model->GetCount(); } else { @@ -3431,43 +3277,41 @@ int wxDataViewMainWindow::RecalculateCount() class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter ) - { this->item = item ; ret = -1 ; m_iter = iter ; } - virtual ~ItemToRowJob(){}; + ItemToRowJob(const wxDataViewItem& item_, wxVector::reverse_iterator iter) + : m_iter(iter), + item(item_) + { + ret = -1; + } - //Maybe binary search will help to speed up this process + // 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::DONE; + } - if( node->GetItem() == **m_iter ) - { - m_iter++ ; - return DoJob::CONT; - } - else - { - ret += node->GetSubTreeCount(); - return DoJob::IGR; - } + if( node->GetItem() == *m_iter ) + { + m_iter++; + return DoJob::CONTINUE; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::SKIP_SUBTREE; + } } - 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(){ return ret -1 ; } + // the row number is begin from zero + int GetResult() const + { return ret -1; } + private: - ItemList::const_iterator m_iter; + wxVector::reverse_iterator m_iter; wxDataViewItem item; int ret; @@ -3475,117 +3319,198 @@ private: int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const { - const wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetModel(); if( model == NULL ) return -1; - if (!m_root) + if (IsVirtualList()) { - return wxPtrToUInt( item.GetID() ); + return wxPtrToUInt( item.GetID() ) -1; } else { if( !item.IsOk() ) return -1; - //Compose the a parent-chain of the finding item - ItemList list; - wxDataViewItem * pItem = NULL; - list.DeleteContents( true ); + // Compose the parent-chain of the item we are looking for + wxVector parentChain; wxDataViewItem it( item ); while( it.IsOk() ) { - pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + parentChain.push_back(it); + it = model->GetParent(it); } - pItem = new wxDataViewItem( ); - list.Insert( pItem ); - ItemToRowJob job( item, list.begin() ); - Walker(m_root , job ); + // add an 'invalid' item to represent our 'invisible' root node + parentChain.push_back(wxDataViewItem()); + + // the parent chain was created by adding the deepest parent first. + // so if we want to start at the root node, we have to iterate backwards through the vector + ItemToRowJob job( item, parentChain.rbegin() ); + Walker( m_root, job ); return job.GetResult(); } } -static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item, + wxDataViewTreeNode * node) { if( !model->IsContainer( item ) ) - return ; + return; wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); - unsigned int index = 0; - while( index < num ) + + for ( unsigned int index = 0; index < num; index++ ) { - 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 ++; + wxDataViewTreeNode *n = new wxDataViewTreeNode(node, children[index]); + + if( model->IsContainer(children[index]) ) + n->SetHasChildren( true ); + + node->InsertChild(n, index); } - node->SetSubTreeCount( num ); - wxDataViewTreeNode * n = node->GetParent(); - if( n != NULL) - n->ChangeSubTreeCount(num); + wxASSERT( node->IsOpen() ); + node->ChangeSubTreeCount(+num); } void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { DestroyTree(); - if (GetOwner()->GetModel()->IsVirtualListModel()) + if (GetModel()->IsVirtualListModel()) { - m_count = -1 ; + m_count = -1; return; } - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + m_root = wxDataViewTreeNode::CreateRootNode(); - //First we define a invalid item to fetch the top-level elements + // 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 wxDataViewMainWindow::DestroyTree() +{ + if (!IsVirtualList()) + { + wxDELETE(m_root); + m_count = 0; + } } -static void DestroyTreeHelper( wxDataViewTreeNode * node ) +wxDataViewColumn* +wxDataViewMainWindow::FindColumnForEditing(const wxDataViewItem& item, wxDataViewCellMode mode) { - if( node->GetNodeNumber() != 0 ) + // Edit the current column editable in 'mode'. If no column is focused + // (typically because the user has full row selected), try to find the + // first editable column (this would typically be a checkbox for + // wxDATAVIEW_CELL_ACTIVATABLE and we don't want to force the user to set + // focus on the checkbox column; or on the only editable text column). + + wxDataViewColumn *candidate = m_currentCol; + + if ( candidate && + !IsCellEditableInMode(item, candidate, mode) && + !m_currentColSetByKeyboard ) + { + // If current column was set by mouse to something not editable (in + // 'mode') and the user pressed Space/F2 to edit it, treat the + // situation as if there was whole-row focus, because that's what is + // visually indicated and the mouse click could very well be targeted + // on the row rather than on an individual cell. + // + // But if it was done by keyboard, respect that even if the column + // isn't editable, because focus is visually on that column and editing + // something else would be surprising. + candidate = NULL; + } + + if ( !candidate ) { - int len = node->GetNodeNumber(); - int i = 0 ; - wxDataViewTreeNodes& nodes = node->GetNodes(); - for( ; i < len; i ++ ) + const unsigned cols = GetOwner()->GetColumnCount(); + for ( unsigned i = 0; i < cols; i++ ) { - DestroyTreeHelper(nodes[i]); + wxDataViewColumn *c = GetOwner()->GetColumnAt(i); + if ( c->IsHidden() ) + continue; + + if ( IsCellEditableInMode(item, c, mode) ) + { + candidate = c; + break; + } } } - delete node; + + // If on container item without columns, only the expander column + // may be directly editable: + if ( candidate && + GetOwner()->GetExpanderColumn() != candidate && + GetModel()->IsContainer(item) && + !GetModel()->HasContainerColumns(item) ) + { + candidate = GetOwner()->GetExpanderColumn(); + } + + if ( !candidate ) + return NULL; + + if ( !IsCellEditableInMode(item, candidate, mode) ) + return NULL; + + return candidate; } -void wxDataViewMainWindow::DestroyTree() +bool wxDataViewMainWindow::IsCellEditableInMode(const wxDataViewItem& item, + const wxDataViewColumn *col, + wxDataViewCellMode mode) const { - if (!IsVirtualList()) + if ( col->GetRenderer()->GetMode() != mode ) + return false; + + if ( !GetModel()->IsEnabled(item, col->GetModelColumn()) ) + return false; + + return true; +} + +void wxDataViewMainWindow::OnCharHook(wxKeyEvent& event) +{ + if ( m_editorCtrl ) { - ::DestroyTreeHelper(m_root); - m_count = 0; - m_root = NULL; + // Handle any keys special for the in-place editor and return without + // calling Skip() below. + switch ( event.GetKeyCode() ) + { + case WXK_ESCAPE: + m_editorRenderer->CancelEditing(); + return; + + case WXK_RETURN: + m_editorRenderer->FinishEditing(); + return; + } } + + event.Skip(); } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { - if ( HandleAsNavigationKey(event) ) + wxWindow * const parent = GetParent(); + + // propagate the char event upwards + wxKeyEvent eventForParent(event); + eventForParent.SetEventObject(parent); + if ( parent->ProcessWindowEvent(eventForParent) ) + return; + + if ( parent->HandleAsNavigationKey(event) ) return; // no item -> nothing to do @@ -3597,48 +3522,115 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) // don't use m_linesPerPage directly as it might not be computed yet const int pageSize = GetCountPerPage(); - wxCHECK_RET( pageSize, _T("should have non zero page size") ); + wxCHECK_RET( pageSize, wxT("should have non zero page size") ); switch ( event.GetKeyCode() ) { case WXK_RETURN: - { - if (m_currentRow > 0) + if ( !event.HasModifiers() ) { - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( GetItemByRow(m_currentRow) ); + // Enter activates the item, i.e. sends wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED to + // it. Only if that event is not handled do we activate column renderer (which + // is normally done by Space) or even inline editing. + + const wxDataViewItem item = GetItemByRow(m_currentRow); + + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, + parent->GetId()); + le.SetItem(item); le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); + le.SetModel(GetModel()); + + if ( parent->ProcessWindowEvent(le) ) + break; + // else: fall through to WXK_SPACE handling + } + + case WXK_SPACE: + if ( !event.HasModifiers() ) + { + // Space toggles activatable items or -- if not activatable -- + // starts inline editing (this is normally done using F2 on + // Windows, but Space is common everywhere else, so use it too + // for greater cross-platform compatibility). - parent->GetEventHandler()->ProcessEvent(le); + const wxDataViewItem item = GetItemByRow(m_currentRow); + + // Activate the current activatable column. If not column is focused (typically + // because the user has full row selected), try to find the first activatable + // column (this would typically be a checkbox and we don't want to force the user + // to set focus on the checkbox column). + wxDataViewColumn *activatableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_ACTIVATABLE); + + if ( activatableCol ) + { + const unsigned colIdx = activatableCol->GetModelColumn(); + const wxRect cell_rect = GetOwner()->GetItemRect(item, activatableCol); + + wxDataViewRenderer *cell = activatableCol->GetRenderer(); + cell->PrepareForItem(GetModel(), item, colIdx); + cell->WXActivateCell(cell_rect, GetModel(), item, colIdx, NULL); + + break; + } + // else: fall through to WXK_F2 handling + } + + case WXK_F2: + if ( !event.HasModifiers() ) + { + if( !m_selection.empty() ) + { + // Mimic Windows 7 behavior: edit the item that has focus + // if it is selected and the first selected item if focus + // is out of selection. + int sel; + if ( m_selection.Index(m_currentRow) != wxNOT_FOUND ) + sel = m_currentRow; + else + sel = m_selection[0]; + + + const wxDataViewItem item = GetItemByRow(sel); + + // Edit the current column. If no column is focused + // (typically because the user has full row selected), try + // to find the first editable column. + wxDataViewColumn *editableCol = FindColumnForEditing(item, wxDATAVIEW_CELL_EDITABLE); + + if ( editableCol ) + GetOwner()->EditItem(item, editableCol); + } } break; - } + case WXK_UP: if ( m_currentRow > 0 ) - OnArrowChar( m_currentRow - 1, event ); + OnVerticalNavigation( m_currentRow - 1, event ); break; case WXK_DOWN: - if ( m_currentRow < GetRowCount() - 1 ) - OnArrowChar( m_currentRow + 1, event ); + if ( m_currentRow + 1 < GetRowCount() ) + OnVerticalNavigation( m_currentRow + 1, event ); break; - //Add the process for tree expanding/collapsing + // Add the process for tree expanding/collapsing case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + OnLeftKey(); + break; + + case WXK_RIGHT: + OnRightKey(); + break; + case WXK_END: + { if (!IsEmpty()) - OnArrowChar( GetRowCount() - 1, event ); + OnVerticalNavigation( GetRowCount() - 1, event ); break; - + } case WXK_HOME: if (!IsEmpty()) - OnArrowChar( 0, event ); + OnVerticalNavigation( 0, event ); break; case WXK_PAGEUP: @@ -3648,7 +3640,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if (index < 0) index = 0; - OnArrowChar( index, event ); + OnVerticalNavigation( index, event ); } break; @@ -3660,7 +3652,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) if ( index >= count ) index = count - 1; - OnArrowChar( index, event ); + OnVerticalNavigation( index, event ); } break; @@ -3669,6 +3661,184 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) } } +void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event) +{ + wxCHECK_RET( newCurrent < GetRowCount(), + wxT("invalid item index in OnVerticalNavigation()") ); + + // 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 ); +} + +void wxDataViewMainWindow::OnLeftKey() +{ + if ( IsList() ) + { + TryAdvanceCurrentColumn(NULL, /*forward=*/false); + } + else + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + + if ( TryAdvanceCurrentColumn(node, /*forward=*/false) ) + return; + + // Because TryAdvanceCurrentColumn() return false, we are at the first + // column or using whole-row selection. In this situation, we can use + // the standard TreeView handling of the left key. + if (node->HasChildren() && node->IsOpen()) + { + Collapse(m_currentRow); + } + else + { + // if the node is already closed, we move the selection to its parent + wxDataViewTreeNode *parent_node = node->GetParent(); + + 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 ); + GetOwner()->EnsureVisible( parent, -1 ); + SendSelectionChangedEvent( parent_node->GetItem() ); + } + } + } + } +} + +void wxDataViewMainWindow::OnRightKey() +{ + if ( IsList() ) + { + TryAdvanceCurrentColumn(NULL, /*forward=*/true); + } + else + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + + if ( node->HasChildren() ) + { + if ( !node->IsOpen() ) + { + Expand( m_currentRow ); + } + else + { + // if the node is already open, we move the selection to the first child + unsigned int row = m_currentRow; + SelectRow( row, false ); + SelectRow( row + 1, true ); + ChangeCurrentRow( row + 1 ); + GetOwner()->EnsureVisible( row + 1, -1 ); + SendSelectionChangedEvent( GetItemByRow(row+1) ); + } + } + else + { + TryAdvanceCurrentColumn(node, /*forward=*/true); + } + } +} + +bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, bool forward) +{ + if ( GetOwner()->GetColumnCount() == 0 ) + return false; + + if ( !m_useCellFocus ) + return false; + + if ( node ) + { + // navigation shouldn't work in branch nodes without other columns: + if ( node->HasChildren() && !GetModel()->HasContainerColumns(node->GetItem()) ) + return false; + } + + if ( m_currentCol == NULL || !m_currentColSetByKeyboard ) + { + if ( forward ) + { + m_currentCol = GetOwner()->GetColumnAt(1); + m_currentColSetByKeyboard = true; + RefreshRow(m_currentRow); + return true; + } + else + return false; + } + + int idx = GetOwner()->GetColumnIndex(m_currentCol) + (forward ? +1 : -1); + + if ( idx >= (int)GetOwner()->GetColumnCount() ) + return false; + + GetOwner()->EnsureVisible(m_currentRow, idx); + + if ( idx < 1 ) + { + // We are going to the left of the second column. Reset to whole-row + // focus (which means first column would be edited). + m_currentCol = NULL; + RefreshRow(m_currentRow); + return true; + } + + m_currentCol = GetOwner()->GetColumnAt(idx); + m_currentColSetByKeyboard = true; + RefreshRow(m_currentRow); + return true; +} + void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { if (event.GetEventType() == wxEVT_MOUSEWHEEL) @@ -3678,6 +3848,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } + // set the focus to ourself if any of the mouse buttons are pressed + if(event.ButtonDown() && !HasFocus()) + SetFocus(); + int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); @@ -3688,7 +3862,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! @@ -3699,62 +3873,107 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } xpos += c->GetWidth(); } + + wxDataViewModel* const model = GetModel(); + + const unsigned int current = GetLineAt( y ); + const wxDataViewItem item = GetItemByRow(current); + + // Handle right clicking here, before everything else as context menu + // events should be sent even when we click outside of any item, unlike all + // the other ones. + if (event.RightUp()) + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(model); + + if ( item.IsOk() && col ) + { + le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); + + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + le.SetValue(value); + } + + parent->ProcessWindowEvent(le); + return; + } + if (!col) + { + event.Skip(); return; + } wxDataViewRenderer *cell = col->GetRenderer(); - unsigned int current = GetLineAt( y ); - if ((current > GetRowCount()) || (x > GetEndOfLastCol())) + if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? + event.Skip(); return; } - //Test whether the mouse is hovered on the tree item button - bool hover = false; - if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) + wxDataViewColumn* const + expander = GetExpanderColumnOrFirstOne(GetOwner()); + + // Test whether the mouse is hovering over the expander (a.k.a tree "+" + // button) and also determine the offset of the real cell start, skipping + // the indentation and the expander itself. + bool hoverOverExpander = false; + int itemOffset = 0; + if ((!IsList()) && (expander == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) + + int indent = node->GetIndentLevel(); + itemOffset = GetOwner()->GetIndent()*indent; + + if ( node->HasChildren() ) { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - if( rect.Contains( x, y) ) + // 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(itemOffset, + GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, + m_lineHeight, m_lineHeight); + + if( rect.Contains(x, y) ) { - //So the mouse is over the expander - hover = true; + // So the mouse is over the expander + hoverOverExpander = true; if (m_underMouse && m_underMouse != node) { - //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + // wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); RefreshRow(GetRowByItem(m_underMouse->GetItem())); } if (m_underMouse != node) { - //wxLogMessage("Do the row: %d", current); + // wxLogMessage("Do the row: %d", current); RefreshRow(current); } m_underMouse = node; } } - if (node!=NULL && !node->HasChildren()) - delete node; + + // Account for the expander as well, even if this item doesn't have it, + // its parent does so it still counts for the offset. + itemOffset += m_lineHeight; } - if (!hover) + if (!hoverOverExpander) { if (m_underMouse != NULL) { - //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + // 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) @@ -3772,7 +3991,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 itemDragged = 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( itemDragged ); + 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; } @@ -3780,8 +4022,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { m_dragCount = 0; } +#endif // wxUSE_DRAG_AND_DROP - bool forceClick = false; + bool simulateClick = false; if (event.ButtonDClick()) { @@ -3789,86 +4032,55 @@ 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))); + ((expander != col) && + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); if (event.LeftDClick()) { - if ( current == m_lineLastClicked ) + if(hoverOverExpander) { - if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) - { - wxVariant value; - model->GetValue( value, item, col->GetModelColumn() ); - cell->SetValue( value ); - 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); - } + // a double click on the expander will be converted into a "simulated" normal click + simulateClick = true; + } + else if ( current == m_lineLastClicked ) + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( item ); + le.SetColumn( col->GetModelColumn() ); + le.SetDataViewColumn( col ); + le.SetEventObject(parent); + le.SetModel(GetModel()); + + parent->ProcessWindowEvent(le); return; } else { // 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; - if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) - { - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) - { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - - if( rect.Contains( x, y) ) - { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); - } - } - if (node && !node->HasChildren()) - delete node; - } - //If the user click the expander, we do not do editing even if the column with expander are editable - if (m_lastOnSame && !expander && !ignore_other_columns) + // 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) ) + IsCellEditableInMode(item, col, wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -3877,7 +4089,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 @@ -3896,28 +4108,31 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (!IsRowSelected(current)) { SelectAllRows(false); + const unsigned oldCurrent = m_currentRow; ChangeCurrentRow(current); SelectRow(m_currentRow,true); + RefreshRow(oldCurrent); SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } - - 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()) { } - if (event.LeftDown() || forceClick) + + if((event.LeftDown() || simulateClick) && hoverOverExpander) { - SetFocus(); + 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) + { m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -3946,14 +4161,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { ChangeCurrentRow(current); ReverseRowSelection(m_currentRow); - SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); + SendSelectionChangedEvent(GetItemByRow(m_currentRow)); } else if (event.ShiftDown()) { ChangeCurrentRow(current); unsigned int lineFrom = oldCurrentRow, - lineTo = current; + lineTo = current; if ( lineTo < lineFrom ) { @@ -3967,10 +4182,10 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) else // !ctrl, !shift { // test in the enclosing if should make it impossible - wxFAIL_MSG( _T("how did we get here?") ); + wxFAIL_MSG( wxT("how did we get here?") ); } } - + if (m_currentRow != oldCurrentRow) RefreshRow( oldCurrentRow ); @@ -3978,20 +4193,65 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; + m_currentColSetByKeyboard = false; - 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) + // Call ActivateCell() after everything else as under GTK+ + if ( IsCellEditableInMode(item, col, 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()); + // notify cell about click + cell->PrepareForItem(model, item, col->GetModelColumn()); + + wxRect cell_rect( xpos + itemOffset, + GetLineStart( current ), + col->GetWidth() - itemOffset, + GetLineHeight( current ) ); + + // Report position relative to the cell's custom area, i.e. + // no the entire space as given by the control but the one + // used by the renderer after calculation of alignment etc. + + // adjust the rectangle ourselves to account for the alignment + wxRect rectItem = cell_rect; + const int align = cell->GetAlignment(); + if ( align != wxDVR_DEFAULT_ALIGNMENT ) + { + const wxSize size = cell->GetSize(); + + if ( size.x >= 0 && size.x < cell_rect.width ) + { + if ( align & wxALIGN_CENTER_HORIZONTAL ) + rectItem.x += (cell_rect.width - size.x)/2; + else if ( align & wxALIGN_RIGHT ) + rectItem.x += cell_rect.width - size.x; + // else: wxALIGN_LEFT is the default + } + + if ( size.y >= 0 && size.y < cell_rect.height ) + { + if ( align & wxALIGN_CENTER_VERTICAL ) + rectItem.y += (cell_rect.height - size.y)/2; + else if ( align & wxALIGN_BOTTOM ) + rectItem.y += cell_rect.height - size.y; + // else: wxALIGN_TOP is the default + } + } + + wxMouseEvent event2(event); + event2.m_x -= rectItem.x; + event2.m_y -= rectItem.y; + m_owner->CalcUnscrolledPosition(event2.m_x, event2.m_y, &event2.m_x, &event2.m_y); + + /* ignore ret */ cell->WXActivateCell + ( + cell_rect, + model, + item, + col->GetModelColumn(), + &event2 + ); } } } @@ -4016,21 +4276,32 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } -wxDataViewItem wxDataViewMainWindow::GetSelection() const +void wxDataViewMainWindow::OnColumnsCountChanged() { - if( m_selection.GetCount() != 1 ) - return wxDataViewItem(); + int editableCount = 0; - return GetItemByRow( m_selection.Item(0)); + const unsigned cols = GetOwner()->GetColumnCount(); + for ( unsigned i = 0; i < cols; i++ ) + { + wxDataViewColumn *c = GetOwner()->GetColumnAt(i); + if ( c->IsHidden() ) + continue; + if ( c->GetRenderer()->GetMode() != wxDATAVIEW_CELL_INERT ) + editableCount++; + } + + m_useCellFocus = (editableCount > 1); + + UpdateDisplay(); } //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- + WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) - BEGIN_EVENT_TABLE(wxDataViewCtrl, wxDataViewCtrlBase) EVT_SIZE(wxDataViewCtrl::OnSize) END_EVENT_TABLE() @@ -4040,43 +4311,57 @@ wxDataViewCtrl::~wxDataViewCtrl() if (m_notifier) GetModel()->RemoveNotifier( m_notifier ); - wxDataViewColumnList::const_iterator iter; - for (iter = m_cols.begin(); iter!=m_cols.end(); iter++) - { - delete *iter; - } + m_cols.Clear(); + m_colsBestWidths.clear(); } void wxDataViewCtrl::Init() { + m_cols.DeleteContents(true); m_notifier = NULL; + + // No sorting column at start + m_sortingColumnIdx = wxNOT_FOUND; + + m_headerArea = NULL; + + m_colsDirty = false; } -bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) +bool wxDataViewCtrl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { - if ( (style & wxBORDER_MASK) == 0) - style |= wxBORDER_SUNKEN; - +// if ( (style & wxBORDER_MASK) == 0) +// style |= wxBORDER_SUNKEN; + + Init(); + if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle, validator)) + style | wxScrolledWindowStyle, validator, name)) return false; SetInitialSize(size); - Init(); - #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren( true ); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); + // We use the cursor keys for moving the selection, not scrolling, so call + // this method to ensure wxScrollHelperEvtHandler doesn't catch all + // keyboard events forwarded to us from wxListMainWindow. + DisableKeyboardScrolling(); + if (HasFlag(wxDV_NO_HEADER)) m_headerArea = NULL; else - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY ); + m_headerArea = new wxDataViewHeaderWindow(this); SetTargetWindow( m_clientArea ); @@ -4089,10 +4374,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); @@ -4108,6 +4398,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 @@ -4120,6 +4419,22 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) Layout(); AdjustScrollbars(); + + // We must redraw the headers if their height changed. Normally this + // shouldn't happen as the control shouldn't let itself be resized beneath + // its minimal height but avoid the display artefacts that appear if it + // does happen, e.g. because there is really not enough vertical space. + if ( !HasFlag(wxDV_NO_HEADER) && m_headerArea && + m_headerArea->GetSize().y <= m_headerArea->GetBestSize(). y ) + { + m_headerArea->Refresh(); + } +} + +void wxDataViewCtrl::SetFocus() +{ + if (m_clientArea) + m_clientArea->SetFocus(); } bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) @@ -4140,13 +4455,28 @@ 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; m_cols.Append( col ); - OnColumnChange(); + m_colsBestWidths.push_back(0); + OnColumnsCountChanged(); return true; } @@ -4156,18 +4486,38 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) return false; m_cols.Insert( col ); - OnColumnChange(); + m_colsBestWidths.insert(m_colsBestWidths.begin(), 0); + OnColumnsCountChanged(); return true; } -void wxDataViewCtrl::OnColumnChange() +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) { - if (m_headerArea) - m_headerArea->UpdateDisplay(); + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + m_cols.Insert( pos, col ); + m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0); + OnColumnsCountChanged(); + return true; +} + +void wxDataViewCtrl::OnColumnChange(unsigned int idx) +{ + if ( m_headerArea ) + m_headerArea->UpdateColumn(idx); m_clientArea->UpdateDisplay(); } +void wxDataViewCtrl::OnColumnsCountChanged() +{ + if (m_headerArea) + m_headerArea->SetColumnCount(GetColumnCount()); + + m_clientArea->OnColumnsCountChanged(); +} + void wxDataViewCtrl::DoSetExpanderColumn() { m_clientArea->UpdateDisplay(); @@ -4183,203 +4533,404 @@ unsigned int wxDataViewCtrl::GetColumnCount() const return m_cols.GetCount(); } -wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const +bool wxDataViewCtrl::SetRowHeight( int lineHeight ) { - wxDataViewColumnList::const_iterator iter; - unsigned int i = 0; - for (iter = m_cols.begin(); iter!=m_cols.end(); iter++) - { - if (i == pos) - return *iter; + if ( !m_clientArea ) + return false; - if ((*iter)->IsHidden()) - continue; - i ++; + m_clientArea->SetRowHeight(lineHeight); + + return true; +} + +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 NULL; + + return wxNOT_FOUND; } -void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos ) +unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const { - if (new_pos > m_cols.GetCount()) return; - m_cols.DeleteObject( col ); - m_cols.Insert( new_pos, col ); + if ( m_colsBestWidths[idx] != 0 ) + return m_colsBestWidths[idx]; + + const int count = m_clientArea->GetRowCount(); + wxDataViewColumn *column = GetColumn(idx); + wxDataViewRenderer *renderer = + const_cast(column->GetRenderer()); + + class MaxWidthCalculator + { + public: + MaxWidthCalculator(const wxDataViewCtrl *dvc, + wxDataViewMainWindow *clientArea, + wxDataViewRenderer *renderer, + const wxDataViewModel *model, + unsigned column, + int expanderSize) + : m_width(0), + m_dvc(dvc), + m_clientArea(clientArea), + m_renderer(renderer), + m_model(model), + m_column(column), + m_expanderSize(expanderSize) + + { + m_isExpanderCol = + !clientArea->IsList() && + (column == 0 || + GetExpanderColumnOrFirstOne(const_cast(dvc)) == dvc->GetColumnAt(column)); + } + + void UpdateWithWidth(int width) + { + m_width = wxMax(m_width, width); + } + + void UpdateWithRow(int row) + { + int indent = 0; + wxDataViewItem item; + + if ( m_isExpanderCol ) + { + wxDataViewTreeNode *node = m_clientArea->GetTreeNodeByRow(row); + item = node->GetItem(); + indent = m_dvc->GetIndent() * node->GetIndentLevel() + m_expanderSize; + } + else + { + item = m_clientArea->GetItemByRow(row); + } + + m_renderer->PrepareForItem(m_model, item, m_column); + m_width = wxMax(m_width, m_renderer->GetSize().x + indent); + } + + int GetMaxWidth() const { return m_width; } + + private: + int m_width; + const wxDataViewCtrl *m_dvc; + wxDataViewMainWindow *m_clientArea; + wxDataViewRenderer *m_renderer; + const wxDataViewModel *m_model; + unsigned m_column; + bool m_isExpanderCol; + int m_expanderSize; + }; + + MaxWidthCalculator calculator(this, m_clientArea, renderer, + GetModel(), column->GetModelColumn(), + m_clientArea->GetRowHeight()); + + if ( m_headerArea ) + calculator.UpdateWithWidth(m_headerArea->GetColumnTitleWidth(*column)); + + // The code below deserves some explanation. For very large controls, we + // simply can't afford to calculate sizes for all items, it takes too + // long. So the best we can do is to check the first and the last N/2 + // items in the control for some sufficiently large N and calculate best + // sizes from that. That can result in the calculated best width being too + // small for some outliers, but it's better to get slightly imperfect + // result than to wait several seconds after every update. To avoid highly + // visible miscalculations, we also include all currently visible items + // no matter what. Finally, the value of N is determined dynamically by + // measuring how much time we spent on the determining item widths so far. + +#if wxUSE_STOPWATCH + int top_part_end = count; + static const long CALC_TIMEOUT = 20/*ms*/; + // don't call wxStopWatch::Time() too often + static const unsigned CALC_CHECK_FREQ = 100; + wxStopWatch timer; +#else + // use some hard-coded limit, that's the best we can do without timer + int top_part_end = wxMin(500, count); +#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH + + int row = 0; + + for ( row = 0; row < top_part_end; row++ ) + { +#if wxUSE_STOPWATCH + if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 && + timer.Time() > CALC_TIMEOUT ) + break; +#endif // wxUSE_STOPWATCH + calculator.UpdateWithRow(row); + } + + // row is the first unmeasured item now; that's our value of N/2 + + if ( row < count ) + { + top_part_end = row; + + // add bottom N/2 items now: + const int bottom_part_start = wxMax(row, count - row); + for ( row = bottom_part_start; row < count; row++ ) + { + calculator.UpdateWithRow(row); + } + + // finally, include currently visible items in the calculation: + const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0)); + int first_visible = m_clientArea->GetLineAt(origin.y); + int last_visible = m_clientArea->GetLineAt(origin.y + GetClientSize().y); + + first_visible = wxMax(first_visible, top_part_end); + last_visible = wxMin(bottom_part_start, last_visible); + + for ( row = first_visible; row < last_visible; row++ ) + { + calculator.UpdateWithRow(row); + } + + wxLogTrace("dataview", + "determined best size from %d top, %d bottom plus %d more visible items out of %d total", + top_part_end, + count - bottom_part_start, + wxMax(0, last_visible - first_visible), + count); + } + + int max_width = calculator.GetMaxWidth(); + if ( max_width > 0 ) + max_width += 2 * PADDING_RIGHTLEFT; + const_cast(this)->m_colsBestWidths[idx] = max_width; + return max_width; +} + +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 ); + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); if (!ret) return false; + m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column)); m_cols.Erase(ret); - delete column; - OnColumnChange(); + + if ( m_clientArea->GetCurrentColumn() == column ) + m_clientArea->ClearCurrentColumn(); + + OnColumnsCountChanged(); return true; } bool wxDataViewCtrl::ClearColumns() { - m_cols.clear(); - OnColumnChange(); + SetExpanderColumn(NULL); + m_cols.Clear(); + m_colsBestWidths.clear(); + + m_clientArea->ClearCurrentColumn(); + + OnColumnsCountChanged(); + return true; } -int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const +void wxDataViewCtrl::InvalidateColBestWidth(int idx) { - int ret = 0, dead = 0; - int len = GetColumnCount(); - for (int i=0; iIsHidden()) - continue; - ret += col->GetWidth(); - if (column==col) - { - CalcScrolledPosition( ret, dead, &ret, &dead ); - break; - } - } - return ret; + m_colsBestWidths[idx] = 0; + m_colsDirty = true; } -wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const +void wxDataViewCtrl::InvalidateColBestWidths() { - return NULL; + m_colsBestWidths.clear(); + m_colsBestWidths.resize(m_cols.size()); + m_colsDirty = true; } -//Selection code with wxDataViewItem as parameters -wxDataViewItem wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::UpdateColWidths() { - return m_clientArea->GetSelection(); -} + if ( !m_headerArea ) + return; -int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const -{ - sel.Empty(); - wxDataViewSelection selection = m_clientArea->GetSelections(); - int len = selection.GetCount(); - for( int i = 0; i < len; i ++) + const unsigned len = m_colsBestWidths.size(); + for ( unsigned i = 0; i < len; i++ ) { - unsigned int row = selection[i]; - sel.Add( m_clientArea->GetItemByRow( row ) ); + if ( m_colsBestWidths[i] == 0 ) + m_headerArea->UpdateColumn(i); } - return len; } -void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) +void wxDataViewCtrl::OnInternalIdle() { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; - int len = sel.GetCount(); - for( int i = 0; i < len; i ++ ) + wxDataViewCtrlBase::OnInternalIdle(); + + if ( m_colsDirty ) { - int row = m_clientArea->GetRowByItem( sel[i] ); - if( row >= 0 ) - selection.Add( static_cast(row) ); + m_colsDirty = false; + UpdateColWidths(); } - m_clientArea->SetSelections( selection ); } -void wxDataViewCtrl::Select( const wxDataViewItem & item ) +int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const { - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) + unsigned int len = GetColumnCount(); + for ( unsigned int i = 0; i < len; i++ ) { - //Unselect all rows before select another in the single select mode - if (m_clientArea->IsSingleSel()) - m_clientArea->SelectAllRows(false); - m_clientArea->SelectRow(row, true); + wxDataViewColumn * col = GetColumnAt(i); + if (column==col) + return i; } + + return wxNOT_FOUND; } -void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) +wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const { - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) - m_clientArea->SelectRow(row, false); + return m_sortingColumnIdx == wxNOT_FOUND ? NULL + : GetColumn(m_sortingColumnIdx); } -bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const +wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const { - int row = m_clientArea->GetRowByItem( item ); - if( row >= 0 ) + return GetItemByRow(m_clientArea->GetCurrentRow()); +} + +void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) +{ + const int row = m_clientArea->GetRowByItem(item); + + const unsigned oldCurrent = m_clientArea->GetCurrentRow(); + if ( static_cast(row) != oldCurrent ) { - return m_clientArea->IsRowSelected(row); + m_clientArea->ChangeCurrentRow(row); + m_clientArea->RefreshRow(oldCurrent); + m_clientArea->RefreshRow(row); } - return false; } -//Selection code with row number as parameter -int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const +wxDataViewColumn *wxDataViewCtrl::GetCurrentColumn() const +{ + return m_clientArea->GetCurrentColumn(); +} + +int wxDataViewCtrl::GetSelectedItemsCount() const +{ + return m_clientArea->GetSelections().size(); +} + +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const { sel.Empty(); - wxDataViewSelection selection = m_clientArea->GetSelections(); - int len = selection.GetCount(); - for( int i = 0; i < len; i ++) + const wxDataViewSelection& selections = m_clientArea->GetSelections(); + + const size_t len = selections.size(); + for ( size_t i = 0; i < len; i++ ) { - unsigned int row = selection[i]; - sel.Add( row ); + wxDataViewItem item = m_clientArea->GetItemByRow(selections[i]); + if ( item.IsOk() ) + { + sel.Add(item); + } + else + { + wxFAIL_MSG( "invalid item in selection - bad internal state" ); + } } - return len; + + return sel.size(); } -void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) +void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; + wxDataViewSelection selection(wxDataViewSelectionCmp); + + wxDataViewItem last_parent; + int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) { - int row = sel[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( int row ) +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 ); + + m_clientArea->SelectRow(row, true); + + // Also set focus to the selected item + m_clientArea->ChangeCurrentRow( row ); } } -void wxDataViewCtrl::Unselect( int row ) +void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) { + int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) m_clientArea->SelectRow(row, false); } -bool wxDataViewCtrl::IsSelected( int row ) const +bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const { + int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) + { return m_clientArea->IsRowSelected(row); + } return false; } -void wxDataViewCtrl::SelectRange( int from, int to ) -{ - wxArrayInt sel; - for( int i = from; i < to; i ++ ) - sel.Add( i ); - m_clientArea->Select(sel); -} - -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); -} - void wxDataViewCtrl::SelectAll() { m_clientArea->SelectAllRows(true); @@ -4409,33 +4960,29 @@ void wxDataViewCtrl::EnsureVisible( int row, int 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 - { - int col = 0; - int len = GetColumnCount(); - for( int i = 0; i < len; i ++ ) - if( GetColumn(i) == column ) - { - col = i; - break; - } - EnsureVisible( row, col ); - } + EnsureVisible( row, GetColumnIndex(column) ); } } -void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const +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 +wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, + const wxDataViewColumn* column ) const { return m_clientArea->GetItemRect(item, column); } @@ -4452,6 +4999,8 @@ int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const void wxDataViewCtrl::Expand( const wxDataViewItem & item ) { + ExpandAncestors( item ); + int row = m_clientArea->GetRowByItem( item ); if (row != -1) m_clientArea->Expand(row); @@ -4464,8 +5013,22 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) m_clientArea->Collapse(row); } - #endif - // !wxUSE_GENERICDATAVIEWCTRL +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::EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) +{ + wxCHECK_RET( item.IsOk(), "invalid item" ); + wxCHECK_RET( column, "no column provided" ); + + m_clientArea->StartEditing(item, column); +} + +#endif // !wxUSE_GENERICDATAVIEWCTRL -#endif - // wxUSE_DATAVIEWCTRL +#endif // wxUSE_DATAVIEWCTRL