X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/309bd665c44bc33b8da7749e81e7b7b3ec18117a..83666e99093aa0b65c497f7e6c75d98a875667cc:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 86f1fe9550..ed190733d2 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -44,6 +44,7 @@ #include "wx/icon.h" #include "wx/list.h" #include "wx/listimpl.cpp" +#include "wx/imaglist.h" //----------------------------------------------------------------------------- // classes @@ -59,11 +60,20 @@ static const int PADDING_RIGHTLEFT = 3; // 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 + //----------------------------------------------------------------------------- // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 1 +// on wxMSW the header window (only that part however) can be made native! +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) + #define USE_NATIVE_HEADER_WINDOW +#endif //Below is the compare stuff //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed @@ -109,8 +119,7 @@ protected: 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 +#ifdef USE_NATIVE_HEADER_WINDOW #define COLUMN_WIDTH_OFFSET 2 #define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow @@ -138,12 +147,18 @@ public: // the column count virtual void UpdateDisplay(); + virtual void OnInternalIdle(); + // called Refresh afterwards virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + + virtual bool AcceptsFocusFromKeyboard() const { return false; } + protected: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); - + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); wxSize DoGetBestSize() const; @@ -152,9 +167,12 @@ protected: wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } - - int m_scrollOffsetX; - int m_buttonHeight; + + int m_scrollOffsetX; + int m_buttonHeight; + bool m_vetoColumnDrag; + bool m_delayedUpdate; + wxImageList *m_imageList; private: DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) @@ -288,7 +306,7 @@ public: { } - wxDataViewTreeNode * GetParent() { return m_parent; } + wxDataViewTreeNode * GetParent() const { return m_parent; } void SetParent( wxDataViewTreeNode * parent ) { m_parent = parent; } wxDataViewTreeNodes & GetNodes() { return m_nodes; } wxDataViewTreeLeaves & GetChildren() { return m_leaves; } @@ -310,14 +328,15 @@ public: } wxDataViewItem & GetItem() { return m_item; } + const wxDataViewItem & GetItem() const { return m_item; } void SetItem( const wxDataViewItem & item ) { m_item = item; } - unsigned int GetChildrenNumber() { return m_leaves.GetCount(); } - unsigned int GetNodeNumber() { return m_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; + int ret = 0; + const wxDataViewTreeNode * node = this; while( node->GetParent()->GetParent() != NULL ) { node = node->GetParent(); @@ -326,16 +345,16 @@ public: return ret; } - bool IsOpen() + bool IsOpen() const { - return m_open ; + return m_open; } void ToggleOpen() { int len = m_nodes.GetCount(); int sum = 0; - for ( int i = 0 ;i < len ; i ++) + for ( int i = 0;i < len; i ++) sum += m_nodes[i]->GetSubTreeCount(); sum += m_leaves.GetCount(); @@ -350,15 +369,15 @@ public: ChangeSubTreeCount(sum); } } - bool HasChildren() { return m_hasChildren; } + bool HasChildren() const { return m_hasChildren; } void SetHasChildren( bool has ){ m_hasChildren = has; } void SetSubTreeCount( int num ) { m_subTreeCount = num; } - int GetSubTreeCount() { return m_subTreeCount; } + int GetSubTreeCount() const { return m_subTreeCount; } void ChangeSubTreeCount( int num ) { if( !m_open ) - return ; + return; m_subTreeCount += num; if( m_parent ) m_parent->ChangeSubTreeCount(num); @@ -417,6 +436,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 ); @@ -425,7 +446,7 @@ public: bool Cleared(); void Resort() { - if (m_root) + if (!IsVirtualList()) { SortPrepare(); m_root->Resort(); @@ -482,7 +503,7 @@ 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() ; + unsigned int GetRowCount(); wxDataViewItem GetSelection() const; wxDataViewSelection GetSelections(){ return m_selection; } @@ -507,9 +528,13 @@ public: wxRect GetLineRect( unsigned int row ) const; + int GetLineStart( unsigned int row ) const; // row * m_lineHeight in fixed mode + int GetLineHeight( unsigned int row ) const; // m_lineHeight in fixed mode + int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode + //Some useful functions for row and item mapping wxDataViewItem GetItemByRow( unsigned int row ) const; - int GetRowByItem( const wxDataViewItem & item ); + int GetRowByItem( const wxDataViewItem & item ) const; //Methods for building the mapping tree void BuildTree( wxDataViewModel * model ); @@ -520,11 +545,11 @@ public: void Expand( unsigned int row ) { OnExpanding( row ); } void Collapse( unsigned int row ) { OnCollapsing( row ); } 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 ); @@ -634,6 +659,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 // --------------------------------------------------------- @@ -743,7 +791,7 @@ bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta colour = dc->GetTextForeground(); dc->SetTextForeground( m_attr.GetColour() ); } - + if (m_attr.GetBold() || m_attr.GetItalic()) { font = dc->GetFont(); @@ -755,22 +803,22 @@ bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta 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 @@ -1142,6 +1190,8 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c SetTitle(title); SetFlags(flags); + m_autosize = width < 0; // TODO + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } @@ -1153,7 +1203,7 @@ wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer * SetAlignment(align); SetFlags(flags); - Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width); + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } wxDataViewColumn::~wxDataViewColumn() @@ -1258,7 +1308,7 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) parent->GetEventHandler()->ProcessEvent(le); } -#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW +#ifdef USE_NATIVE_HEADER_WINDOW #ifndef HDS_DRAGDROP #define HDS_DRAGDROP 0x0040 @@ -1279,23 +1329,27 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, m_owner = parent; m_scrollOffsetX = 0; - m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ) + 10; + m_delayedUpdate = false; + m_vetoColumnDrag = false; + m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( 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 ? m_buttonHeight : size.y; + h = m_buttonHeight; + + wxSize new_size(w,h); - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) + if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) ) return false; // create the native WC_HEADER window: WXHWND hwndParent = (HWND)parent->GetHandle(); WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; - + if ( m_isShown ) msStyle |= WS_VISIBLE; - + m_hWnd = CreateWindowEx(0, WC_HEADER, (LPCTSTR) NULL, @@ -1311,6 +1365,9 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, return false; } + m_imageList = new wxImageList( 16, 16 ); + (void)Header_SetImageList((HWND) m_hWnd, m_imageList->GetHIMAGELIST()); + // we need to subclass the m_hWnd to force wxWindow::HandleNotify // to call wxDataViewHeaderWindow::MSWOnNotify SubclassWin(m_hWnd); @@ -1318,18 +1375,28 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, // 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()); - + return true; } wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() { + delete m_imageList; UnsubclassWin(); } wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const { - return wxSize(80, m_buttonHeight ); + return wxSize( 80, m_buttonHeight+2 ); +} + +void wxDataViewHeaderWindowMSW::OnInternalIdle() +{ + if (m_delayedUpdate) + { + m_delayedUpdate = false; + UpdateDisplay(); + } } void wxDataViewHeaderWindowMSW::UpdateDisplay() @@ -1338,6 +1405,8 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++) Header_DeleteItem((HWND)m_hWnd, 0); + m_imageList->RemoveAll(); + // add the updated array of columns to the header control unsigned int cols = GetOwner()->GetColumnCount(); unsigned int added = 0; @@ -1347,12 +1416,22 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() if (col->IsHidden()) continue; // don't add it! + wxString title( col->GetTitle() ); HDITEM hdi; hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH; - hdi.pszText = (wxChar *) col->GetTitle().wx_str(); + if (col->GetBitmap().IsOk()) + { + m_imageList->Add( col->GetBitmap() ); + hdi.mask |= HDI_IMAGE; + hdi.iImage = m_imageList->GetImageCount()-1; + } + hdi.pszText = (wxChar *) title.wx_str(); hdi.cxy = col->GetWidth(); hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]); hdi.fmt = HDF_LEFT | HDF_STRING; + if (col->GetBitmap().IsOk()) + hdi.fmt |= HDF_IMAGE; + //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP); if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) @@ -1431,6 +1510,13 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA NMHEADER *nmHDR = (NMHEADER *)nmhdr; switch ( nmhdr->code ) { + case NM_RELEASEDCAPTURE: + { + // user has released the mouse + m_vetoColumnDrag = false; + } + break; + case HDN_BEGINTRACK: // user has started to resize a column: // do we need to veto it? @@ -1442,20 +1528,33 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA break; case HDN_BEGINDRAG: - // user has started to reorder a column - if (!GetColumn(nmHDR->iItem)->IsReorderable()) + // valid column + if (nmHDR->iItem != -1) + { + // user has started to reorder a valid column + if ((m_vetoColumnDrag == true) || (!GetColumn(nmHDR->iItem)->IsReorderable())) + { + // veto it! + *result = TRUE; + m_vetoColumnDrag = true; + } + } + else { // veto it! - *result = TRUE; + m_vetoColumnDrag = true; } break; case HDN_ENDDRAG: // user has finished reordering a column { - // TODO: How to query the new position here? + wxDataViewColumn *col = GetColumn(nmHDR->iItem); + unsigned int new_pos = nmHDR->pitem->iOrder; + m_owner->ColumnMoved( col, new_pos ); + m_delayedUpdate = true; } break; - + case HDN_ITEMCHANGING: if (nmHDR->pitem != NULL && (nmHDR->pitem->mask & HDI_WIDTH) != 0) @@ -1579,7 +1678,7 @@ void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy), const wxRect * WXUNUSED(rect)) { m_scrollOffsetX += dx; - + GetParent()->Layout(); } @@ -1897,7 +1996,7 @@ void wxDataViewRenameTimer::Notify() //----------------------------------------------------------------------------- //The tree building helper, declared firstly -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node); int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 ) { @@ -1944,16 +2043,18 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i SetBackgroundColour( *wxWHITE ); - m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); + SetBackgroundStyle(wxBG_STYLE_CUSTOM); + + m_penRule = wxPen(GetRuleColour()); //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 ); + 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); //Make m_count = -1 will cause the class recaculate the real displaying number of rows. - m_count = -1 ; + m_count = -1; m_underMouse = NULL; UpdateDisplay(); } @@ -1985,16 +2086,16 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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_start = GetLineAt( wxMax(0,update.y) ); unsigned int item_count = - wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1), + wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - 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; + unsigned int x_start; for (x_start = 0; col_start < cols; col_start++) { wxDataViewColumn *col = GetOwner()->GetColumn(col_start); @@ -2030,7 +2131,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) for (unsigned int i = item_start; i <= item_last+1; i++) { - int y = i * m_lineHeight; + int y = GetLineStart( i ); dc.DrawLine(x_start, y, x_last, y); } } @@ -2048,15 +2149,15 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (col->IsHidden()) continue; // skip it - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); x += col->GetWidth(); } // Draw last vertical rule - dc.DrawLine(x, item_start * m_lineHeight, - x, item_last * m_lineHeight); + dc.DrawLine(x, GetLineStart( item_start ), + x, GetLineStart( item_last ) ); } // redraw the background for the items which are selected/current @@ -2071,7 +2172,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (m_hasFocus) flags |= wxCONTROL_FOCUSED; - wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight ); + wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) ); wxRendererNative::Get().DrawItemSelectionRect ( this, @@ -2090,19 +2191,18 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) GetOwner()->SetExpanderColumn(expander); } - // redraw all cells for all rows which must be repainted and for all columns + // redraw all cells for all rows which must be repainted and 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! - + continue; // skip it! for (unsigned int item = item_start; item < item_last; item++) { @@ -2110,8 +2210,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxVariant value; wxDataViewTreeNode *node = NULL; wxDataViewItem dataitem; - - if (m_root) + + if (!IsVirtualList()) { node = GetTreeNodeByRow(item); if( node == NULL ) @@ -2124,12 +2224,12 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } else { - dataitem = wxDataViewItem( (void*) item ); + dataitem = wxDataViewItem( wxUIntToPtr(item) ); } model->GetValue( value, dataitem, col->GetModelColumn()); cell->SetValue( value ); - + if (cell->GetWantsAttr()) { wxDataViewItemAttr attr; @@ -2139,22 +2239,24 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) cell->SetHasAttr( ret ); } - // update the y offset - cell_rect.y = item * m_lineHeight; + // update cell_rect + cell_rect.y = GetLineStart( item ); + cell_rect.height = GetLineHeight( item ); // -1 is for the horizontal rules (?) //Draw the expander here. int indent = 0; - if ((m_root) && (col == expander)) + if ((!IsVirtualList()) && (col == expander)) { indent = node->GetIndentLevel(); - + //Calculate the indent first indent = cell_rect.x + GetOwner()->GetIndent() * indent; int expander_width = m_lineHeight - 2*EXPANDER_MARGIN; // change the cell_rect.x to the appropriate pos - int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ; - indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space + 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() ) @@ -2170,19 +2272,15 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) else wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); } - else - { - // I am wondering whether we should draw dot lines between tree nodes - if (node) - 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 - } - //force the expander column to left-center align cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); } - + if (node && !node->HasChildren()) + { + // Yes, if the node does not have any child, it must be a leaf which + // mean that it is a temporarily created by GetTreeNodeByRow + wxDELETE(node); + } // cannot be bigger than allocated space wxSize size = cell->GetSize(); @@ -2192,7 +2290,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) size.y = cell_rect.height; wxRect item_rect(cell_rect.GetTopLeft(), size); - int align = cell->GetAlignment(); + int align = cell->CalculateAlignment(); // horizontal alignment: item_rect.x = cell_rect.x; @@ -2257,8 +2355,10 @@ 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); @@ -2274,15 +2374,15 @@ 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; }; @@ -2294,12 +2394,12 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) switch( func( node ) ) { case DoJob::OK : - return true ; + return true; case DoJob::IGR: return false; case DoJob::CONT: - default: - ; + default: + ; } wxDataViewTreeNodes nodes = node->GetNodes(); @@ -2309,7 +2409,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) 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() ) @@ -2325,12 +2425,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; @@ -2344,7 +2444,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData UpdateDisplay(); return true; } - + SortPrepare(); wxDataViewTreeNode * node; @@ -2373,7 +2473,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData return true; } -void DestroyTreeHelper( wxDataViewTreeNode * node); +static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) @@ -2385,7 +2485,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, m_currentRow = m_count - 1; m_selection.Empty(); - + UpdateDisplay(); return true; @@ -2418,7 +2518,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, 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 ) { @@ -2431,16 +2531,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, node->GetNodes().Remove( n ); sub -= n->GetSubTreeCount(); - DestroyTreeHelper(n); + ::DestroyTreeHelper(n); } //Make the row number invalid and get a new valid one when user call GetRowCount m_count = -1; node->ChangeSubTreeCount(sub); - if( node->GetChildrenNumber() == 0) - { - node->GetParent()->GetNodes().Remove( node ); - delete node; - } //Change the current row to the last row if the current exceed the max row number if( m_currentRow > GetRowCount() ) @@ -2497,10 +2592,10 @@ bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned i bool wxDataViewMainWindow::Cleared() { DestroyTree(); - + SortPrepare(); BuildTree( GetOwner()->GetModel() ); - + UpdateDisplay(); return true; @@ -2532,7 +2627,7 @@ void wxDataViewMainWindow::RecalculateDisplay() } int width = GetEndOfLastCol(); - int height = GetRowCount() * m_lineHeight; + int height = GetLineStart( GetRowCount() ); SetVirtualSize( width, height ); GetOwner()->SetScrollRate( 10, m_lineHeight ); @@ -2552,13 +2647,13 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column ) { int x, y; m_owner->GetScrollPixelsPerUnit( &x, &y ); - int sy = rows*m_lineHeight/y; + int sy = GetLineStart( rows )/y; int sx = 0; if( column != -1 ) { wxRect rect = GetClientRect(); int colnum = 0; - int x_start = 0, x_end = 0, w = 0; + int x_start, w = 0; int xx, yy, xe; m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); for (x_start = 0; colnum < column; colnum++) @@ -2571,7 +2666,7 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column ) x_start += w; } - x_end = x_start + w; + int x_end = x_start + w; xe = xx + rect.width; if( x_end > xe ) { @@ -2598,7 +2693,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())->GetColumn( i ); if (!c->IsHidden()) width += c->GetWidth(); @@ -2612,7 +2707,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() @@ -2622,7 +2717,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() &client_size.x, &client_size.y ); //we should deal with the pixel here - unsigned int row = ((client_size.y)/m_lineHeight) - 1; + unsigned int row = GetLineAt(client_size.y) - 1; return wxMin( GetRowCount()-1, row ); } @@ -2632,11 +2727,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; } @@ -2760,7 +2851,7 @@ void wxDataViewMainWindow::SendSelectionChangedEvent( const wxDataViewItem& item 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(); @@ -2779,7 +2870,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(); @@ -2791,18 +2882,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) @@ -2861,25 +2948,189 @@ 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; } @@ -2907,7 +3158,7 @@ public: current ++; if( current == static_cast(row)) { - ret = wxDataViewItem( n ) ; + ret = wxDataViewItem( n ); return DoJob::OK; } return DoJob::CONT; @@ -2915,7 +3166,7 @@ public: wxDataViewItem GetResult(){ return ret; } private: unsigned int row; - int current ; + int current; wxDataViewItem ret; }; @@ -2923,7 +3174,7 @@ wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const { if (!m_root) { - return wxDataViewItem( (void*) row ); + return wxDataViewItem( wxUIntToPtr(row) ); } else { @@ -2939,18 +3190,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; } @@ -2968,7 +3219,7 @@ public: { int index = static_cast(row) - current - 1; void * n = node->GetChildren().Item( index ); - ret = new wxDataViewTreeNode( parent ) ; + ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); return DoJob::OK; @@ -2984,7 +3235,7 @@ public: current ++; if( current == static_cast(row)) { - ret = new wxDataViewTreeNode( parent ) ; + ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); return DoJob::OK; @@ -2995,24 +3246,19 @@ 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 { - if (!m_root) - { - return NULL; - } - else - { - RowToTreeNodeJob job( row , -2, m_root ); - Walker( m_root , job ); - return job.GetResult(); - } + wxASSERT( !IsVirtualList() ); + + RowToTreeNodeJob job( row , -2, m_root ); + Walker( m_root , job ); + return job.GetResult(); } wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item ) @@ -3030,6 +3276,9 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const void wxDataViewMainWindow::OnExpanding( unsigned int row ) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { @@ -3047,7 +3296,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) if( node->GetChildrenNumber() == 0 ) { SortPrepare(); - BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); } m_count = -1; UpdateDisplay(); @@ -3069,6 +3318,9 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) void wxDataViewMainWindow::OnCollapsing(unsigned int row) { + if (IsVirtualList()) + return; + wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) { @@ -3089,7 +3341,7 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row) node = node->GetParent(); if( node != NULL ) { - int parent = GetRowByItem( node->GetItem() ) ; + int parent = GetRowByItem( node->GetItem() ); if( parent >= 0 ) { SelectRow( row, false); @@ -3124,33 +3376,39 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item //Find the item along the parent-chain. //This algorithm is designed to speed up the node-finding method wxDataViewTreeNode * node = m_root; - for( ItemList::const_iterator iter = list.begin(); iter !=list.end() ; iter++ ) + for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ ) { if( node->HasChildren() ) { if( node->GetChildrenNumber() == 0 ) { SortPrepare(); - BuildTreeHelper(model, node->GetItem(), node); + ::BuildTreeHelper(model, node->GetItem(), node); } wxDataViewTreeNodes nodes = node->GetNodes(); - unsigned int i = 0; - for (; i < nodes.GetCount(); i ++) + unsigned int i; + bool found = false; + + for (i = 0; i < nodes.GetCount(); i ++) { if (nodes[i]->GetItem() == (**iter)) { + if (nodes[i]->GetItem() == item) + return nodes[i]; + node = nodes[i]; + found = true; break; } } - if (i == nodes.GetCount()) + if (!found) return NULL; } else return NULL; } - return node; + return NULL; } void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column ) @@ -3158,10 +3416,9 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item wxDataViewColumn *col = NULL; unsigned int cols = GetOwner()->GetColumnCount(); unsigned int colnum = 0; - unsigned int x_start = 0; int x, y; m_owner->CalcUnscrolledPosition( point.x, point.y, &x, &y ); - for (x_start = 0; colnum < cols; colnum++) + for (unsigned x_start = 0; colnum < cols; colnum++) { col = GetOwner()->GetColumn(colnum); if (col->IsHidden()) @@ -3175,14 +3432,14 @@ void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item } column = col; - item = GetItemByRow( y/m_lineHeight ); + item = GetItemByRow( GetLineAt( y ) ); } wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxDataViewColumn* column ) { int row = GetRowByItem(item); - int y = row*m_lineHeight; - int h = m_lineHeight; + 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 ++ ) @@ -3217,9 +3474,12 @@ int wxDataViewMainWindow::RecalculateCount() class ItemToRowJob : public DoJob { public: - ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter ) - { this->item = item ; ret = -1 ; m_iter = iter ; } - virtual ~ItemToRowJob(){}; + ItemToRowJob(const wxDataViewItem& item_, 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) @@ -3232,7 +3492,7 @@ public: if( node->GetItem() == **m_iter ) { - m_iter++ ; + m_iter++; return DoJob::CONT; } else @@ -3251,7 +3511,8 @@ public: return DoJob::CONT; } //the row number is begin from zero - int GetResult(){ return ret -1 ; } + int GetResult() { return ret -1; } + private: ItemList::const_iterator m_iter; wxDataViewItem item; @@ -3259,9 +3520,9 @@ private: }; -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 -1; @@ -3276,7 +3537,7 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) //Compose the a parent-chain of the finding item ItemList list; - wxDataViewItem * pItem = NULL; + wxDataViewItem * pItem; list.DeleteContents( true ); wxDataViewItem it( item ); while( it.IsOk() ) @@ -3294,10 +3555,10 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) } } -void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) +static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) { if( !model->IsContainer( item ) ) - return ; + return; wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); @@ -3308,7 +3569,7 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie { wxDataViewTreeNode * n = new wxDataViewTreeNode( node ); n->SetItem(children[index]); - n->SetHasChildren( true ) ; + n->SetHasChildren( true ); node->AddNode( n ); } else @@ -3328,9 +3589,9 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { DestroyTree(); - if (GetOwner()->GetModel()->IsIndexListModel()) + if (GetOwner()->GetModel()->IsVirtualListModel()) { - m_count = -1 ; + m_count = -1; return; } @@ -3341,17 +3602,17 @@ void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) wxDataViewItem item; SortPrepare(); BuildTreeHelper( model, item, m_root); - m_count = -1 ; + m_count = -1; } -void DestroyTreeHelper( wxDataViewTreeNode * node ) +static void DestroyTreeHelper( wxDataViewTreeNode * node ) { if( node->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]); } @@ -3361,9 +3622,9 @@ void DestroyTreeHelper( wxDataViewTreeNode * node ) void wxDataViewMainWindow::DestroyTree() { - if (m_root) + if (!IsVirtualList()) { - DestroyTreeHelper(m_root); + ::DestroyTreeHelper(m_root); m_count = 0; m_root = NULL; } @@ -3371,16 +3632,8 @@ void wxDataViewMainWindow::DestroyTree() 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()) @@ -3497,7 +3750,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; wxDataViewRenderer *cell = col->GetRenderer(); - unsigned int current = y / m_lineHeight; + unsigned int current = GetLineAt( y ); if ((current > GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? @@ -3506,14 +3759,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Test whether the mouse is hovered on the tree item button bool hover = false; - if ((m_root) && (GetOwner()->GetExpanderColumn() == col)) + 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, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN); + 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 @@ -3595,8 +3851,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) 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() ); } @@ -3631,14 +3887,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Process the event of user clicking the expander bool expander = false; - if ((m_root) && (GetOwner()->GetExpanderColumn() == col)) + 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, current * m_lineHeight + EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,m_lineHeight-2*EXPANDER_MARGIN); + 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; @@ -3648,12 +3908,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) OnExpanding( current ); } } + if (node && !node->HasChildren()) + delete node; } //If the user click the expander, we do not do editing even if the column with expander are editable if (m_lastOnSame && !expander && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && - (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) ) + (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) { m_renameTimer->Start( 100, true ); } @@ -3686,16 +3948,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) 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) { @@ -3764,6 +4028,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()); + } } } @@ -3810,27 +4086,37 @@ 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_sortingColumn = NULL; + 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|wxBORDER_SUNKEN, validator)) + style | wxScrolledWindowStyle, validator)) return false; SetInitialSize(size); - Init(); - #ifdef __WXMAC__ - MacSetClipChildren( true ) ; + MacSetClipChildren( true ); #endif m_clientArea = new wxDataViewMainWindow( this, wxID_ANY ); @@ -3870,6 +4156,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 @@ -3884,6 +4179,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 )) @@ -3894,7 +4195,7 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); m_clientArea->DestroyTree(); - + m_clientArea->BuildTree(model); m_clientArea->UpdateDisplay(); @@ -3922,6 +4223,16 @@ bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) return true; } +bool wxDataViewCtrl::InsertColumn( unsigned int pos, wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::InsertColumn(pos,col)) + return false; + + m_cols.Insert( pos, col ); + OnColumnChange(); + return true; +} + void wxDataViewCtrl::OnColumnChange() { if (m_headerArea) @@ -3961,14 +4272,26 @@ wxDataViewColumn* wxDataViewCtrl::GetColumn( unsigned int pos ) const return NULL; } +void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos ) +{ + if (new_pos > m_cols.GetCount()) return; + + // Exchange position + m_cols.DeleteContents(false); + m_cols.DeleteObject( col ); + m_cols.Insert( new_pos, col ); + m_cols.DeleteContents(true); + + m_clientArea->UpdateDisplay(); +} + bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { - wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); + wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); if (!ret) return false; m_cols.Erase(ret); - delete column; OnColumnChange(); return true; @@ -3976,7 +4299,7 @@ bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) bool wxDataViewCtrl::ClearColumns() { - m_cols.clear(); + m_cols.Clear(); OnColumnChange(); return true; } @@ -4026,7 +4349,7 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; + wxDataViewSelection selection(wxDataViewSelectionCmp); int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) { @@ -4082,7 +4405,7 @@ int wxDataViewCtrl::GetSelections( wxArrayInt & sel ) const void wxDataViewCtrl::SetSelections( const wxArrayInt & sel ) { - wxDataViewSelection selection(wxDataViewSelectionCmp) ; + wxDataViewSelection selection(wxDataViewSelectionCmp); int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) {