X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8505db0fa2678b42acb6a8d5a1ddce02e08a2ed..3508c1432884472f0d24f0f98c0dc75ed35df297:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index f47731e5e4..32691b07ab 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2,7 +2,7 @@ // Name: src/generic/datavgen.cpp // Purpose: wxDataViewCtrl generic implementation // Author: Robert Roebling -// Modified by: Francesco Montorsi, Guru Kathiresan, Otto Wyss +// Modified by: Francesco Montorsi, Guru Kathiresan, Bo Yang // Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence @@ -44,6 +44,8 @@ #include "wx/icon.h" #include "wx/list.h" #include "wx/listimpl.cpp" +#include "wx/imaglist.h" +#include "wx/headerctrl.h" //----------------------------------------------------------------------------- // classes @@ -56,185 +58,150 @@ static const int SCROLL_UNIT_X = 15; // the cell padding on the left/right static const int PADDING_RIGHTLEFT = 3; -// the cell padding on the top/bottom -static const int PADDING_TOPBOTTOM = 1; - // the expander space margin static const int EXPANDER_MARGIN = 4; +#ifdef __WXMSW__ +static const int EXPANDER_OFFSET = 4; +#else +static const int EXPANDER_OFFSET = 1; +#endif + +//Below is the compare stuff +//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed +static wxDataViewModel * g_model; +static int g_column = -2; +static bool g_asending = true; + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 1 - -// NB: for some reason, this class must be dllexport'ed or we get warnings from -// MSVC in DLL build -class WXDLLIMPEXP_ADV wxDataViewHeaderWindowBase : public wxControl +class wxDataViewHeaderWindow : public wxHeaderCtrl { public: - wxDataViewHeaderWindowBase() - { m_owner = NULL; } - - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name) + wxDataViewHeaderWindow(wxDataViewCtrl *parent) + : wxHeaderCtrl(parent) { - return wxWindow::Create(parent, id, pos, size, wxNO_BORDER, name); } - void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } - wxDataViewCtrl *GetOwner() { return m_owner; } - - // called on column addition/removal - virtual void UpdateDisplay() { /* by default, do nothing */ } - - // returns the n-th column - virtual wxDataViewColumn *GetColumn(unsigned int n) - { - wxASSERT(m_owner); - wxDataViewColumn *ret = m_owner->GetColumn(n); - wxASSERT(ret); - - return ret; - } + wxDataViewCtrl *GetOwner() const + { return static_cast(GetParent()); } protected: - wxDataViewCtrl *m_owner; - - // sends an event generated from the n-th wxDataViewColumn - void SendEvent(wxEventType type, unsigned int n); -}; - -// on wxMSW the header window (only that part however) can be made native! -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW - -#define COLUMN_WIDTH_OFFSET 2 -#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow - -class wxDataViewHeaderWindowMSW : public wxDataViewHeaderWindowBase -{ -public: - - wxDataViewHeaderWindowMSW( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + // implement/override wxHeaderCtrl functions by forwarding them to the main + // control + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const { - Create(parent, id, pos, size, name); + return *(GetOwner()->GetColumn(idx)); } - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name); - - ~wxDataViewHeaderWindowMSW(); - - // called when any column setting is changed and/or changed - // the column count - virtual void UpdateDisplay(); - - // called when the main window gets scrolled - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); - -protected: - virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) + { + wxDataViewCtrl * const owner = GetOwner(); - unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); + int widthContents = owner->GetBestColumnWidth(idx); + owner->GetColumn(idx)->SetWidth(wxMax(widthTitle, widthContents)); + owner->OnColumnChange(idx); - wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) - { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + return true; + } private: - DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) -}; - -#else // !defined(__WXMSW__) - -#define HEADER_WINDOW_HEIGHT 25 -#define HEADER_HORIZ_BORDER 5 -#define HEADER_VERT_BORDER 3 -#define wxGenericDataViewHeaderWindow wxDataViewHeaderWindow - -class wxGenericDataViewHeaderWindow : public wxDataViewHeaderWindowBase -{ -public: - wxGenericDataViewHeaderWindow( wxDataViewCtrl *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - const wxString &name = wxT("wxdataviewctrlheaderwindow") ) + bool SendEvent(wxEventType type, unsigned int n) { - Init(); - Create(parent, id, pos, size, name); - } + wxDataViewCtrl * const owner = GetOwner(); + wxDataViewEvent event(type, owner->GetId()); - bool Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name); + event.SetEventObject(owner); + event.SetColumn(n); + event.SetDataViewColumn(owner->GetColumn(n)); + event.SetModel(owner->GetModel()); - ~wxGenericDataViewHeaderWindow() - { - delete m_resizeCursor; + // for events created by wxDataViewHeaderWindow the + // row / value fields are not valid + return owner->GetEventHandler()->ProcessEvent(event); } - virtual void UpdateDisplay() { Refresh(); } - - // event handlers: - - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - void OnSetFocus( wxFocusEvent &event ); - - -protected: + void OnClick(wxHeaderCtrlEvent& event) + { + const unsigned idx = event.GetColumn(); - // vars used for column resizing: + if ( SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, idx) ) + return; - wxCursor *m_resizeCursor; - const wxCursor *m_currentCursor; - bool m_isDragging; + // default handling for the column click is to sort by this column or + // toggle its sort order + wxDataViewCtrl * const owner = GetOwner(); + wxDataViewColumn * const col = owner->GetColumn(idx); + if ( !col->IsSortable() ) + { + // no default handling for non-sortable columns + event.Skip(); + return; + } - bool m_dirty; // needs refresh? - int m_column; // index of the column being resized - int m_currentX; // divider line position in logical (unscrolled) coords - int m_minX; // minimal position beyond which the divider line - // can't be dragged in logical coords + if ( col->IsSortKey() ) + { + // already using this column for sorting, just change the order + col->ToggleSortOrder(); + } + else // not using this column for sorting yet + { + // first unset the old sort column if any + int oldSortKey = owner->GetSortingColumnIndex(); + if ( oldSortKey != wxNOT_FOUND ) + { + owner->GetColumn(oldSortKey)->UnsetAsSortKey(); + owner->OnColumnChange(oldSortKey); + } - // the pen used to draw the current column width drag line - // when resizing the columsn - wxPen m_penCurrent; + owner->SetSortingColumnIndex(idx); + col->SetAsSortKey(); + } + wxDataViewModel * const model = owner->GetModel(); + if ( model ) + model->Resort(); - // internal utilities: + owner->OnColumnChange(idx); + } - void Init() + void OnRClick(wxHeaderCtrlEvent& event) { - m_currentCursor = (wxCursor *) NULL; - m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - - m_isDragging = false; - m_dirty = false; + if ( !SendEvent(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, + event.GetColumn()) ) + event.Skip(); + } - m_column = wxNOT_FOUND; - m_currentX = 0; - m_minX = 0; + void OnEndResize(wxHeaderCtrlEvent& event) + { + wxDataViewCtrl * const owner = GetOwner(); - wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); - m_penCurrent = wxPen(col, 1, wxSOLID); + const unsigned col = event.GetColumn(); + owner->GetColumn(col)->SetWidth(event.GetWidth()); + GetOwner()->OnColumnChange(col); } - void DrawCurrent(); - void AdjustDC(wxDC& dc); + void OnEndReorder(wxHeaderCtrlEvent& event) + { + wxDataViewCtrl * const owner = GetOwner(); + owner->ColumnMoved(owner->GetColumn(event.GetColumn()), + event.GetNewOrder()); + } -private: - DECLARE_DYNAMIC_CLASS(wxGenericDataViewHeaderWindow) DECLARE_EVENT_TABLE() + DECLARE_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_END_RESIZE(wxID_ANY, wxDataViewHeaderWindow::OnEndResize) + + EVT_HEADER_END_REORDER(wxID_ANY, wxDataViewHeaderWindow::OnEndReorder) +END_EVENT_TABLE() //----------------------------------------------------------------------------- // wxDataViewRenameTimer @@ -254,146 +221,137 @@ public: // wxDataViewTreeNode //----------------------------------------------------------------------------- class wxDataViewTreeNode; -WX_DEFINE_SORTED_ARRAY( wxDataViewTreeNode *, wxDataViewTreeNodes ); -WX_DEFINE_SORTED_ARRAY( void* , wxDataViewTreeLeaves); +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); +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2); class wxDataViewTreeNode { public: - wxDataViewTreeNode( wxDataViewTreeNode * parent ) - :leaves( wxGenericTreeModelItemCmp ), - nodes(wxGenericTreeModelNodeCmp) - { this->parent = parent; - if( parent == NULL ) - open = true; - else - open = false; - hasChildren = false; - subTreeCount = 0; - } - //I don't know what I need to do in the destructure - ~wxDataViewTreeNode() + wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) { + m_parent = parent; + if (!parent) + m_open = true; + else + m_open = false; + m_hasChildren = false; + m_subTreeCount = 0; + } + ~wxDataViewTreeNode() + { } - wxDataViewTreeNode * GetParent() { return parent; } - void SetParent( wxDataViewTreeNode * parent ) { this->parent = parent; } - wxDataViewTreeNodes & GetNodes() { return nodes; } - wxDataViewTreeLeaves & GetChildren() { return leaves; } + 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 ) { - nodes.Add( node ); - leaves.Add( node->GetItem().GetID() ); + m_leaves.Add( node->GetItem().GetID() ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); + m_nodes.Add( node ); + if (g_column >= -1) + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + } + void AddLeaf( void * leaf ) + { + m_leaves.Add( leaf ); + if (g_column >= -1) + m_leaves.Sort( &wxGenericTreeModelItemCmp ); } - void AddLeaf( void * leaf ) { leaves.Add( leaf ); } - wxDataViewItem & GetItem() { return item; } - void SetItem( const wxDataViewItem & item ) { this->item = item; } + wxDataViewItem & GetItem() { return m_item; } + const wxDataViewItem & GetItem() const { return m_item; } + void SetItem( const wxDataViewItem & item ) { m_item = item; } - unsigned int GetChildrenNumber() { return leaves.GetCount(); } - unsigned int GetNodeNumber() { return nodes.GetCount(); } - int GetIndentLevel() + unsigned int GetChildrenNumber() const { return m_leaves.GetCount(); } + unsigned int GetNodeNumber() const { return m_nodes.GetCount(); } + int GetIndentLevel() const { - int ret = 0 ; - wxDataViewTreeNode * node = this; - while( node->GetParent()->GetParent() != NULL ) - { - node = node->GetParent(); - ret ++; - } - return ret; + int ret = 0; + const wxDataViewTreeNode * node = this; + while( node->GetParent()->GetParent() != NULL ) + { + node = node->GetParent(); + ret ++; + } + return ret; } - bool IsOpen() + bool IsOpen() const { - return open ; + return m_open; } void ToggleOpen() { - int len = nodes.GetCount(); + int len = m_nodes.GetCount(); int sum = 0; - for ( int i = 0 ;i < len ; i ++) - sum += nodes[i]->GetSubTreeCount(); + for ( int i = 0;i < len; i ++) + sum += m_nodes[i]->GetSubTreeCount(); - sum += leaves.GetCount(); - if( open ) + sum += m_leaves.GetCount(); + if (m_open) { ChangeSubTreeCount(-sum); - open = !open; + m_open = !m_open; } else { - open = !open; + m_open = !m_open; ChangeSubTreeCount(sum); } } - bool HasChildren() { return hasChildren; } - void SetHasChildren( bool has ){ hasChildren = has; } + bool HasChildren() const { return m_hasChildren; } + void SetHasChildren( bool has ){ m_hasChildren = has; } - void SetSubTreeCount( int num ) { subTreeCount = num; } - int GetSubTreeCount() { return subTreeCount; } + void SetSubTreeCount( int num ) { m_subTreeCount = num; } + int GetSubTreeCount() const { return m_subTreeCount; } void ChangeSubTreeCount( int num ) { - if( !open ) - return ; - subTreeCount += num; - if( parent ) - parent->ChangeSubTreeCount(num); + if( !m_open ) + return; + m_subTreeCount += num; + if( m_parent ) + m_parent->ChangeSubTreeCount(num); } void Resort() { - wxDataViewTreeNodes nds = nodes; - wxDataViewTreeLeaves lvs = leaves; - nodes.Empty(); - leaves.Empty(); - - int len = nds.GetCount(); - if(len > 0) - { - int i; - for(i = 0; i < len; i ++) - nodes.Add(nds[i]); - for(i = 0; i < len; i ++) - nodes[i]->Resort(); - } - - len = lvs.GetCount(); - if(len > 0) + if (g_column >= -1) { - for(int i = 0; i < len; i++) - leaves.Add(lvs[i]); + m_nodes.Sort( &wxGenericTreeModelNodeCmp ); + int len = m_nodes.GetCount(); + for (int i = 0; i < len; i ++) + m_nodes[i]->Resort(); + m_leaves.Sort( &wxGenericTreeModelItemCmp ); } } private: - wxDataViewTreeNode * parent; - wxDataViewTreeNodes nodes; - wxDataViewTreeLeaves leaves; - wxDataViewItem item; - bool open; - bool hasChildren; - int subTreeCount; + wxDataViewTreeNode *m_parent; + wxDataViewTreeNodes m_nodes; + wxDataViewTreeLeaves m_leaves; + wxDataViewItem m_item; + bool m_open; + bool m_hasChildren; + int m_subTreeCount; }; -//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; - -int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode * node1, wxDataViewTreeNode * node2) +int LINKAGEMODE wxGenericTreeModelNodeCmp( wxDataViewTreeNode ** node1, wxDataViewTreeNode ** node2) { - return g_model->Compare( node1->GetItem(), node2->GetItem() ); + return g_model->Compare( (*node1)->GetItem(), (*node2)->GetItem(), g_column, g_asending ); } -int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2) +int LINKAGEMODE wxGenericTreeModelItemCmp( void ** id1, void ** id2) { - return g_model->Compare( id1, id2 ); + return g_model->Compare( *id1, *id2, g_column, g_asending ); } @@ -405,7 +363,7 @@ int LINKAGEMODE wxGenericTreeModelItemCmp( void * id1, void * id2) WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV); WX_DECLARE_LIST(wxDataViewItem, ItemList); -WX_DEFINE_LIST(ItemList); +WX_DEFINE_LIST(ItemList) class wxDataViewMainWindow: public wxWindow { @@ -417,6 +375,8 @@ public: const wxString &name = wxT("wxdataviewctrlmainwindow") ); virtual ~wxDataViewMainWindow(); + bool IsVirtualList() const { return m_root == NULL; } + // notifications from wxDataViewModel bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ); bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ); @@ -424,7 +384,32 @@ public: bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); void Resort() - { g_model = GetOwner()->GetModel(); m_root->Resort(); UpdateDisplay(); } + { + if (!IsVirtualList()) + { + SortPrepare(); + m_root->Resort(); + } + UpdateDisplay(); + } + + void SortPrepare() + { + g_model = GetOwner()->GetModel(); + wxDataViewColumn* col = GetOwner()->GetSortingColumn(); + if( !col ) + { + if (g_model->HasDefaultCompare()) + g_column = -1; + else + g_column = -2; + + g_asending = true; + return; + } + g_column = col->GetModelColumn(); + g_asending = col->IsSortOrderAscending(); + } void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; } wxDataViewCtrl *GetOwner() { return m_owner; } @@ -444,6 +429,7 @@ public: void OnRenameTimer(); void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); + void ScrollTo( int rows, int column ); bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; } void ChangeCurrentRow( unsigned int row ); @@ -456,16 +442,18 @@ public: unsigned int GetFirstVisibleRow() const; //I change this method to un const because in the tree view, the displaying number of the tree are changing along with the expanding/collapsing of the tree nodes unsigned int GetLastVisibleRow(); - unsigned int GetRowCount() ; - - wxDataViewItem GetSelection(); + unsigned int GetRowCount(); + wxDataViewItem GetSelection() const; + wxDataViewSelection GetSelections(){ return m_selection; } + void SetSelections( const wxDataViewSelection & sel ) { m_selection = sel; UpdateDisplay(); } void Select( const wxArrayInt& aSelections ); void SelectAllRows( bool on ); void SelectRow( unsigned int row, bool on ); void SelectRows( unsigned int from, unsigned int to, bool on ); void ReverseRowSelection( unsigned int row ); bool IsRowSelected( unsigned int row ); + void SendSelectionChangedEvent( const wxDataViewItem& item); void RefreshRow( unsigned int row ); void RefreshRows( unsigned int from, unsigned int to ); @@ -477,23 +465,33 @@ public: return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT); } - //void EnsureVisible( unsigned int row ); 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 - wxDataViewItem GetItemByRow( unsigned int row ); - unsigned int GetRowByItem( const wxDataViewItem & item ); + wxDataViewItem GetItemByRow( unsigned int row ) const; + int GetRowByItem( const wxDataViewItem & item ) const; //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 ); } + bool IsExpanded( unsigned int row ) const; private: - wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ); + wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; //We did not need this temporarily //wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item ); - int RecalculateCount() ; + int RecalculateCount(); + wxDataViewEvent SendExpanderEvent( wxEventType type, const wxDataViewItem & item ); void OnExpanding( unsigned int row ); void OnCollapsing( unsigned int row ); @@ -530,6 +528,8 @@ private: //This is the tree structure of the model wxDataViewTreeNode * m_root; int m_count; + //This is the tree node under the cursor + wxDataViewTreeNode * m_underMouse; private: DECLARE_DYNAMIC_CLASS(wxDataViewMainWindow) DECLARE_EVENT_TABLE() @@ -556,7 +556,7 @@ public: virtual bool Cleared() { return m_mainWindow->Cleared(); } virtual void Resort() - { m_mainWindow->Resort(); } + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -575,6 +575,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, m_dc = NULL; m_align = align; m_mode = mode; + m_wantsAttr = false; + m_hasAttr = false; } wxDataViewRenderer::~wxDataViewRenderer() @@ -597,6 +599,29 @@ wxDC *wxDataViewRenderer::GetDC() return m_dc; } +void wxDataViewRenderer::SetAlignment( int align ) +{ + m_align=align; +} + +int wxDataViewRenderer::GetAlignment() const +{ + return m_align; +} + +int wxDataViewRenderer::CalculateAlignment() const +{ + if (m_align == wxDVR_DEFAULT_ALIGNMENT) + { + if (GetOwner() == NULL) + return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; + + return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; + } + + return m_align; +} + // --------------------------------------------------------- // wxDataViewCustomRenderer // --------------------------------------------------------- @@ -609,6 +634,16 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, { } +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 // --------------------------------------------------------- @@ -655,14 +690,7 @@ bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVarian bool wxDataViewTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - - dc->SetTextForeground(col); - dc->DrawText( m_text, cell.x, cell.y ); - + RenderText( m_text, 0, cell, dc, state ); return true; } @@ -678,6 +706,60 @@ wxSize wxDataViewTextRenderer::GetSize() const 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; +} + + // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- @@ -923,12 +1005,10 @@ bool wxDataViewDateRenderer::GetValue( wxVariant &value ) const return true; } -bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) ) +bool wxDataViewDateRenderer::Render( wxRect cell, wxDC *dc, int state ) { - dc->SetFont( GetOwner()->GetOwner()->GetFont() ); wxString tmp = m_date.FormatDate(); - dc->DrawText( tmp, cell.x, cell.y ); - + RenderText( tmp, 0, cell, dc, state ); return true; } @@ -962,834 +1042,435 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m } // --------------------------------------------------------- -// wxDataViewColumn +// wxDataViewIconTextRenderer // --------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase) +IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) -wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, - unsigned int model_column, - int width, wxAlignment align, int flags ) : - wxDataViewColumnBase( title, cell, model_column, width, align, flags ) +wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( + const wxString &varianttype, wxDataViewCellMode mode, int align ) : + wxDataViewCustomRenderer( varianttype, mode, align ) { + SetMode(mode); SetAlignment(align); - SetTitle(title); - SetFlags(flags); - - Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } -wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, - unsigned int model_column, - int width, wxAlignment align, int flags ) : - wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags ) +wxDataViewIconTextRenderer::~wxDataViewIconTextRenderer() { - SetAlignment(align); - SetFlags(flags); - - Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width); } -wxDataViewColumn::~wxDataViewColumn() +bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) { + m_value << value; + return true; } -void wxDataViewColumn::Init( int width ) +bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { - m_width = width; - m_minWidth = wxDVC_DEFAULT_MINWIDTH; - m_ascending = true; + return false; } -void wxDataViewColumn::SetResizeable( bool resizeable ) +bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - if (resizeable) - m_flags |= wxDATAVIEW_COL_RESIZABLE; - else - m_flags &= ~wxDATAVIEW_COL_RESIZABLE; -} + int xoffset = 0; + const wxIcon &icon = m_value.GetIcon(); + if (icon.IsOk()) + { + dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2)); + xoffset = icon.GetWidth()+4; + } -void wxDataViewColumn::SetHidden( bool hidden ) -{ - if (hidden) - m_flags |= wxDATAVIEW_COL_HIDDEN; - else - m_flags &= ~wxDATAVIEW_COL_HIDDEN; + RenderText( m_value.GetText(), xoffset, cell, dc, state ); - // tell our owner to e.g. update its scrollbars: - if (GetOwner()) - GetOwner()->OnColumnChange(); + return true; } -void wxDataViewColumn::SetSortable( bool sortable ) +wxSize wxDataViewIconTextRenderer::GetSize() const { - if (sortable) - m_flags |= wxDATAVIEW_COL_SORTABLE; - else - m_flags &= ~wxDATAVIEW_COL_SORTABLE; + const wxDataViewCtrl *view = GetView(); + if (!m_value.GetText().empty()) + { + int x,y; + view->GetTextExtent( m_value.GetText(), &x, &y ); - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); + if (m_value.GetIcon().IsOk()) + x += m_value.GetIcon().GetWidth() + 4; + return wxSize( x, y ); + } + return wxSize(80,20); } -void wxDataViewColumn::SetSortOrder( bool ascending ) +wxControl * +wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { - m_ascending = ascending; - - // Update header button - if (GetOwner()) - GetOwner()->OnColumnChange(); + return NULL; } -bool wxDataViewColumn::IsSortOrderAscending() const +bool +wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), + wxVariant& WXUNUSED(value)) { - return m_ascending; + return false; } -void wxDataViewColumn::SetInternalWidth( int width ) -{ - m_width = width; +//----------------------------------------------------------------------------- +// wxDataViewRenameTimer +//----------------------------------------------------------------------------- - // the scrollbars of the wxDataViewCtrl needs to be recalculated! - if (m_owner && m_owner->m_clientArea) - m_owner->m_clientArea->RecalculateDisplay(); +wxDataViewRenameTimer::wxDataViewRenameTimer( wxDataViewMainWindow *owner ) +{ + m_owner = owner; } -void wxDataViewColumn::SetWidth( int width ) +void wxDataViewRenameTimer::Notify() { - m_owner->m_headerArea->UpdateDisplay(); - - SetInternalWidth(width); + m_owner->OnRenameTimer(); } - //----------------------------------------------------------------------------- -// wxDataViewHeaderWindowBase +// wxDataViewMainWindow //----------------------------------------------------------------------------- -void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) -{ - wxWindow *parent = GetParent(); - wxDataViewEvent le(type, parent->GetId()); - - le.SetEventObject(parent); - le.SetColumn(n); - le.SetDataViewColumn(GetColumn(n)); - le.SetModel(GetOwner()->GetModel()); - - // for events created by wxDataViewHeaderWindow the - // row / value fields are not valid +//The tree building helper, declared firstly +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); - parent->GetEventHandler()->ProcessEvent(le); +int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) +{ + if (row1 > row2) return 1; + if (row1 == row2) return 0; + return -1; } -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW -// implemented in msw/listctrl.cpp: -int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); +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() -IMPLEMENT_ABSTRACT_CLASS(wxDataViewHeaderWindowMSW, wxWindow) +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 ) -bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) { - m_owner = parent; + SetOwner( parent ); - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) - return false; + m_lastOnSame = false; + m_renameTimer = new wxDataViewRenameTimer( this ); - int x = pos.x == wxDefaultCoord ? 0 : pos.x, - y = pos.y == wxDefaultCoord ? 0 : pos.y, - w = size.x == wxDefaultCoord ? 1 : size.x, - h = size.y == wxDefaultCoord ? 22 : size.y; - - // create the native WC_HEADER window: - WXHWND hwndParent = (HWND)parent->GetHandle(); - WXDWORD msStyle = WS_CHILD | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; - m_hWnd = CreateWindowEx(0, - WC_HEADER, - (LPCTSTR) NULL, - msStyle, - x, y, w, h, - (HWND)hwndParent, - (HMENU)-1, - wxGetInstance(), - (LPVOID) NULL); - if (m_hWnd == NULL) - { - wxLogLastError(_T("CreateWindowEx")); - return false; - } + // TODO: user better initial values/nothing selected + m_currentCol = NULL; + m_currentRow = 0; - // we need to subclass the m_hWnd to force wxWindow::HandleNotify - // to call wxDataViewHeaderWindow::MSWOnNotify - SubclassWin(m_hWnd); + m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 - // 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()); + m_dragCount = 0; + m_dragStart = wxPoint(0,0); + m_lineLastClicked = (unsigned int) -1; + m_lineBeforeLastClicked = (unsigned int) -1; + m_lineSelectSingleOnUp = (unsigned int) -1; - RECT rcParent; - HDLAYOUT hdl; - WINDOWPOS wp; + m_hasFocus = false; - // Retrieve the bounding rectangle of the parent window's - // client area, and then request size and position values - // from the header control. - ::GetClientRect((HWND)hwndParent, &rcParent); + SetBackgroundColour( *wxWHITE ); - hdl.prc = &rcParent; - hdl.pwpos = ℘ - if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) - { - wxLogLastError(_T("SendMessage")); - return false; - } + SetBackgroundStyle(wxBG_STYLE_CUSTOM); - // Set the size, position, and visibility of the header control. - SetWindowPos((HWND)m_hWnd, - wp.hwndInsertAfter, - wp.x, wp.y, - wp.cx, wp.cy, - wp.flags | SWP_SHOWWINDOW); + m_penRule = wxPen(GetRuleColour()); - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, wp.cy)); - SetMaxSize(wxSize(-1, wp.cy)); + //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); - return true; + //Make m_count = -1 will cause the class recaculate the real displaying number of rows. + m_count = -1; + m_underMouse = NULL; + UpdateDisplay(); } -wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() +wxDataViewMainWindow::~wxDataViewMainWindow() { - UnsubclassWin(); -} - -void wxDataViewHeaderWindowMSW::UpdateDisplay() -{ - // remove old columns - for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) - Header_DeleteItem((HWND)m_hWnd, 0); - - // add the updated array of columns to the header control - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int added = 0; - wxDataViewModel * model = GetOwner()->GetModel(); - for (unsigned int i = 0; i < cols; i++) - { - wxDataViewColumn *col = GetColumn( i ); - if (col->IsHidden()) - continue; // don't add it! - - HDITEM hdi; - hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; - hdi.pszText = (wxChar *) col->GetTitle().wx_str(); - hdi.cxy = col->GetWidth(); - hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); - hdi.fmt = HDF_LEFT | HDF_STRING; - - // lParam is reserved for application's use: - // we store there the column index to use it later in MSWOnNotify - // (since columns may have been hidden) - hdi.lParam = (LPARAM)i; - - // the native wxMSW implementation of the header window - // draws the column separator COLUMN_WIDTH_OFFSET pixels - // on the right: to correct this effect we make the column - // exactly COLUMN_WIDTH_OFFSET wider (for the first column): - if (i == 0) - hdi.cxy += COLUMN_WIDTH_OFFSET; - - switch (col->GetAlignment()) - { - case wxALIGN_LEFT: - hdi.fmt |= HDF_LEFT; - break; - case wxALIGN_CENTER: - case wxALIGN_CENTER_HORIZONTAL: - hdi.fmt |= HDF_CENTER; - break; - case wxALIGN_RIGHT: - hdi.fmt |= HDF_RIGHT; - break; - - default: - // such alignment is not allowed for the column header! - wxFAIL; - } - - SendMessage((HWND)m_hWnd, HDM_INSERTITEM, - (WPARAM)added, (LPARAM)&hdi); - added++; - } + DestroyTree(); + delete m_renameTimer; } -unsigned int wxDataViewHeaderWindowMSW::GetColumnIdxFromHeader(NMHEADER *nmHDR) +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - 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) - { - idx = (unsigned int)nmHDR->pitem->lParam; - return idx; - } + wxDataViewModel *model = GetOwner()->GetModel(); + wxAutoBufferedPaintDC dc( this ); - HDITEM item; - item.mask = HDI_LPARAM; - Header_GetItem((HWND)m_hWnd, nmHDR->iItem, &item); +#ifdef __WXMSW__ + dc.SetPen( *wxTRANSPARENT_PEN ); + dc.SetBrush( wxBrush( GetBackgroundColour()) ); + dc.SetBrush( *wxWHITE_BRUSH ); + wxSize size( GetClientSize() ); + dc.DrawRectangle( 0,0,size.x,size.y ); +#endif - return (unsigned int)item.lParam; -} + // prepare the DC + GetOwner()->PrepareDC( dc ); + dc.SetFont( GetFont() ); -bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) -{ - NMHDR *nmhdr = (NMHDR *)lParam; + wxRect update = GetUpdateRegion().GetBox(); + m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - // is it a message from the header? - if ( nmhdr->hwndFrom != (HWND)m_hWnd ) - return wxWindow::MSWOnNotify(idCtrl, lParam, result); + // compute which items needs to be redrawn + unsigned int item_start = GetLineAt( wxMax(0,update.y) ); + unsigned int item_count = + wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), + (int)(GetRowCount( ) - item_start)); + unsigned int item_last = item_start + item_count; - NMHEADER *nmHDR = (NMHEADER *)nmhdr; - switch ( nmhdr->code ) + // compute which columns needs to be redrawn + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col_start = 0; + unsigned int x_start; + for (x_start = 0; col_start < cols; col_start++) { - 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 - 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 - case HDN_ENDDRAG: // user has finished reordering 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 && model->GetSortingColumn() == idx) - { - bool order = col->IsSortOrderAscending(); - col->SetSortOrder(!order); - model->SetSortOrderAscending(!order); - } - else if(model) - { - model->SetSortingColumn(idx); - model->SetSortOrderAscending(true); - } - } - UpdateDisplay(); - if(model) - model->Resort(); - } + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_start); + if (col->IsHidden()) + continue; // skip it! - wxEventType evt = nmHDR->iButton == 0 ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, idx); - } + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)update.x) 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 - - 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; + x_start += w; + } - case HDN_GETDISPINFOW: - // see wxListCtrl::MSWOnNotify for more info! - break; + unsigned int col_last = col_start; + unsigned int x_last = x_start; + for (; col_last < cols; col_last++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(col_last); + if (col->IsHidden()) + continue; // skip it! - 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); - } + if (x_last > (unsigned int)update.GetRight()) break; - default: - return wxWindow::MSWOnNotify(idCtrl, lParam, result); + x_last += col->GetWidth(); } - return true; -} - -void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), - const wxRect *WXUNUSED(rect)) -{ - wxSize ourSz = GetClientSize(); - wxSize ownerSz = m_owner->GetClientSize(); - - // where should the (logical) origin of this window be placed? - int x1 = 0, y1 = 0; - m_owner->CalcUnscrolledPosition(0, 0, &x1, &y1); - - // put this window on top of our parent and - SetWindowPos((HWND)m_hWnd, HWND_TOP, -x1, 0, - ownerSz.GetWidth() + x1, ourSz.GetHeight(), - SWP_SHOWWINDOW); -} - -void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(w), int WXUNUSED(h), - int WXUNUSED(f)) -{ - // the wxDataViewCtrl's internal wxBoxSizer will call this function when - // the wxDataViewCtrl window gets resized: the following dummy call - // to ScrollWindow() is required in order to get this header window - // correctly repainted when it's (horizontally) scrolled: - - ScrollWindow(0, 0); -} - -#else // !defined(__WXMSW__) - -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() - -bool wxGenericDataViewHeaderWindow::Create(wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, - const wxString &name ) -{ - m_owner = parent; - - if (!wxDataViewHeaderWindowBase::Create(parent, id, pos, size, name)) - return false; - - wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); - SetOwnForegroundColour( attr.colFg ); - SetOwnBackgroundColour( attr.colBg ); - if (!m_hasFont) - SetOwnFont( attr.font ); - - // set our size hints: wxDataViewCtrl will put this wxWindow inside - // a wxBoxSizer and in order to avoid super-big header windows, - // we need to set our height as fixed - SetMinSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); - SetMaxSize(wxSize(-1, HEADER_WINDOW_HEIGHT)); - - return true; -} - -void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - int w, h; - GetClientSize( &w, &h ); + // Draw horizontal rules if required + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); - wxAutoBufferedPaintDC dc( this ); + for (unsigned int i = item_start; i <= item_last+1; i++) + { + int y = GetLineStart( i ); + dc.DrawLine(x_start, y, x_last, y); + } + } - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); + // Draw vertical rules if required + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); - int xpix; - m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); + int x = x_start; + for (unsigned int i = col_start; i < col_last; i++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(i); + if (col->IsHidden()) + continue; // skip it - int x; - m_owner->GetViewStart( &x, NULL ); + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); - // account for the horz scrollbar offset - dc.SetDeviceOrigin( -x * xpix, 0 ); + x += col->GetWidth(); + } - dc.SetFont( GetFont() ); + // Draw last vertical rule + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); + } - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int i; - int xpos = 0; - for (i = 0; i < cols; i++) + // redraw the background for the items which are selected/current + for (unsigned int item = item_start; item < item_last; item++) { - 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()) + bool selected = m_selection.Index( item ) != wxNOT_FOUND; + if (selected || item == m_currentRow) { - if (col->IsSortOrderAscending()) - sortArrow = wxHDR_SORT_ICON_UP; - else - sortArrow = wxHDR_SORT_ICON_DOWN; - } + int flags = selected ? (int)wxCONTROL_SELECTED : 0; + if (item == m_currentRow) + flags |= wxCONTROL_CURRENT; + if (m_hasFocus) + flags |= wxCONTROL_FOCUSED; - wxRendererNative::Get().DrawHeaderButton + wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) ); + wxRendererNative::Get().DrawItemSelectionRect ( this, dc, - wxRect(xpos, 0, cw, ch-1), - m_parent->IsEnabled() ? 0 - : (int)wxCONTROL_DISABLED, - sortArrow + rect, + flags ); - - // align as required the column title: - int x = xpos; - wxSize titleSz = dc.GetTextExtent(col->GetTitle()); - switch (col->GetAlignment()) - { - case wxALIGN_LEFT: - x += HEADER_HORIZ_BORDER; - break; - case wxALIGN_CENTER: - case wxALIGN_CENTER_HORIZONTAL: - x += (cw - titleSz.GetWidth() - 2 * HEADER_HORIZ_BORDER)/2; - break; - case wxALIGN_RIGHT: - x += cw - titleSz.GetWidth() - HEADER_HORIZ_BORDER; - break; } - - // always center the title vertically: - int y = wxMax((ch - titleSz.GetHeight()) / 2, HEADER_VERT_BORDER); - - 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(); - - xpos += cw; } -} - -void wxGenericDataViewHeaderWindow::OnSetFocus( wxFocusEvent &event ) -{ - GetParent()->SetFocus(); - event.Skip(); -} -void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) -{ - // we want to work with logical coords - int x; - m_owner->CalcUnscrolledPosition(event.GetX(), 0, &x, NULL); - int y = event.GetY(); - - if (m_isDragging) + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) { - // we don't draw the line beyond our window, - // but we allow dragging it there - int w = 0; - GetClientSize( &w, NULL ); - m_owner->CalcUnscrolledPosition(w, 0, &w, NULL); - w -= 6; - - // erase the line if it was drawn - if (m_currentX < w) - DrawCurrent(); - - if (event.ButtonUp()) - { - m_isDragging = false; - if (HasCapture()) - ReleaseMouse(); - - m_dirty = true; - - GetColumn(m_column)->SetWidth(m_currentX - m_minX); - - Refresh(); - GetOwner()->Refresh(); - } - else - { - m_currentX = wxMax(m_minX + 7, x); - - // draw in the new location - if (m_currentX < w) DrawCurrent(); - } - + // TODO-RTL: last column for RTL support + expander = GetOwner()->GetColumnAt( 0 ); + GetOwner()->SetExpanderColumn(expander); } - else // not dragging + + // 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++) { - m_minX = 0; - m_column = wxNOT_FOUND; - bool hit_border = false; + wxDataViewColumn *col = GetOwner()->GetColumnAt( i ); + wxDataViewRenderer *cell = col->GetRenderer(); + cell_rect.width = col->GetWidth(); - // end of the current column - int xpos = 0; + if (col->IsHidden()) + continue; // skip it! - // find the column where this event occured - int countCol = m_owner->GetColumnCount(); - for (int column = 0; column < countCol; column++) + for (unsigned int item = item_start; item < item_last; item++) { - wxDataViewColumn *p = GetColumn(column); - - if (p->IsHidden()) - continue; // skip if not shown - - xpos += p->GetWidth(); - m_column = column; - if ((abs(x-xpos) < 3) && (y < 22)) - { - hit_border = true; - break; - } + // get the cell value and set it into the renderer + wxVariant value; + wxDataViewTreeNode *node = NULL; + wxDataViewItem dataitem; - if (x < xpos) + if (!IsVirtualList()) { - // inside the column - break; - } - - m_minX = xpos; - } + node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; - if (m_column == wxNOT_FOUND) - return; + dataitem = node->GetItem(); - 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; - DrawCurrent(); + if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + continue; } - else // click on a column + else { - wxEventType evt = event.LeftDown() ? - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK : - wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK; - SendEvent(evt, m_column); + dataitem = wxDataViewItem( wxUIntToPtr(item) ); } - } - else if (event.Moving()) - { - if (hit_border && resizeable) - m_currentCursor = m_resizeCursor; - else - m_currentCursor = wxSTANDARD_CURSOR; - - SetCursor(*m_currentCursor); - } - } -} - -void wxGenericDataViewHeaderWindow::DrawCurrent() -{ - int x1 = m_currentX; - int y1 = 0; - ClientToScreen (&x1, &y1); - - int x2 = m_currentX-1; -#ifdef __WXMSW__ - ++x2; // but why ???? -#endif - int y2 = 0; - m_owner->GetClientSize( NULL, &y2 ); - m_owner->ClientToScreen( &x2, &y2 ); - - wxScreenDC dc; - dc.SetLogicalFunction(wxINVERT); - dc.SetPen(m_penCurrent); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - AdjustDC(dc); - dc.DrawLine(x1, y1, x2, y2); -} - -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; -} - -void wxDataViewRenameTimer::Notify() -{ - m_owner->OnRenameTimer(); -} - -//----------------------------------------------------------------------------- -// wxDataViewMainWindow -//----------------------------------------------------------------------------- - -//The tree building helper, declared firstly -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) + model->GetValue( value, dataitem, col->GetModelColumn()); + cell->SetValue( value ); -BEGIN_EVENT_TABLE(wxDataViewMainWindow,wxWindow) - EVT_PAINT (wxDataViewMainWindow::OnPaint) - EVT_MOUSE_EVENTS (wxDataViewMainWindow::OnMouse) - EVT_SET_FOCUS (wxDataViewMainWindow::OnSetFocus) - EVT_KILL_FOCUS (wxDataViewMainWindow::OnKillFocus) - EVT_CHAR (wxDataViewMainWindow::OnChar) -END_EVENT_TABLE() + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } -wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ), - m_selection( wxDataViewSelectionCmp ) + // update cell_rect + cell_rect.y = GetLineStart( item ); + cell_rect.height = GetLineHeight( item ); // -1 is for the horizontal rules (?) -{ - SetOwner( parent ); + //Draw the expander here. + int indent = 0; + if ((!IsVirtualList()) && (col == expander)) + { + indent = node->GetIndentLevel(); - m_lastOnSame = false; - m_renameTimer = new wxDataViewRenameTimer( this ); + //Calculate the indent first + indent = cell_rect.x + GetOwner()->GetIndent() * indent; - // TODO: user better initial values/nothing selected - m_currentCol = NULL; - m_currentRow = 0; + int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; + // change the cell_rect.x to the appropriate pos + int expander_x = indent + EXPANDER_MARGIN; + int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2) - (expander_width/2) - EXPANDER_OFFSET; + indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space + dc.SetPen( m_penExpander ); + dc.SetBrush( wxNullBrush ); + if( node->HasChildren() ) + { + wxRect rect( expander_x , expander_y, expander_width, expander_width); + int flag = 0; + if (m_underMouse == node) + { + flag |= wxCONTROL_CURRENT; + } + if( node->IsOpen() ) + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED ); + else + wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); + } + //force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + } + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } - // TODO: we need to calculate this smartly - m_lineHeight = -#ifdef __WXMSW__ - 17; -#else - 20; -#endif - wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM); + // 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; - m_dragCount = 0; - m_dragStart = wxPoint(0,0); - m_lineLastClicked = (unsigned int) -1; - m_lineBeforeLastClicked = (unsigned int) -1; - m_lineSelectSingleOnUp = (unsigned int) -1; + wxRect item_rect(cell_rect.GetTopLeft(), size); + int align = cell->CalculateAlignment(); - m_hasFocus = false; + // 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 - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); - SetBackgroundColour( *wxWHITE ); + // 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 - m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; - //Here I compose a pen can draw black lines, maybe there are something system colour to use - m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID ); - //Some new added code to deal with the tree structure - m_root = new wxDataViewTreeNode( NULL ); - m_root->SetHasChildren(true); + //Here we add the tree indent + item_rect.x += indent; - //Make m_count = -1 will cause the class recaculate the real displaying number of rows. - m_count = -1 ; - UpdateDisplay(); -} + int state = 0; + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + state |= wxDATAVIEW_CELL_SELECTED; -wxDataViewMainWindow::~wxDataViewMainWindow() -{ - DestroyTree(); - delete m_renameTimer; + // TODO: it would be much more efficient to create a clipping + // region for the entire column being rendered (in the OnPaint + // of wxDataViewMainWindow) instead of a single clip region for + // each cell. However it would mean that each renderer should + // respect the given wxRect's top & bottom coords, eventually + // violating only the left & right coords - however the user can + // make its own renderer and thus we cannot be sure of that. + dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, state ); + dc.DestroyClippingRegion(); + } + + cell_rect.x += cell_rect.width; + } } void wxDataViewMainWindow::OnRenameTimer() @@ -1804,7 +1485,7 @@ void wxDataViewMainWindow::OnRenameTimer() 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! @@ -1812,14 +1493,17 @@ void wxDataViewMainWindow::OnRenameTimer() break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, - m_currentCol->GetWidth(), m_lineHeight ); + 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 ); + } //------------------------------------------------------------------ @@ -1828,58 +1512,42 @@ void wxDataViewMainWindow::OnRenameTimer() class DoJob { public: - DoJob(){}; - virtual ~DoJob(){}; + 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() ( wxDataViewTreeNode * node ) = 0; virtual int operator() ( void * n ) = 0; }; -#if 0 -class ItemAddJob: public DoJob +bool Walker( wxDataViewTreeNode * node, DoJob & func ) { -public: - ItemAddJob( const wxDataViewItem & parent, const wxDataViewItem & item, int * count ) - { this->parent = parent ; this->item = item ; m_count = count; } - virtual ~ItemAddJob(){}; + if( node==NULL ) + return false; - virtual int operator() ( wxDataViewTreeNode * node ) + switch( func( node ) ) { - if( node->GetItem() == parent ) - { - node->SetHasChildren( true ); - wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); - newnode->SetItem(item); - node->AppendChild( newnode); - *m_count = -1; - return OK; - } - return CONT; + case DoJob::OK : + return true; + case DoJob::IGR: + return false; + case DoJob::CONT: + default: + ; } -private: - int * m_count; - wxDataViewItem parent, item; -}; -#endif - -bool Walker( wxDataViewTreeNode * node, DoJob & func ) -{ - if( node==NULL || !node->HasChildren()) - return false; - 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 ++ ) + + for(; i < len; i ++ ) { void * n = leaves[i]; if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) @@ -1887,17 +1555,6 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) wxDataViewTreeNode * nd = nodes[nodes_i]; nodes_i++; - switch( func( nd ) ) - { - case DoJob::OK : - return true ; - case DoJob::IGR: - continue; - case DoJob::CONT: - default: - ; - } - if( Walker( nd , func ) ) return true; @@ -1906,12 +1563,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) switch( func( n ) ) { case DoJob::OK : - return true ; + return true; case DoJob::IGR: continue; case DoJob::CONT: default: - ; + ; } } return false; @@ -1919,7 +1576,14 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { - g_model = GetOwner()->GetModel(); + if (!m_root) + { + m_count++; + UpdateDisplay(); + return true; + } + + SortPrepare(); wxDataViewTreeNode * node; node = FindNode(parent); @@ -1933,6 +1597,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData { wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node ); newnode->SetItem(item); + newnode->SetHasChildren( true ); node->AddNode( newnode); } else @@ -1942,56 +1607,56 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData m_count = -1; UpdateDisplay(); + return true; } -#if 0 -class ItemDeleteJob: public DoJob -{ -public: - ItemDeleteJob( const wxDataViewItem & item, int * count ) { m_item = item; m_count = count; } - virtual ~ItemDeleteJob(){} - virtual int operator() ( wxDataViewTreeNode * node ) - { - if( node->GetItem() == m_item ) - { - node->GetParent()->GetChildren().Remove( node ); - delete node; - *m_count = -1; - return DoJob::OK; - } - return DoJob::CONT; - } - -private: - int * m_count; - wxDataViewItem m_item; -}; -#endif - -void DestroyTreeHelper( wxDataViewTreeNode * node); +static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { - g_model = GetOwner()->GetModel(); + if (!m_root) + { + m_count--; + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; - wxDataViewTreeNode * node; - node = FindNode(parent); + m_selection.Empty(); - if( node == NULL || node->GetChildren().Index( item.GetID() ) == wxNOT_FOUND ) - { - return false; + UpdateDisplay(); + + return true; } + wxDataViewTreeNode * node = FindNode(parent); + + wxCHECK_MSG( node != NULL, false, "item not found" ); + wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" ); + int sub = -1; node->GetChildren().Remove( item.GetID() ); - if( GetOwner()->GetModel()->IsContainer( item ) ) + //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( isContainer ) { wxDataViewTreeNode * n = NULL; wxDataViewTreeNodes nodes = node->GetNodes(); int len = nodes.GetCount(); - for( int i = 0 ; i < len; i ++) + for( int i = 0; i < len; i ++) { if( nodes[i]->GetItem() == item ) { @@ -2000,38 +1665,42 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, } } - if (!n) - return false; + wxCHECK_MSG( n != NULL, false, "item not found" ); node->GetNodes().Remove( n ); sub -= n->GetSubTreeCount(); - DestroyTreeHelper(n); + ::DestroyTreeHelper(n); } - - if( node->GetChildrenNumber() == 0) - node->SetHasChildren( false ); - //Make the row number invalid and get a new valid one when user call GetRowCount m_count = -1; node->ChangeSubTreeCount(sub); + //Change the current row to the last row if the current exceed the max row number if( m_currentRow > GetRowCount() ) m_currentRow = m_count - 1; UpdateDisplay(); + return true; } bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) { - g_model = GetOwner()->GetModel(); + SortPrepare(); + g_model->Resort(); + + //Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + parent->GetEventHandler()->ProcessEvent(le); - unsigned int row = GetRowByItem(item); - RefreshRow( row ); return true; } -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int WXUNUSED(col) ) +bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) { // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 /*#define MAX_VIRTUAL_WIDTH 100000 @@ -2042,293 +1711,111 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i return true; */ - g_model = GetOwner()->GetModel(); + SortPrepare(); + g_model->Resort(); + + //Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + le.SetColumn(col); + le.SetDataViewColumn(GetOwner()->GetColumn(col)); + parent->GetEventHandler()->ProcessEvent(le); - unsigned int row = GetRowByItem(item); - RefreshRow( row ); return true; } bool wxDataViewMainWindow::Cleared() { - g_model = GetOwner()->GetModel(); - DestroyTree(); - UpdateDisplay(); - return true; -} - -void wxDataViewMainWindow::UpdateDisplay() -{ - m_dirty = true; -} - -void wxDataViewMainWindow::OnInternalIdle() -{ - wxWindow::OnInternalIdle(); - - if (m_dirty) - { - RecalculateDisplay(); - m_dirty = false; - } -} - -void wxDataViewMainWindow::RecalculateDisplay() -{ - wxDataViewModel *model = GetOwner()->GetModel(); - if (!model) - { - Refresh(); - return; - } - - int width = GetEndOfLastCol(); - int height = GetRowCount() * m_lineHeight; - - SetVirtualSize( width, height ); - GetOwner()->SetScrollRate( 10, m_lineHeight ); - - Refresh(); -} - -void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) -{ - wxWindow::ScrollWindow( dx, dy, rect ); - - if (GetOwner()->m_headerArea) - GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); -} - -void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxDataViewModel *model = GetOwner()->GetModel(); - wxAutoBufferedPaintDC dc( this ); - - // prepare the DC - dc.SetBackground(GetBackgroundColour()); - dc.Clear(); - GetOwner()->PrepareDC( dc ); - dc.SetFont( GetFont() ); - - wxRect update = GetUpdateRegion().GetBox(); - m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y ); - - // compute which items needs to be redrawn - unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) ); - unsigned int item_count = - wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), - (int)(GetRowCount( )- item_start) ); - unsigned int item_last = item_start + item_count; - - // compute which columns needs to be redrawn - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col_start = 0; - unsigned int x_start = 0; - for (x_start = 0; col_start < cols; col_start++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_start); - if (col->IsHidden()) - continue; // skip it! - - unsigned int w = col->GetWidth(); - if (x_start+w >= (unsigned int)update.x) - break; - - x_start += w; - } - - unsigned int col_last = col_start; - unsigned int x_last = x_start; - for (; col_last < cols; col_last++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(col_last); - if (col->IsHidden()) - continue; // skip it! - - if (x_last > (unsigned int)update.GetRight()) - break; - - x_last += col->GetWidth(); - } - - // Draw horizontal rules if required - if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - for (unsigned int i = item_start; i <= item_last+1; i++) - { - int y = i * m_lineHeight; - dc.DrawLine(x_start, y, x_last, y); - } - } - - // Draw vertical rules if required - if ( m_owner->HasFlag(wxDV_VERT_RULES) ) - { - dc.SetPen(m_penRule); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - - int x = x_start; - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(i); - if (col->IsHidden()) - continue; // skip it - - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - - x += col->GetWidth(); - } - - // Draw last vertical rule - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); - } - - // redraw the background for the items which are selected/current - for (unsigned int item = item_start; item < item_last; item++) - { - bool selected = m_selection.Index( item ) != wxNOT_FOUND; - if (selected || item == m_currentRow) - { - int flags = selected ? (int)wxCONTROL_SELECTED : 0; - if (item == m_currentRow) - flags |= wxCONTROL_CURRENT; - if (m_hasFocus) - flags |= wxCONTROL_FOCUSED; - - wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); - wxRendererNative::Get().DrawItemSelectionRect - ( - this, - dc, - rect, - flags - ); - } - } - - // redraw all cells for all rows which must be repainted and for all columns - wxRect cell_rect; - cell_rect.x = x_start; - cell_rect.height = m_lineHeight; // -1 is for the horizontal rules - for (unsigned int i = col_start; i < col_last; i++) - { - wxDataViewColumn *col = GetOwner()->GetColumn( i ); - wxDataViewRenderer *cell = col->GetRenderer(); - cell_rect.width = col->GetWidth(); - - if (col->IsHidden()) - continue; // skipt it! - for (unsigned int item = item_start; item < item_last; item++) - { - // get the cell value and set it into the renderer - wxVariant value; - wxDataViewTreeNode * node = GetTreeNodeByRow(item); - if( node == NULL ) - { - continue; - } - - wxDataViewItem dataitem = node->GetItem(); - model->GetValue( value, dataitem, col->GetModelColumn()); - cell->SetValue( value ); - - // update the y offset - cell_rect.y = item * m_lineHeight; + SortPrepare(); + BuildTree( GetOwner()->GetModel() ); - //Draw the expander here. - int indent = node->GetIndentLevel(); - if( col->GetModelColumn() == GetOwner()->GetExpanderColumn() ) - { - //Calculate the indent first - indent = cell_rect.x + GetOwner()->GetIndent() * indent; + UpdateDisplay(); - int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; - // change the cell_rect.x to the appropriate pos - int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ; - indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space - dc.SetPen( m_penExpander ); - dc.SetBrush( wxNullBrush ); - if( node->HasChildren() ) - { - //dc.DrawRoundedRectangle( expander_x,expander_y,expander_width,expander_width, 1.0); - //dc.DrawLine( expander_x + 2 , expander_y + expander_width/2, expander_x + expander_width - 2, expander_y + expander_width/2 ); - wxRect rect( expander_x , expander_y, expander_width, expander_width); - if( node->IsOpen() ) - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, wxCONTROL_EXPANDED ); - else - wxRendererNative::Get().DrawTreeItemButton( this, dc, rect ); - } - else - { - // I am wandering whether we should draw dot lines between tree nodes - delete node; - //Yes, if the node does not have any child, it must be a leaf which mean that it is a temporarily created by GetTreeNodeByRow - } + return true; +} - //force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); - } +void wxDataViewMainWindow::UpdateDisplay() +{ + m_dirty = true; +} +void wxDataViewMainWindow::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); - // cannot be bigger than allocated space - wxSize size = cell->GetSize(); - // Because of the tree structure indent, here we should minus the width of the cell for drawing - size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); - size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height ); + if (m_dirty) + { + RecalculateDisplay(); + m_dirty = false; + } +} - wxRect item_rect(cell_rect.GetTopLeft(), size); - int align = cell->GetAlignment(); +void wxDataViewMainWindow::RecalculateDisplay() +{ + wxDataViewModel *model = GetOwner()->GetModel(); + if (!model) + { + Refresh(); + return; + } - // 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 + int width = GetEndOfLastCol(); + int height = GetLineStart( GetRowCount() ); - // 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 + SetVirtualSize( width, height ); + GetOwner()->SetScrollRate( 10, m_lineHeight ); - // add padding - item_rect.x += PADDING_RIGHTLEFT; - item_rect.y += PADDING_TOPBOTTOM; - item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; - item_rect.height = size.y - 2 * PADDING_TOPBOTTOM; + Refresh(); +} - //Here we add the tree indent - item_rect.x += indent; +void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect ) +{ + wxWindow::ScrollWindow( dx, dy, rect ); - int state = 0; - if (m_selection.Index(item) != wxNOT_FOUND) - state |= wxDATAVIEW_CELL_SELECTED; + if (GetOwner()->m_headerArea) + GetOwner()->m_headerArea->ScrollWindow( dx, 0 ); +} - // TODO: it would be much more efficient to create a clipping - // region for the entire column being rendered (in the OnPaint - // of wxDataViewMainWindow) instead of a single clip region for - // each cell. However it would mean that each renderer should - // respect the given wxRect's top & bottom coords, eventually - // violating only the left & right coords - however the user can - // make its own renderer and thus we cannot be sure of that. - dc.SetClippingRegion( item_rect ); - cell->Render( item_rect, &dc, state ); - dc.DestroyClippingRegion(); +void wxDataViewMainWindow::ScrollTo( int rows, int column ) +{ + int x, y; + m_owner->GetScrollPixelsPerUnit( &x, &y ); + int sy = GetLineStart( rows )/y; + int sx = 0; + if( column != -1 ) + { + wxRect rect = GetClientRect(); + int colnum = 0; + int x_start, w = 0; + int xx, yy, xe; + m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); + for (x_start = 0; colnum < column; colnum++) + { + wxDataViewColumn *col = GetOwner()->GetColumnAt(colnum); + if (col->IsHidden()) + continue; // skip it! + + w = col->GetWidth(); + x_start += w; } - cell_rect.x += cell_rect.width; + int x_end = x_start + w; + xe = xx + rect.width; + if( x_end > xe ) + { + sx = ( xx + x_end - xe )/x; + } + if( x_start < xx ) + { + sx = x_start/x; + } } + m_owner->Scroll( sx, sy ); } int wxDataViewMainWindow::GetCountPerPage() const @@ -2344,7 +1831,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(); @@ -2358,7 +1845,7 @@ unsigned int wxDataViewMainWindow::GetFirstVisibleRow() const int y = 0; m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - return y / m_lineHeight; + return GetLineAt( y ); } unsigned int wxDataViewMainWindow::GetLastVisibleRow() @@ -2367,7 +1854,10 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y ); - return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 ); + //we should deal with the pixel here + unsigned int row = GetLineAt(client_size.y) - 1; + + return wxMin( GetRowCount()-1, row ); } unsigned int wxDataViewMainWindow::GetRowCount() @@ -2375,11 +1865,7 @@ unsigned int wxDataViewMainWindow::GetRowCount() if ( m_count == -1 ) { m_count = RecalculateCount(); - int width, height; - GetVirtualSize( &width, &height ); - height = m_count * m_lineHeight; - - SetVirtualSize( width, height ); + UpdateDisplay(); } return m_count; } @@ -2489,9 +1975,21 @@ bool wxDataViewMainWindow::IsRowSelected( unsigned int row ) return (m_selection.Index( row ) != wxNOT_FOUND); } +void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item) +{ + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, parent->GetId()); + + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); + + parent->GetEventHandler()->ProcessEvent(le); +} + void wxDataViewMainWindow::RefreshRow( unsigned int row ) { - wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight ); + wxRect rect( 0, GetLineStart( row ), GetEndOfLastCol(), GetLineHeight( row ) ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); wxSize client_size = GetClientSize(); @@ -2510,7 +2008,7 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) from = tmp; } - wxRect rect( 0, from*m_lineHeight, GetEndOfLastCol(), (to-from+1) * m_lineHeight ); + wxRect rect( 0, GetLineStart( from ), GetEndOfLastCol(), GetLineStart( (to-from+1) ) ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); wxSize client_size = GetClientSize(); @@ -2522,18 +2020,14 @@ void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to ) void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) { - unsigned int count = GetRowCount(); - if (firstRow > count) - return; + wxSize client_size = GetClientSize(); + int start = GetLineStart( firstRow ); + m_owner->CalcScrolledPosition( start, 0, &start, NULL ); + if (start > client_size.y) return; - wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + wxRect rect( 0, start, client_size.x, client_size.y - start ); - wxSize client_size = GetClientSize(); - wxRect client_rect( 0, 0, client_size.x, client_size.y ); - wxRect intersect_rect = client_rect.Intersect( rect ); - if (intersect_rect.width > 0) - Refresh( true, &intersect_rect ); + Refresh( true, &rect ); } void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) @@ -2563,6 +2057,8 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent } SelectRows( oldCurrent, newCurrent, true ); + if (oldCurrent!=newCurrent) + SendSelectionChangedEvent(GetItemByRow(m_selection[0])); } else // !shift { @@ -2575,37 +2071,204 @@ void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent ChangeCurrentRow( newCurrent ); if ( !event.ControlDown() ) + { SelectRow( m_currentRow, true ); + SendSelectionChangedEvent(GetItemByRow(m_currentRow)); + } else RefreshRow( m_currentRow ); } - //EnsureVisible( m_currentRow ); + GetOwner()->EnsureVisible( m_currentRow, -1 ); } wxRect wxDataViewMainWindow::GetLineRect( unsigned int row ) const { wxRect rect; rect.x = 0; - rect.y = m_lineHeight * row; + rect.y = GetLineStart( row ); rect.width = GetEndOfLastCol(); - rect.height = m_lineHeight; + rect.height = GetLineHeight( row ); return rect; } +int wxDataViewMainWindow::GetLineStart( unsigned int row ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + // TODO make more efficient + + int start = 0; + + unsigned int r; + for (r = 0; r < row; r++) + { + const wxDataViewTreeNode* node = GetTreeNodeByRow(r); + if (!node) return start; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! + + 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 ); + } + + + start += height; + } + + return start; + } + else + { + return row * m_lineHeight; + } +} + +int wxDataViewMainWindow::GetLineAt( unsigned int y ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + // check for the easy case first + if ( !GetOwner()->HasFlag(wxDV_VARIABLE_LINE_HEIGHT) ) + return y / m_lineHeight; + + // TODO make more efficient + unsigned int row = 0; + unsigned int yy = 0; + for (;;) + { + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) + { + // not really correct... + return row + ((y-yy) / m_lineHeight); + } + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + int height = m_lineHeight; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! + + 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++; + } +} + +int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const +{ + const wxDataViewModel *model = GetOwner()->GetModel(); + + if (GetOwner()->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) + { + wxASSERT( !IsVirtualList() ); + + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + // wxASSERT( node ); + if (!node) return m_lineHeight; + + wxDataViewItem item = node->GetItem(); + + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } + + int height = m_lineHeight; + + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) + { + const wxDataViewColumn *column = GetOwner()->GetColumn(col); + if (column->IsHidden()) + continue; // skip it! + + if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item)) + continue; // skip it! + + 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 ); + } + + return height; + } + else + { + return m_lineHeight; + } +} + class RowToItemJob: public DoJob { public: - RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current ;} - virtual ~RowToItemJob(){}; + 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() ; + { + ret = node->GetItem(); return DoJob::OK; } @@ -2615,15 +2278,25 @@ public: 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 ) ; + { + ret = wxDataViewItem( n ); return DoJob::OK; } return DoJob::CONT; @@ -2631,15 +2304,22 @@ public: wxDataViewItem GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewItem ret; }; -wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) +wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const { - RowToItemJob job( row, -1 ); - Walker( m_root , job ); - return job.GetResult(); + if (!m_root) + { + return wxDataViewItem( wxUIntToPtr(row) ); + } + else + { + RowToItemJob job( row, -2 ); + Walker( m_root , job ); + return job.GetResult(); + } } class RowToTreeNodeJob: public DoJob @@ -2648,18 +2328,18 @@ 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 ~RowToTreeNodeJob(){ } virtual int operator() ( wxDataViewTreeNode * node ) { current ++; if( current == static_cast(row)) - { - ret = node ; + { + ret = node; return DoJob::OK; } @@ -2671,17 +2351,29 @@ public: 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) + { + int index = static_cast(row) - current - 1; + void * n = node->GetChildren().Item( index ); + ret = new wxDataViewTreeNode( parent ); + ret->SetItem( wxDataViewItem( n )); + ret->SetHasChildren(false); + return DoJob::OK; + } return DoJob::CONT; } + } virtual int operator() ( void * n ) { current ++; if( current == static_cast(row)) - { - ret = new wxDataViewTreeNode( parent ) ; + { + ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); return DoJob::OK; @@ -2692,65 +2384,91 @@ public: wxDataViewTreeNode * GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewTreeNode * ret; - wxDataViewTreeNode * parent ; + wxDataViewTreeNode * parent; }; -wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) +wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) const { - RowToTreeNodeJob job( row , -1, m_root ); + wxASSERT( !IsVirtualList() ); + + RowToTreeNodeJob job( row , -2, m_root ); Walker( m_root , job ); return job.GetResult(); } -#if 0 -class CountJob : public DoJob +wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item ) { -public: - CountJob(){ count = 0 ; } - virtual ~CountJob(){}; + wxWindow *parent = GetParent(); + wxDataViewEvent le(type, parent->GetId()); - virtual int operator () ( wxDataViewTreeNode * node ) - { - count ++; - if ( node->IsOpen()) - return DoJob::CONT; - else - return DoJob::IGR; - } + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem( item ); - unsigned int GetResult() + parent->GetEventHandler()->ProcessEvent(le); + return le; +} + + +bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const +{ + if (IsVirtualList()) + return false; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return false; + + if (!node->HasChildren()) { - return count ; + delete node; + return false; } -private: - unsigned int count; -}; -#endif + + return node->IsOpen(); +} + void wxDataViewMainWindow::OnExpanding( unsigned int row ) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { if( node->HasChildren()) + { if( !node->IsOpen()) { + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); + //Check if the user prevent expanding + if( e.GetSkipped() ) + return; + node->ToggleOpen(); //Here I build the children of current node if( node->GetChildrenNumber() == 0 ) - BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + { + 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)); } + } else delete node; } @@ -2758,6 +2476,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) void wxDataViewMainWindow::OnCollapsing(unsigned int row) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { @@ -2765,24 +2486,31 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row) if( node->HasChildren() && node->IsOpen() ) { + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); + if( e.GetSkipped() ) + return; node->ToggleOpen(); m_count = -1; UpdateDisplay(); - //RefreshRows(row,GetLastVisibleRow()); - } - else - { - node = node->GetParent(); - if( node != NULL ) - { - int parent = GetRowByItem( node->GetItem()) ; - SelectRow( row, false); - SelectRow(parent , true ); - ChangeCurrentRow( parent ); - } - } - if( !nd->HasChildren()) - delete nd; + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem()); + } + else + { + node = node->GetParent(); + if( node != NULL ) + { + int parent = GetRowByItem( node->GetItem() ); + if( parent >= 0 ) + { + SelectRow( row, false); + SelectRow(parent , true ); + ChangeCurrentRow( parent ); + SendSelectionChangedEvent( node->GetItem() ); + } + } + } + if( !nd->HasChildren()) + delete nd; } } @@ -2805,51 +2533,113 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item //Find the item along the parent-chain. //This algorithm is designed to speed up the node-finding method - bool found = true; wxDataViewTreeNode * node = m_root; - for( ItemList::Node * n = list.GetFirst(); n; n = n->GetNext() ) + for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ ) { if( node->HasChildren() ) { if( node->GetChildrenNumber() == 0 ) - BuildTreeHelper(model, node->GetItem(), node); + { + SortPrepare(); + ::BuildTreeHelper(model, node->GetItem(), node); + } - int len = node->GetNodeNumber(); wxDataViewTreeNodes nodes = node->GetNodes(); - int j = 0; - for( ; j < len; j ++) + unsigned int i; + bool found = false; + + for (i = 0; i < nodes.GetCount(); i ++) { - if( nodes[j]->GetItem() == *(n->GetData())) - { - node = nodes[j]; + if (nodes[i]->GetItem() == (**iter)) + { + if (nodes[i]->GetItem() == item) + return nodes[i]; + + node = nodes[i]; + found = true; break; } } - // Whenever we can't find the node in any level, return NULL to indicate the item can't be found - if( j == len ) - { - found = false; + if (!found) return NULL; - } } else return NULL; } - return node; + return NULL; +} + +void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) +{ + wxDataViewColumn *col = NULL; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int colnum = 0; + int x, y; + m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); + for (unsigned x_start = 0; colnum < cols; colnum++) + { + col = GetOwner()->GetColumnAt(colnum); + if (col->IsHidden()) + continue; // skip it! + + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)x) + break; + + x_start += w; + } + + column = col; + item = GetItemByRow( GetLineAt( y ) ); +} + +wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) +{ + 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 ++ ) + { + col = GetOwner()->GetColumnAt( i ); + x += col->GetWidth(); + if( GetOwner()->GetColumnAt(i+1) == column ) + break; + } + int w = col->GetWidth(); + m_owner->CalcScrolledPosition( x, y, &x, &y ); + return wxRect(x, y, w, h); } int wxDataViewMainWindow::RecalculateCount() { - return m_root->GetSubTreeCount(); + if (!m_root) + { + wxDataViewIndexListModel *list_model = (wxDataViewIndexListModel*) GetOwner()->GetModel(); +#ifndef __WXMAC__ + return list_model->GetLastIndex() + 1; +#else + return list_model->GetLastIndex() - 1; +#endif + } + else + { + return m_root->GetSubTreeCount(); + } } class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item, ItemList::Node * node ) - { this->item = item ; ret = 0 ; nd = node ; } - virtual ~ItemToRowJob(){}; + ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) + : m_iter(iter), + item(item_) + { + ret = -1; + } + //Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) { ret ++; @@ -2858,9 +2648,9 @@ public: return DoJob::OK; } - if( nd && node->GetItem() == *(nd->GetData())) + if( node->GetItem() == **m_iter ) { - nd = nd->GetNext(); + m_iter++; return DoJob::CONT; } else @@ -2879,58 +2669,72 @@ public: return DoJob::CONT; } //the row number is begin from zero - int GetResult(){ return ret -1 ; } + int GetResult() { return ret -1; } + private: - ItemList::Node * nd; + ItemList::const_iterator m_iter; wxDataViewItem item; int ret; }; -unsigned int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) +int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) const { - wxDataViewModel * model = GetOwner()->GetModel(); + const wxDataViewModel * model = GetOwner()->GetModel(); if( model == NULL ) - return 0; + return -1; - //Compose the a parent-chain of the finding item - ItemList list; - list.DeleteContents( true ); - wxDataViewItem it( item ); - while( it.IsOk() ) + if (!m_root) { - wxDataViewItem * pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + return wxPtrToUInt( item.GetID() ); } + else + { + if( !item.IsOk() ) + return -1; - ItemToRowJob job( item, list.GetFirst() ); - Walker(m_root , job ); - return job.GetResult(); + //Compose the a parent-chain of the finding item + ItemList list; + wxDataViewItem * pItem; + list.DeleteContents( true ); + wxDataViewItem it( item ); + while( it.IsOk() ) + { + pItem = new wxDataViewItem( it ); + list.Insert( pItem ); + it = model->GetParent( it ); + } + pItem = new wxDataViewItem( ); + list.Insert( pItem ); + + ItemToRowJob job( item, list.begin() ); + Walker(m_root , job ); + return job.GetResult(); + } } -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) { if( !model->IsContainer( item ) ) - return ; + return; - wxDataViewItem i = model->GetFirstChild( item ); - int num = 0; - while( i.IsOk() ) + wxDataViewItemArray children; + unsigned int num = model->GetChildren( item, children); + unsigned int index = 0; + while( index < num ) { - num ++; - if( model->IsContainer( i ) ) + if( model->IsContainer( children[index] ) ) { wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); - n->SetItem(i); - n->SetHasChildren( true ) ; + n->SetItem(children[index]); + n->SetHasChildren( true ); node->AddNode( n ); } else { - node->AddLeaf( i.GetID() ); + node->AddLeaf( children[index].GetID() ); } - i = model->GetNextSibling( i ); + index ++; } node->SetSubTreeCount( num ); wxDataViewTreeNode * n = node->GetParent(); @@ -2941,21 +2745,32 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { + DestroyTree(); + + if (GetOwner()->GetModel()->IsVirtualListModel()) + { + m_count = -1; + return; + } + + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); + //First we define a invalid item to fetch the top-level elements wxDataViewItem item; - g_model = GetOwner()->GetModel(); + SortPrepare(); BuildTreeHelper( model, item, m_root); - m_count = -1 ; + m_count = -1; } -void DestroyTreeHelper( wxDataViewTreeNode * node ) +static void DestroyTreeHelper( wxDataViewTreeNode * node ) { if( node->GetNodeNumber() != 0 ) { int len = node->GetNodeNumber(); - int i = 0 ; - wxDataViewTreeNodes nodes = node->GetNodes(); - for( ; i < len; i ++ ) + int i = 0; + wxDataViewTreeNodes& nodes = node->GetNodes(); + for(; i < len; i ++ ) { DestroyTreeHelper(nodes[i]); } @@ -2965,23 +2780,18 @@ void DestroyTreeHelper( wxDataViewTreeNode * node ) void wxDataViewMainWindow::DestroyTree() { - DestroyTreeHelper(m_root); - m_root->SetSubTreeCount(0); - m_count = 0 ; + if (!IsVirtualList()) + { + ::DestroyTreeHelper(m_root); + m_count = 0; + m_root = NULL; + } } void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { - if (event.GetKeyCode() == WXK_TAB) - { - wxNavigationKeyEvent nevent; - nevent.SetWindowChange( event.ControlDown() ); - nevent.SetDirection( !event.ShiftDown() ); - nevent.SetEventObject( GetParent()->GetParent() ); - nevent.SetCurrentFocus( m_parent ); - if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent )) - return; - } + if ( GetParent()->HandleAsNavigationKey(event) ) + return; // no item -> nothing to do if (!HasCurrentRow()) @@ -2996,6 +2806,20 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) switch ( event.GetKeyCode() ) { + case WXK_RETURN: + { + if (m_currentRow >= 0) + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( GetItemByRow(m_currentRow) ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); + } + break; + } case WXK_UP: if ( m_currentRow > 0 ) OnArrowChar( m_currentRow - 1, event ); @@ -3007,11 +2831,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; //Add the process for tree expanding/collapsing case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -3062,7 +2886,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); - wxDataViewColumn *col = NULL; int xpos = 0; @@ -3070,7 +2893,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! @@ -3083,16 +2906,58 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } if (!col) return; - wxDataViewRenderer *cell = col->GetRenderer(); - unsigned int current = y / m_lineHeight; - - if ((current > GetRowCount()) || (x > GetEndOfLastCol())) + wxDataViewRenderer *cell = col->GetRenderer(); + unsigned int current = GetLineAt( y ); + if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? return; } + //Test whether the mouse is hovered on the tree item button + bool hover = 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) ) + { + //So the mouse is over the expander + hover = true; + if (m_underMouse && m_underMouse != node) + { + //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + } + if (m_underMouse != node) + { + //wxLogMessage("Do the row: %d", current); + RefreshRow(current); + } + m_underMouse = node; + } + } + if (node!=NULL && !node->HasChildren()) + delete node; + } + if (!hover) + { + if (m_underMouse != NULL) + { + //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); + m_underMouse = NULL; + } + } + wxDataViewModel *model = GetOwner()->GetModel(); if (event.Dragging()) @@ -3129,19 +2994,35 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; } + wxDataViewItem item = GetItemByRow(current); + bool ignore_other_columns = + ((GetOwner()->GetExpanderColumn() != col) && + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); + if (event.LeftDClick()) { if ( current == m_lineLastClicked ) { - if (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE) + if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) { - wxDataViewItem item = GetItemByRow(current); wxVariant value; model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); - wxRect cell_rect( xpos, current * m_lineHeight, - col->GetWidth(), m_lineHeight ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); cell->Activate( cell_rect, model, item, col->GetModelColumn() ); + + } + else + { + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + + parent->GetEventHandler()->ProcessEvent(le); } return; } @@ -3160,31 +3041,40 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // select single line SelectAllRows( false ); SelectRow( m_lineSelectSingleOnUp, true ); + SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) ); } //Process the event of user clicking the expander bool expander = false; - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) + if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN); - if( rect.Contains( x, y) ) + wxDataViewTreeNode * node = GetTreeNodeByRow(current); + if( node!=NULL && node->HasChildren() ) { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); + 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 ) + if (m_lastOnSame && !expander && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && - (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) + (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -3214,24 +3104,25 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) SelectAllRows(false); ChangeCurrentRow(current); SelectRow(m_currentRow,true); + SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } - // notify cell about right click - // cell->... - - // Allow generation of context menu event - event.Skip(); + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId()); + le.SetItem( item ); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetValue(value); + parent->GetEventHandler()->ProcessEvent(le); } else if (event.MiddleDown()) { - // notify cell about middle click - // cell->... } if (event.LeftDown() || forceClick) { -#ifdef __WXMSW__ SetFocus(); -#endif m_lineBeforeLastClicked = m_lineLastClicked; m_lineLastClicked = current; @@ -3245,10 +3136,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if ( IsSingleSel() || !IsRowSelected(current) ) { SelectAllRows( false ); - ChangeCurrentRow(current); - SelectRow(m_currentRow,true); + SendSelectionChangedEvent(GetItemByRow( m_currentRow ) ); } else // multi sel & current is highlighted & no mod keys { @@ -3261,8 +3151,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (cmdModifierDown) { ChangeCurrentRow(current); - ReverseRowSelection(m_currentRow); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else if (event.ShiftDown()) { @@ -3278,6 +3168,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } SelectRows(lineFrom, lineTo, true); + SendSelectionChangedEvent(GetItemByRow(m_selection[0]) ); } else // !ctrl, !shift { @@ -3296,6 +3187,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = !forceClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; + + // Call LeftClick after everything else as under GTK+ + if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE) + { + // notify cell about right click + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + cell->SetValue( value ); + wxRect cell_rect( xpos, GetLineStart( current ), + col->GetWidth(), GetLineHeight( current ) ); + /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn()); + } } } @@ -3319,7 +3222,7 @@ void wxDataViewMainWindow::OnKillFocus( wxFocusEvent &event ) event.Skip(); } -wxDataViewItem wxDataViewMainWindow::GetSelection() +wxDataViewItem wxDataViewMainWindow::GetSelection() const { if( m_selection.GetCount() != 1 ) return wxDataViewItem(); @@ -3330,6 +3233,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- +WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -3341,25 +3245,38 @@ wxDataViewCtrl::~wxDataViewCtrl() { if (m_notifier) GetModel()->RemoveNotifier( m_notifier ); + + m_cols.Clear(); } void wxDataViewCtrl::Init() { + m_cols.DeleteContents(true); m_notifier = NULL; + + // No sorting column at start + m_sortingColumnIdx = wxNOT_FOUND; + + m_headerArea = NULL; } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { + if ( (style & wxBORDER_MASK) == 0) + style |= wxBORDER_SUNKEN; + + Init(); + if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + style | wxScrolledWindowStyle, validator)) return false; - Init(); + SetInitialSize(size); #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren( true ); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); @@ -3367,7 +3284,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, if (HasFlag(wxDV_NO_HEADER)) m_headerArea = NULL; else - m_headerArea = new wxDataViewHeaderWindow( this, wxID_ANY ); + m_headerArea = new wxDataViewHeaderWindow(this); SetTargetWindow( m_clientArea ); @@ -3399,6 +3316,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 @@ -3413,6 +3339,12 @@ void wxDataViewCtrl::OnSize( wxSizeEvent &WXUNUSED(event) ) AdjustScrollbars(); } +void wxDataViewCtrl::SetFocus() +{ + if (m_clientArea) + m_clientArea->SetFocus(); +} + bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) { if (!wxDataViewCtrlBase::AssociateModel( model )) @@ -3422,6 +3354,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); + m_clientArea->DestroyTree(); + m_clientArea->BuildTree(model); m_clientArea->UpdateDisplay(); @@ -3434,14 +3368,43 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) if (!wxDataViewCtrlBase::AppendColumn(col)) return false; - OnColumnChange(); + m_cols.Append( col ); + OnColumnsCountChanged(); + return true; +} + +bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::PrependColumn(col)) + return false; + + m_cols.Insert( col ); + OnColumnsCountChanged(); + return true; +} + +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + m_cols.Insert( pos, col ); + OnColumnsCountChanged(); return true; } -void wxDataViewCtrl::OnColumnChange() +void wxDataViewCtrl::OnColumnChange(unsigned int idx) +{ + if ( m_headerArea ) + m_headerArea->UpdateColumn(idx); + + m_clientArea->UpdateDisplay(); +} + +void wxDataViewCtrl::OnColumnsCountChanged() { if (m_headerArea) - m_headerArea->UpdateDisplay(); + m_headerArea->SetColumnCount(GetColumnCount()); m_clientArea->UpdateDisplay(); } @@ -3456,54 +3419,323 @@ void wxDataViewCtrl::DoSetIndent() m_clientArea->UpdateDisplay(); } -wxDataViewItem wxDataViewCtrl::GetSelection() +unsigned int wxDataViewCtrl::GetColumnCount() const +{ + return m_cols.GetCount(); +} + +wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int idx ) const +{ + return m_cols[idx]; +} + +wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const +{ + // columns can't be reordered if there is no header window which allows + // to do this + const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos] + : pos; + + return GetColumn(idx); +} + +int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const +{ + const unsigned count = m_cols.size(); + for ( unsigned n = 0; n < count; n++ ) + { + if ( m_cols[n] == column ) + return n; + } + + return wxNOT_FOUND; +} + +void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), + unsigned int WXUNUSED(new_pos)) +{ + // do _not_ reorder m_cols elements here, they should always be in the + // order in which columns were added, we only display the columns in + // different order + m_clientArea->UpdateDisplay(); +} + +bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) +{ + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); + if (!ret) + return false; + + m_cols.Erase(ret); + OnColumnsCountChanged(); + + return true; +} + +bool wxDataViewCtrl::ClearColumns() +{ + m_cols.Clear(); + OnColumnsCountChanged(); + return true; +} + +int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const +{ + int ret = 0, + dummy = 0; + unsigned int len = GetColumnCount(); + for ( unsigned int i = 0; i < len; i++ ) + { + wxDataViewColumn * col = GetColumnAt(i); + if (col->IsHidden()) + continue; + ret += col->GetWidth(); + if (column==col) + { + CalcScrolledPosition( ret, dummy, &ret, &dummy ); + break; + } + } + return ret; +} + +wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const +{ + return m_sortingColumnIdx == wxNOT_FOUND ? NULL + : GetColumn(m_sortingColumnIdx); +} + +//Selection code with wxDataViewItem as parameters +wxDataViewItem wxDataViewCtrl::GetSelection() const { return m_clientArea->GetSelection(); } -/******************************************************************** -void wxDataViewCtrl::SetSelection( int row ) +int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const +{ + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( m_clientArea->GetItemByRow( row ) ); + } + return len; +} + +void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) +{ + wxDataViewSelection selection(wxDataViewSelectionCmp); + + wxDataViewItem last_parent; + + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + wxDataViewItem item = sel[i]; + wxDataViewItem parent = GetModel()->GetParent( item ); + if (parent) + { + if (parent != last_parent) + ExpandAncestors(item); + } + + last_parent = parent; + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + + m_clientArea->SetSelections( selection ); +} + +void wxDataViewCtrl::Select( const wxDataViewItem & item ) +{ + ExpandAncestors( item ); + + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + //Unselect all rows before select another in the single select mode + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow(row, true); + } +} + +void wxDataViewCtrl::Unselect( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + m_clientArea->SelectRow(row, false); +} + +bool wxDataViewCtrl::IsSelected( const wxDataViewItem & item ) const { - m_clientArea->SelectRow(row, true); + int row = m_clientArea->GetRowByItem( item ); + if( row >= 0 ) + { + return m_clientArea->IsRowSelected(row); + } + return false; } -void wxDataViewCtrl::SetSelectionRange( unsigned int from, unsigned int to ) +//Selection code with row number as parameter +int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const { - m_clientArea->SelectRows(from, to, true); + sel.Empty(); + wxDataViewSelection selection = m_clientArea->GetSelections(); + int len = selection.GetCount(); + for( int i = 0; i < len; i ++) + { + unsigned int row = selection[i]; + sel.Add( row ); + } + return len; } -void wxDataViewCtrl::SetSelections( const wxArrayInt& aSelections ) +void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) { - m_clientArea->Select(aSelections); + wxDataViewSelection selection(wxDataViewSelectionCmp); + int len = sel.GetCount(); + for( int i = 0; i < len; i ++ ) + { + int row = sel[i]; + if( row >= 0 ) + selection.Add( static_cast(row) ); + } + m_clientArea->SetSelections( selection ); } -void wxDataViewCtrl::Unselect( unsigned int WXUNUSED(row) ) +void wxDataViewCtrl::Select( int row ) { - // FIXME - TODO + if( row >= 0 ) + { + if (m_clientArea->IsSingleSel()) + m_clientArea->SelectAllRows(false); + m_clientArea->SelectRow( row, true ); + } } -bool wxDataViewCtrl::IsSelected( unsigned int WXUNUSED(row) ) const +void wxDataViewCtrl::Unselect( int row ) { - // FIXME - TODO + if( row >= 0 ) + m_clientArea->SelectRow(row, false); +} +bool wxDataViewCtrl::IsSelected( int row ) const +{ + if( row >= 0 ) + return m_clientArea->IsRowSelected(row); return false; } -int wxDataViewCtrl::GetSelection() const +void wxDataViewCtrl::SelectRange( int from, int to ) { - // FIXME - TODO + wxArrayInt sel; + for( int i = from; i < to; i ++ ) + sel.Add( i ); + m_clientArea->Select(sel); +} - return -1; +void wxDataViewCtrl::UnselectRange( int from, int to ) +{ + wxDataViewSelection sel = m_clientArea->GetSelections(); + for( int i = from; i < to; i ++ ) + if( sel.Index( i ) != wxNOT_FOUND ) + sel.Remove( i ); + m_clientArea->SetSelections(sel); } -int wxDataViewCtrl::GetSelections(wxArrayInt& WXUNUSED(aSelections) ) const +void wxDataViewCtrl::SelectAll() { - // FIXME - TODO + m_clientArea->SelectAllRows(true); +} - return 0; +void wxDataViewCtrl::UnselectAll() +{ + m_clientArea->SelectAllRows(false); } -*********************************************************************/ -#endif + +void wxDataViewCtrl::EnsureVisible( int row, int column ) +{ + if( row < 0 ) + row = 0; + if( row > (int) m_clientArea->GetRowCount() ) + row = m_clientArea->GetRowCount(); + + int first = m_clientArea->GetFirstVisibleRow(); + int last = m_clientArea->GetLastVisibleRow(); + if( row < first ) + m_clientArea->ScrollTo( row, column ); + else if( row > last ) + m_clientArea->ScrollTo( row - last + first, column ); + else + m_clientArea->ScrollTo( first, column ); +} + +void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) +{ + ExpandAncestors( item ); + + m_clientArea->RecalculateDisplay(); + + int row = m_clientArea->GetRowByItem(item); + if( row >= 0 ) + { + if( column == NULL ) + EnsureVisible(row, -1); + else + EnsureVisible( row, GetColumnIndex(column) ); + } + +} + +void wxDataViewCtrl::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) const +{ + m_clientArea->HitTest(point, item, column); +} + +wxRect wxDataViewCtrl::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) const +{ + return m_clientArea->GetItemRect(item, column); +} + +wxDataViewItem wxDataViewCtrl::GetItemByRow( unsigned int row ) const +{ + return m_clientArea->GetItemByRow( row ); +} + +int wxDataViewCtrl::GetRowByItem( const wxDataViewItem & item ) const +{ + return m_clientArea->GetRowByItem( item ); +} + +void wxDataViewCtrl::Expand( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Expand(row); +} + +void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + m_clientArea->Collapse(row); +} + +bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + return m_clientArea->IsExpanded(row); + return false; +} + + + #endif // !wxUSE_GENERICDATAVIEWCTRL #endif