X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89cac3f09e84f94bea292a8534feda3830ecfb1..f210b1b521336232c87f77e03d312245b0e3673c:/src/generic/datavgen.cpp?ds=sidebyside diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 8a13bf7d47..54baeb4de2 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -63,7 +63,7 @@ static const int EXPANDER_MARGIN = 4; // wxDataViewHeaderWindow //----------------------------------------------------------------------------- -#define USE_NATIVE_HEADER_WINDOW 0 +#define USE_NATIVE_HEADER_WINDOW 1 //Below is the compare stuff //For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed @@ -138,18 +138,29 @@ public: // the column count virtual void UpdateDisplay(); - // called when the main window gets scrolled + virtual void OnInternalIdle(); + + // called Refresh afterwards virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + protected: virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); + wxSize DoGetBestSize() const; + unsigned int GetColumnIdxFromHeader(NMHEADER *nmHDR); wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR) { return GetColumn(GetColumnIdxFromHeader(nmHDR)); } + int m_scrollOffsetX; + int m_buttonHeight; + bool m_delayedUpdate; + private: DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW) }; @@ -231,7 +242,6 @@ protected: m_penCurrent = wxPen(col, 1, wxSOLID); } - void DrawCurrent(); void AdjustDC(wxDC& dc); private: @@ -269,7 +279,7 @@ class wxDataViewTreeNode { public: wxDataViewTreeNode( wxDataViewTreeNode * parent = NULL ) - { + { m_parent = parent; if (!parent) m_open = true; @@ -278,7 +288,7 @@ public: m_hasChildren = false; m_subTreeCount = 0; } - + ~wxDataViewTreeNode() { } @@ -400,7 +410,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 { @@ -420,8 +430,11 @@ public: bool Cleared(); void Resort() { - SortPrepare(); - m_root->Resort(); + if (m_root) + { + SortPrepare(); + m_root->Resort(); + } UpdateDisplay(); } @@ -602,6 +615,8 @@ wxDataViewRenderer::wxDataViewRenderer( const wxString &varianttype, m_dc = NULL; m_align = align; m_mode = mode; + m_wantsAttr = false; + m_hasAttr = false; } wxDataViewRenderer::~wxDataViewRenderer() @@ -636,6 +651,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 // --------------------------------------------------------- @@ -682,14 +707,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; } @@ -705,6 +723,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 // --------------------------------------------------------- @@ -950,12 +1022,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; } @@ -1012,46 +1082,52 @@ bool wxDataViewIconTextRenderer::SetValue( const wxVariant &value ) return true; } -bool wxDataViewIconTextRenderer::GetValue( wxVariant &value ) const +bool wxDataViewIconTextRenderer::GetValue( wxVariant& WXUNUSED(value) ) const { return false; } bool wxDataViewIconTextRenderer::Render( wxRect cell, wxDC *dc, int state ) { - wxDataViewCtrl *view = GetOwner()->GetOwner(); - - dc->SetFont( view->GetFont() ); - - wxColour col = (state & wxDATAVIEW_CELL_SELECTED) ? - wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) : - view->GetForegroundColour(); - - dc->SetTextForeground(col); - + int xoffset = 0; const wxIcon &icon = m_value.GetIcon(); if (icon.IsOk()) { - dc->DrawIcon( icon, cell.x, cell.y ); // TODO centre - cell.x += icon.GetWidth()+4; + dc->DrawIcon( icon, cell.x, cell.y + ((cell.height - icon.GetHeight()) / 2)); + xoffset = icon.GetWidth()+4; } - dc->DrawText( m_value.GetText(), cell.x, cell.y ); + RenderText( m_value.GetText(), xoffset, cell, dc, state ); return true; } wxSize wxDataViewIconTextRenderer::GetSize() const { - return wxSize(80,16); // TODO + const wxDataViewCtrl *view = GetView(); + if (!m_value.GetText().empty()) + { + int x,y; + view->GetTextExtent( m_value.GetText(), &x, &y ); + + if (m_value.GetIcon().IsOk()) + x += m_value.GetIcon().GetWidth() + 4; + return wxSize( x, y ); + } + return wxSize(80,20); } -wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +wxControl * +wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { return NULL; } -bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +bool +wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), + wxVariant& WXUNUSED(value)) { return false; } @@ -1071,6 +1147,8 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c SetTitle(title); SetFlags(flags); + m_autosize = width < 0; // TODO + Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width); } @@ -1128,6 +1206,14 @@ void wxDataViewColumn::SetSortable( bool sortable ) GetOwner()->OnColumnChange(); } +void wxDataViewColumn::SetReorderable( bool reorderable ) +{ + if (reorderable) + m_flags |= wxDATAVIEW_COL_REORDERABLE; + else + m_flags &= ~wxDATAVIEW_COL_REORDERABLE; +} + void wxDataViewColumn::SetSortOrder( bool ascending ) { m_ascending = ascending; @@ -1153,7 +1239,7 @@ void wxDataViewColumn::SetInternalWidth( int width ) void wxDataViewColumn::SetWidth( int width ) { - m_owner->m_headerArea->UpdateDisplay(); + if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay(); SetInternalWidth(width); } @@ -1181,6 +1267,13 @@ void wxDataViewHeaderWindowBase::SendEvent(wxEventType type, unsigned int n) #if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW +#ifndef HDS_DRAGDROP + #define HDS_DRAGDROP 0x0040 +#endif +#ifndef HDS_FULLDRAG + #define HDS_FULLDRAG 0x0080 +#endif + // implemented in msw/listctrl.cpp: int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick); @@ -1192,17 +1285,27 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, { m_owner = parent; - if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) ) - return false; + m_scrollOffsetX = 0; + m_delayedUpdate = 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 ? 22 : size.y; + h = m_buttonHeight; + + wxSize new_size(w,h); + + 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_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG; + 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, @@ -1226,36 +1329,6 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id, // header windows and must be done befor sending the HDM_LAYOUT msg SetFont(GetFont()); - RECT rcParent; - HDLAYOUT hdl; - WINDOWPOS wp; - - // 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); - - hdl.prc = &rcParent; - hdl.pwpos = ℘ - if (!SendMessage((HWND)m_hWnd, HDM_LAYOUT, 0, (LPARAM) &hdl)) - { - wxLogLastError(_T("SendMessage")); - return false; - } - - // 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); - - // 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)); - return true; } @@ -1264,6 +1337,20 @@ wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow() UnsubclassWin(); } +wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const +{ + return wxSize( 80, m_buttonHeight+2 ); +} + +void wxDataViewHeaderWindowMSW::OnInternalIdle() +{ + if (m_delayedUpdate) + { + m_delayedUpdate = false; + UpdateDisplay(); + } +} + void wxDataViewHeaderWindowMSW::UpdateDisplay() { // remove old columns @@ -1273,7 +1360,6 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() // 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 ); @@ -1288,13 +1374,12 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() hdi.fmt = HDF_LEFT | HDF_STRING; //hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP); - //sorting support - if(model && m_owner->GetSortingColumn() == col) + if (col->IsSortable() && GetOwner()->GetSortingColumn() == col) { //The Microsoft Comctrl32.dll 6.0 support SORTUP/SORTDOWN, but they are not default //see http://msdn2.microsoft.com/en-us/library/ms649534.aspx for more detail - //hdi.fmt |= model->GetSortOrderAscending()? HDF_SORTUP:HDF_SORTDOWN; - ; + // VZ: works with 5.81 + hdi.fmt |= col->IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN; } // lParam is reserved for application's use: @@ -1324,7 +1409,7 @@ void wxDataViewHeaderWindowMSW::UpdateDisplay() default: // such alignment is not allowed for the column header! - wxFAIL; + break; // wxFAIL; } SendMessage((HWND)m_hWnd, HDM_INSERTITEM, @@ -1377,6 +1462,20 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA case HDN_BEGINDRAG: // user has started to reorder a column + if (!GetColumn(nmHDR->iItem)->IsReorderable()) + { + // veto it! + *result = TRUE; + } + break; + + case HDN_ENDDRAG: // user has finished reordering a column + { + wxDataViewColumn *col = GetColumn(nmHDR->iItem); + unsigned int new_pos = nmHDR->pitem->iOrder; + m_owner->ColumnMoved( col, new_pos ); + m_delayedUpdate = true; + } break; case HDN_ITEMCHANGING: @@ -1395,7 +1494,6 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA 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 && @@ -1499,32 +1597,20 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA return true; } -void wxDataViewHeaderWindowMSW::ScrollWindow(int WXUNUSED(dx), int WXUNUSED(dy), - const wxRect *WXUNUSED(rect)) +void wxDataViewHeaderWindowMSW::ScrollWindow(int dx, int WXUNUSED(dy), + const wxRect * WXUNUSED(rect)) { - wxSize ourSz = GetClientSize(); - wxSize ownerSz = m_owner->GetClientSize(); + m_scrollOffsetX += dx; - // 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); + GetParent()->Layout(); } -void wxDataViewHeaderWindowMSW::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(w), int WXUNUSED(h), - int WXUNUSED(f)) +void wxDataViewHeaderWindowMSW::DoSetSize(int x, int y, + int w, int h, + int 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); + // TODO: why is there a border + 2px around it? + wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f ); } #else // !defined(__WXMSW__) @@ -1602,7 +1688,7 @@ void wxGenericDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) else sortArrow = wxHDR_SORT_ICON_DOWN; } - + int state = 0; if (m_parent->IsEnabled()) { @@ -1730,7 +1816,7 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) m_minX = xpos; } - + int old_hover = m_hover; m_hover = m_column; if (event.Leaving()) @@ -1800,33 +1886,6 @@ void wxGenericDataViewHeaderWindow::OnMouse( wxMouseEvent &event ) } } -//I must say that this function is deprecated, but I think it is useful to keep it for a time -void wxGenericDataViewHeaderWindow::DrawCurrent() -{ -#if 1 - GetColumn(m_column)->SetWidth(m_currentX - m_minX); -#else - 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 ); -#endif -} - void wxGenericDataViewHeaderWindow::AdjustDC(wxDC& dc) { int xpix, x; @@ -1882,7 +1941,7 @@ END_EVENT_TABLE() wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, const wxString &name ) : - wxWindow( parent, id, pos, size, wxWANTS_CHARS, name ), + wxWindow( parent, id, pos, size, wxWANTS_CHARS|wxBORDER_NONE, name ), m_selection( wxDataViewSelectionCmp ) { @@ -1895,13 +1954,7 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_currentCol = NULL; m_currentRow = 0; - // TODO: we need to calculate this smartly - m_lineHeight = -#ifdef __WXMSW__ - 17; -#else - 20; -#endif + m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 m_dragCount = 0; m_dragStart = wxPoint(0,0); @@ -1911,9 +1964,10 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_hasFocus = false; - SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetBackgroundColour( *wxWHITE ); + SetBackgroundStyle(wxBG_STYLE_CUSTOM); + m_penRule = wxPen(GetRuleColour(), 1, wxSOLID); //Here I compose a pen can draw black lines, maybe there are something system colour to use @@ -1934,88 +1988,361 @@ wxDataViewMainWindow::~wxDataViewMainWindow() delete m_renameTimer; } -void wxDataViewMainWindow::OnRenameTimer() +void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - // We have to call this here because changes may just have - // been made and no screen update taken place. - if ( m_dirty ) - wxSafeYield(); + wxDataViewModel *model = GetOwner()->GetModel(); + wxAutoBufferedPaintDC dc( this ); - int xpos = 0; +#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 + + // prepare the DC + 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 i; - for (i = 0; i < cols; i++) + unsigned int col_start = 0; + unsigned int x_start = 0; + for (x_start = 0; col_start < cols; col_start++) { - wxDataViewColumn *c = GetOwner()->GetColumn( i ); - if (c->IsHidden()) + wxDataViewColumn *col = GetOwner()->GetColumn(col_start); + if (col->IsHidden()) continue; // skip it! - if (c == m_currentCol) + unsigned int w = col->GetWidth(); + if (x_start+w >= (unsigned int)update.x) break; - xpos += c->GetWidth(); - } - wxRect labelRect( xpos, m_currentRow * m_lineHeight, - m_currentCol->GetWidth(), m_lineHeight ); - - GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, - &labelRect.x, &labelRect.y); - - wxDataViewItem item = GetItemByRow( m_currentRow ); - m_currentCol->GetRenderer()->StartEditing( item, labelRect ); - -} -//------------------------------------------------------------------ -// Helper class for do operation on the tree node -//------------------------------------------------------------------ -class DoJob -{ -public: - DoJob(){}; - virtual ~DoJob(){}; + x_start += w; + } - //The return value control how the tree-walker tranverse the tree - // 0: Job done, stop tranverse and return - // 1: Ignore the current node's subtree and continue - // 2: Job not done, continue - enum { OK = 0 , IGR = 1, CONT = 2 }; - virtual int operator() ( wxDataViewTreeNode * node ) = 0 ; - virtual int operator() ( void * n ) = 0; -}; + 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! -bool Walker( wxDataViewTreeNode * node, DoJob & func ) -{ - if( node==NULL ) - return false; + if (x_last > (unsigned int)update.GetRight()) + break; - switch( func( node ) ) - { - case DoJob::OK : - return true ; - case DoJob::IGR: - return false; - case DoJob::CONT: - default: - ; + x_last += col->GetWidth(); } - wxDataViewTreeNodes nodes = node->GetNodes(); - wxDataViewTreeLeaves leaves = node->GetChildren(); + // Draw horizontal rules if required + if ( m_owner->HasFlag(wxDV_HORIZ_RULES) ) + { + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); - int len_nodes = nodes.GetCount(); - int len = leaves.GetCount(); - int i = 0, nodes_i = 0; + for (unsigned int i = item_start; i <= item_last+1; i++) + { + int y = i * m_lineHeight; + dc.DrawLine(x_start, y, x_last, y); + } + } - for( ; i < len ; i ++ ) + // Draw vertical rules if required + if ( m_owner->HasFlag(wxDV_VERT_RULES) ) { - void * n = leaves[i]; - if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) + dc.SetPen(m_penRule); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + + int x = x_start; + for (unsigned int i = col_start; i < col_last; i++) { - wxDataViewTreeNode * nd = nodes[nodes_i]; - nodes_i++; + wxDataViewColumn *col = GetOwner()->GetColumn(i); + if (col->IsHidden()) + continue; // skip it - if( Walker( nd , func ) ) - return true; + 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 + ); + } + } + + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) + { + // TODO: last column for RTL support + expander = GetOwner()->GetColumn( 0 ); + GetOwner()->SetExpanderColumn(expander); + } + + // 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 = NULL; + wxDataViewItem dataitem; + + if (m_root) + { + node = GetTreeNodeByRow(item); + if( node == NULL ) + continue; + + dataitem = node->GetItem(); + + if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) + continue; + } + else + { + dataitem = wxDataViewItem( (void*) item ); + } + + model->GetValue( value, dataitem, col->GetModelColumn()); + cell->SetValue( value ); + + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } + + // update the y offset + cell_rect.y = item * m_lineHeight; + + //Draw the expander here. + int indent = 0; + if ((m_root) && (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 + 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); + } + 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 ); + } + + + // cannot be bigger than allocated space + wxSize size = cell->GetSize(); + // Because of the tree structure indent, here we should minus the width of the cell for drawing + size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent ); + // size.y = wxMin( size.y, cell_rect.height ); + size.y = cell_rect.height; + + wxRect item_rect(cell_rect.GetTopLeft(), size); + int align = cell->GetAlignment(); + + // horizontal alignment: + item_rect.x = cell_rect.x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = cell_rect.x + cell_rect.width - size.x; + //else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = cell_rect.y; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = cell_rect.y + cell_rect.height - size.y; + //else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + //Here we add the tree indent + item_rect.x += indent; + + int state = 0; + if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND)) + state |= wxDATAVIEW_CELL_SELECTED; + + // TODO: it would be much more efficient to create a clipping + // region for the entire column being rendered (in the OnPaint + // of wxDataViewMainWindow) instead of a single clip region for + // each cell. However it would mean that each renderer should + // respect the given wxRect's top & bottom coords, eventually + // violating only the left & right coords - however the user can + // make its own renderer and thus we cannot be sure of that. + dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, state ); + dc.DestroyClippingRegion(); + } + + cell_rect.x += cell_rect.width; + } +} + +void wxDataViewMainWindow::OnRenameTimer() +{ + // We have to call this here because changes may just have + // been made and no screen update taken place. + if ( m_dirty ) + wxSafeYield(); + + int xpos = 0; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int i; + for (i = 0; i < cols; i++) + { + wxDataViewColumn *c = GetOwner()->GetColumn( i ); + if (c->IsHidden()) + continue; // skip it! + + if (c == m_currentCol) + break; + xpos += c->GetWidth(); + } + wxRect labelRect( xpos, m_currentRow * m_lineHeight, + m_currentCol->GetWidth(), m_lineHeight ); + + GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, + &labelRect.x, &labelRect.y); + + wxDataViewItem item = GetItemByRow( m_currentRow ); + m_currentCol->GetRenderer()->StartEditing( item, labelRect ); + +} + +//------------------------------------------------------------------ +// Helper class for do operation on the tree node +//------------------------------------------------------------------ +class DoJob +{ +public: + DoJob(){}; + virtual ~DoJob(){}; + + //The return value control how the tree-walker tranverse the tree + // 0: Job done, stop tranverse and return + // 1: Ignore the current node's subtree and continue + // 2: Job not done, continue + enum { OK = 0 , IGR = 1, CONT = 2 }; + virtual int operator() ( wxDataViewTreeNode * node ) = 0 ; + virtual int operator() ( void * n ) = 0; +}; + +bool Walker( wxDataViewTreeNode * node, DoJob & func ) +{ + if( node==NULL ) + return false; + + switch( func( node ) ) + { + case DoJob::OK : + return true ; + case DoJob::IGR: + return false; + case DoJob::CONT: + default: + ; + } + + 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 ++ ) + { + void * n = leaves[i]; + if( nodes_i < len_nodes && n == nodes[nodes_i]->GetItem().GetID() ) + { + wxDataViewTreeNode * nd = nodes[nodes_i]; + nodes_i++; + + if( Walker( nd , func ) ) + return true; } else @@ -2035,6 +2362,13 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item) { + if (!m_root) + { + m_count++; + UpdateDisplay(); + return true; + } + SortPrepare(); wxDataViewTreeNode * node; @@ -2068,6 +2402,19 @@ void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, const wxDataViewItem& item) { + if (!m_root) + { + m_count--; + if( m_currentRow > GetRowCount() ) + m_currentRow = m_count - 1; + + m_selection.Empty(); + + UpdateDisplay(); + + return true; + } + wxDataViewTreeNode * node = FindNode(parent); wxCHECK_MSG( node != NULL, false, "item not found" ); @@ -2140,367 +2487,126 @@ bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item) le.SetModel(GetOwner()->GetModel()); le.SetItem(item); parent->GetEventHandler()->ProcessEvent(le); - - return true; -} - -bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col ) -{ - // NOTE: to be valid, we cannot use e.g. INT_MAX - 1 -/*#define MAX_VIRTUAL_WIDTH 100000 - - wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); - m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); - Refresh( true, &rect ); - - return true; -*/ - SortPrepare(); - g_model->Resort(); - - //Send event - wxWindow *parent = GetParent(); - wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); - le.SetEventObject(parent); - le.SetModel(GetOwner()->GetModel()); - le.SetItem(item); - le.SetColumn(col); - le.SetDataViewColumn(GetOwner()->GetColumn(col)); - parent->GetEventHandler()->ProcessEvent(le); - - return true; -} - -bool wxDataViewMainWindow::Cleared() -{ - SortPrepare(); - - 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::ScrollTo( int rows, int column ) -{ - int x, y; - m_owner->GetScrollPixelsPerUnit( &x, &y ); - int sy = rows*m_lineHeight/y; - int sx = 0; - if( column != -1 ) - { - wxRect rect = GetClientRect(); - int colnum = 0; - int x_start = 0, x_end = 0, w = 0; - int xx, yy, xe; - m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); - for (x_start = 0; colnum < column; colnum++) - { - wxDataViewColumn *col = GetOwner()->GetColumn(colnum); - if (col->IsHidden()) - continue; // skip it! - - w = col->GetWidth(); - x_start += w; - } - - 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 ); -} - -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 - ); - } - } +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 - wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); - if (!expander) - { - // TODO: last column for RTL support - expander = GetOwner()->GetColumn( 0 ); - GetOwner()->SetExpanderColumn(expander); - } + wxRect rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight ); + m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); + Refresh( true, &rect ); - // 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(); + return true; +*/ + SortPrepare(); + g_model->Resort(); - if (col->IsHidden()) - continue; // skipt it! + //Send event + wxWindow *parent = GetParent(); + wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId()); + le.SetEventObject(parent); + le.SetModel(GetOwner()->GetModel()); + le.SetItem(item); + le.SetColumn(col); + le.SetDataViewColumn(GetOwner()->GetColumn(col)); + parent->GetEventHandler()->ProcessEvent(le); + return true; +} - 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(); - - if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem)) - continue; - - model->GetValue( value, dataitem, col->GetModelColumn()); - cell->SetValue( value ); +bool wxDataViewMainWindow::Cleared() +{ + DestroyTree(); - // update the y offset - cell_rect.y = item * m_lineHeight; + SortPrepare(); + BuildTree( GetOwner()->GetModel() ); - //Draw the expander here. - int indent = node->GetIndentLevel(); - if( col == expander ) - { - //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() ) - { - 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); - } - 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, 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 = GetRowCount() * m_lineHeight; - // 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.width = size.x - 2 * PADDING_RIGHTLEFT; + 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 = rows*m_lineHeight/y; + int sx = 0; + if( column != -1 ) + { + wxRect rect = GetClientRect(); + int colnum = 0; + int x_start = 0, x_end = 0, w = 0; + int xx, yy, xe; + m_owner->CalcUnscrolledPosition( rect.x, rect.y, &xx, &yy ); + for (x_start = 0; colnum < column; colnum++) + { + wxDataViewColumn *col = GetOwner()->GetColumn(colnum); + if (col->IsHidden()) + continue; // skip it! + + w = col->GetWidth(); + x_start += w; } - cell_rect.x += cell_rect.width; + 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 @@ -2839,9 +2945,16 @@ private: wxDataViewItem wxDataViewMainWindow::GetItemByRow(unsigned int row) const { - RowToItemJob job( row, -2 ); - Walker( m_root , job ); - return job.GetResult(); + if (!m_root) + { + return wxDataViewItem( (void*) row ); + } + else + { + RowToItemJob job( row, -2 ); + Walker( m_root , job ); + return job.GetResult(); + } } class RowToTreeNodeJob: public DoJob @@ -2914,9 +3027,16 @@ private: wxDataViewTreeNode * wxDataViewMainWindow::GetTreeNodeByRow(unsigned int row) { - RowToTreeNodeJob job( row , -2, m_root ); - Walker( m_root , job ); - return job.GetResult(); + if (!m_root) + { + return NULL; + } + else + { + RowToTreeNodeJob job( row , -2, m_root ); + Walker( m_root , job ); + return job.GetResult(); + } } wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const wxDataViewItem & item ) @@ -3103,7 +3223,19 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD 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 @@ -3157,26 +3289,33 @@ int wxDataViewMainWindow::GetRowByItem(const wxDataViewItem & item) if( model == NULL ) return -1; - if( !item.IsOk() ) - return -1; - - //Compose the a parent-chain of the finding item - ItemList list; - wxDataViewItem * pItem = NULL; - list.DeleteContents( true ); - wxDataViewItem it( item ); - while( it.IsOk() ) + if (!m_root) { - pItem = new wxDataViewItem( it ); - list.Insert( pItem ); - it = model->GetParent( it ); + return wxPtrToUInt( item.GetID() ); } - pItem = new wxDataViewItem( ); - list.Insert( pItem ); + else + { + if( !item.IsOk() ) + return -1; + + //Compose the a parent-chain of the finding item + ItemList list; + wxDataViewItem * pItem = NULL; + 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(); + ItemToRowJob job( item, list.begin() ); + Walker(m_root , job ); + return job.GetResult(); + } } void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node) @@ -3211,6 +3350,17 @@ void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataVie void wxDataViewMainWindow::BuildTree(wxDataViewModel * model) { + DestroyTree(); + + if (GetOwner()->GetModel()->IsIndexListModel()) + { + m_count = -1 ; + return; + } + + m_root = new wxDataViewTreeNode( NULL ); + m_root->SetHasChildren(true); + //First we define a invalid item to fetch the top-level elements wxDataViewItem item; SortPrepare(); @@ -3235,23 +3385,18 @@ void DestroyTreeHelper( wxDataViewTreeNode * node ) void wxDataViewMainWindow::DestroyTree() { - DestroyTreeHelper(m_root); - m_root->SetSubTreeCount(0); - m_count = 0 ; + if (m_root) + { + 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 ( HandleAsNavigationKey(event) ) + return; // no item -> nothing to do if (!HasCurrentRow()) @@ -3377,7 +3522,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Test whether the mouse is hovered on the tree item button bool hover = false; - if (GetOwner()->GetExpanderColumn() == col) + if ((m_root) && (GetOwner()->GetExpanderColumn() == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); if( node!=NULL && node->HasChildren() ) @@ -3392,12 +3537,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (m_underMouse && m_underMouse != node) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - Refresh(GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); } if (m_underMouse != node) { //wxLogMessage("Do the row: %d", current); - Refresh(current); + RefreshRow(current); } m_underMouse = node; } @@ -3410,7 +3555,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (m_underMouse != NULL) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); - Refresh(GetRowByItem(m_underMouse->GetItem())); + RefreshRow(GetRowByItem(m_underMouse->GetItem())); m_underMouse = NULL; } } @@ -3456,7 +3601,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) ((GetOwner()->GetExpanderColumn() != col) && (model->IsContainer(item)) && (!model->HasContainerColumns(item))); - + if (event.LeftDClick()) { if ( current == m_lineLastClicked ) @@ -3475,7 +3620,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); - le.SetItem( GetItemByRow(current) ); + le.SetItem( item ); le.SetEventObject(parent); le.SetModel(GetOwner()->GetModel()); @@ -3502,7 +3647,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) //Process the event of user clicking the expander bool expander = false; - if (GetOwner()->GetExpanderColumn() == col) + if ((m_root) && (GetOwner()->GetExpanderColumn() == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); if( node!=NULL && node->HasChildren() ) @@ -3558,10 +3703,22 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) } // notify cell about right click - // cell->... - - // Allow generation of context menu event - event.Skip(); + wxVariant value; + model->GetValue( value, item, col->GetModelColumn() ); + cell->SetValue( value ); + wxRect cell_rect( xpos, current * m_lineHeight, + col->GetWidth(), m_lineHeight ); + if (!cell->RightClick( event.GetPosition(), cell_rect, model, 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()) { @@ -3669,7 +3826,7 @@ wxDataViewItem wxDataViewMainWindow::GetSelection() const //----------------------------------------------------------------------------- // wxDataViewCtrl //----------------------------------------------------------------------------- -WX_DEFINE_LIST(wxDataViewColumnList); +WX_DEFINE_LIST(wxDataViewColumnList) IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl, wxDataViewCtrlBase) @@ -3693,11 +3850,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, long style, const wxValidator& validator ) { if (!wxControl::Create( parent, id, pos, size, - style | wxScrolledWindowStyle|wxSUNKEN_BORDER, validator)) + style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator)) return false; SetInitialSize(size); - + Init(); #ifdef __WXMAC__ @@ -3718,7 +3875,7 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, sizer->Add( m_headerArea, 0, wxGROW ); sizer->Add( m_clientArea, 1, wxGROW ); SetSizer( sizer ); - + return true; } @@ -3764,6 +3921,8 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) model->AddNotifier( m_notifier ); + m_clientArea->DestroyTree(); + m_clientArea->BuildTree(model); m_clientArea->UpdateDisplay(); @@ -3781,6 +3940,16 @@ bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) return true; } +bool wxDataViewCtrl::PrependColumn( wxDataViewColumn *col ) +{ + if (!wxDataViewCtrlBase::PrependColumn(col)) + return false; + + m_cols.Insert( col ); + OnColumnChange(); + return true; +} + void wxDataViewCtrl::OnColumnChange() { if (m_headerArea) @@ -3820,10 +3989,19 @@ 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; + m_cols.DeleteObject( col ); + m_cols.Insert( new_pos, col ); + + m_clientArea->UpdateDisplay(); +} + bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column ) { wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column ); - if (ret == NULL) + if (!ret) return false; m_cols.Erase(ret);