X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcb6cbecc890c65e15ade46ca416b4c353bb7e8f..826da45133baecd8a8a13af301a00bc00a1c8013:/src/generic/datavgen.cpp diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 21483c4910..ad90b57e70 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -34,6 +34,7 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/dcscreen.h" + #include "wx/frame.h" #endif #include "wx/stockitem.h" @@ -46,6 +47,7 @@ #include "wx/listimpl.cpp" #include "wx/imaglist.h" #include "wx/headerctrl.h" +#include "wx/dnd.h" //----------------------------------------------------------------------------- // classes @@ -91,7 +93,7 @@ public: protected: // implement/override wxHeaderCtrl functions by forwarding them to the main // control - virtual wxHeaderColumn& GetColumn(unsigned int idx) + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const { return *(GetOwner()->GetColumn(idx)); } @@ -187,11 +189,11 @@ private: { wxDataViewCtrl * const owner = GetOwner(); owner->ColumnMoved(owner->GetColumn(event.GetColumn()), - event.GetNewOrder()); + event.GetNewOrder()); } DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow) + wxDECLARE_NO_COPY_CLASS(wxDataViewHeaderWindow); }; BEGIN_EVENT_TABLE(wxDataViewHeaderWindow, wxHeaderCtrl) @@ -415,6 +417,9 @@ public: wxDataViewCtrl *GetOwner() { return m_owner; } const wxDataViewCtrl *GetOwner() const { return m_owner; } +#if wxUSE_DRAG_AND_DROP + wxBitmap CreateItemBitmap( unsigned int row, int &indent ); +#endif // wxUSE_DRAG_AND_DROP void OnPaint( wxPaintEvent &event ); void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event); void OnChar( wxKeyEvent &event ); @@ -483,6 +488,19 @@ public: void Expand( unsigned int row ) { OnExpanding( row ); } void Collapse( unsigned int row ) { OnCollapsing( row ); } + bool IsExpanded( unsigned int row ) const; + +#if wxUSE_DRAG_AND_DROP + bool EnableDragSource( const wxDataFormat &format ); + bool EnableDropTarget( const wxDataFormat &format ); + + void RemoveDropHint(); + wxDragResult OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); + bool OnDrop( wxDataFormat format, wxCoord x, wxCoord y ); + wxDragResult OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ); + void OnLeave(); +#endif // wxUSE_DRAG_AND_DROP + private: wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const; //We did not need this temporarily @@ -510,13 +528,23 @@ private: bool m_hasFocus; +#if wxUSE_DRAG_AND_DROP int m_dragCount; wxPoint m_dragStart; + bool m_dragEnabled; + wxDataFormat m_dragFormat; + + bool m_dropEnabled; + wxDataFormat m_dropFormat; + bool m_dropHint; + unsigned int m_dropHintLine; +#endif // wxUSE_DRAG_AND_DROP + // for double click logic unsigned int m_lineLastClicked, - m_lineBeforeLastClicked, - m_lineSelectSingleOnUp; + m_lineBeforeLastClicked, + m_lineSelectSingleOnUp; // the pen used to draw horiz/vertical rules wxPen m_penRule; @@ -555,7 +583,7 @@ public: virtual bool Cleared() { return m_mainWindow->Cleared(); } virtual void Resort() - { m_mainWindow->Resort(); } + { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; }; @@ -613,7 +641,7 @@ int wxDataViewRenderer::CalculateAlignment() const if (m_align == wxDVR_DEFAULT_ALIGNMENT) { if (GetOwner() == NULL) - return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; + return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL; return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL; } @@ -628,7 +656,7 @@ int wxDataViewRenderer::CalculateAlignment() const IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewCustomRenderer::wxDataViewCustomRenderer( const wxString &varianttype, - wxDataViewCellMode mode, int align ) : + wxDataViewCellMode mode, int align ) : wxDataViewRenderer( varianttype, mode, align ) { } @@ -676,8 +704,8 @@ wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { return new wxTextCtrl( parent, wxID_ANY, value, - wxPoint(labelRect.x,labelRect.y), - wxSize(labelRect.width,labelRect.height) ); + wxPoint(labelRect.x,labelRect.y), + wxSize(labelRect.width,labelRect.height) ); } bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value ) @@ -733,13 +761,13 @@ bool wxDataViewTextRendererAttr::Render( wxRect cell, wxDC *dc, int WXUNUSED(sta 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 ); + 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 ); } } @@ -857,8 +885,8 @@ bool wxDataViewToggleRenderer::Render( wxRect cell, wxDC *dc, int WXUNUSED(state } bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell), - wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col) + wxDataViewModel *model, + const wxDataViewItem & item, unsigned int col) { bool value = !m_toggle; wxVariant variant = value; @@ -1021,7 +1049,7 @@ wxSize wxDataViewDateRenderer::GetSize() const } bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model, - const wxDataViewItem & item, unsigned int col ) + const wxDataViewItem & item, unsigned int col ) { wxVariant variant; model->GetValue( variant, item, col ); @@ -1047,7 +1075,7 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *m IMPLEMENT_CLASS(wxDataViewIconTextRenderer, wxDataViewCustomRenderer) wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( - const wxString &varianttype, wxDataViewCellMode mode, int align ) : +const wxString &varianttype, wxDataViewCellMode mode, int align ) : wxDataViewCustomRenderer( varianttype, mode, align ) { SetMode(mode); @@ -1101,19 +1129,145 @@ wxSize wxDataViewIconTextRenderer::GetSize() const wxControl * wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow * WXUNUSED(parent), - wxRect WXUNUSED(labelRect), - const wxVariant& WXUNUSED(value)) + wxRect WXUNUSED(labelRect), + const wxVariant& WXUNUSED(value)) { return NULL; } bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), - wxVariant& WXUNUSED(value)) + wxVariant& WXUNUSED(value)) { return false; } +//----------------------------------------------------------------------------- +// wxDataViewDropTarget +//----------------------------------------------------------------------------- + +#if wxUSE_DRAG_AND_DROP + +class wxBitmapCanvas: public wxWindow +{ +public: + wxBitmapCanvas( wxWindow *parent, const wxBitmap &bitmap, const wxSize &size ) : + wxWindow( parent, wxID_ANY, wxPoint(0,0), size ) + { + m_bitmap = bitmap; + Connect( wxEVT_PAINT, wxPaintEventHandler(wxBitmapCanvas::OnPaint) ); + } + + void OnPaint( wxPaintEvent &WXUNUSED(event) ) + { + wxPaintDC dc(this); + dc.DrawBitmap( m_bitmap, 0, 0); + } + + wxBitmap m_bitmap; +}; + +class wxDataViewDropSource: public wxDropSource +{ +public: + wxDataViewDropSource( wxDataViewMainWindow *win, unsigned int row ) : + wxDropSource( win ) + { + m_win = win; + m_row = row; + m_hint = NULL; + } + + ~wxDataViewDropSource() + { + delete m_hint; + } + + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) + { + wxPoint pos = wxGetMousePosition(); + + if (!m_hint) + { + int liney = m_win->GetLineStart( m_row ); + int linex = 0; + m_win->GetOwner()->CalcUnscrolledPosition( 0, liney, NULL, &liney ); + m_win->ClientToScreen( &linex, &liney ); + m_dist_x = pos.x - linex; + m_dist_y = pos.y - liney; + + int indent = 0; + wxBitmap ib = m_win->CreateItemBitmap( m_row, indent ); + m_dist_x -= indent; + m_hint = new wxFrame( m_win->GetParent(), wxID_ANY, wxEmptyString, + wxPoint(pos.x - m_dist_x, pos.y + 5 ), + ib.GetSize(), + wxFRAME_TOOL_WINDOW | + wxFRAME_FLOAT_ON_PARENT | + wxFRAME_NO_TASKBAR | + wxNO_BORDER ); + new wxBitmapCanvas( m_hint, ib, ib.GetSize() ); + m_hint->Show(); + } + else + { + m_hint->Move( pos.x - m_dist_x, pos.y + 5 ); + m_hint->SetTransparent( 128 ); + } + + return false; + } + + wxDataViewMainWindow *m_win; + unsigned int m_row; + wxFrame *m_hint; + int m_dist_x,m_dist_y; +}; + + +class wxDataViewDropTarget: public wxDropTarget +{ +public: + wxDataViewDropTarget( wxDataObject *obj, wxDataViewMainWindow *win ) : + wxDropTarget( obj ) + { + m_win = win; + } + + virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + return m_win->OnDragOver( format, x, y, def); + } + + virtual bool OnDrop( wxCoord x, wxCoord y ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return false; + return m_win->OnDrop( format, x, y ); + } + + virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) + { + wxDataFormat format = GetMatchingPair(); + if (format == wxDF_INVALID) + return wxDragNone; + if (!GetData()) + return wxDragNone; + return m_win->OnData( format, x, y, def ); + } + + virtual void OnLeave() + { m_win->OnLeave(); } + + wxDataViewMainWindow *m_win; +}; + +#endif // wxUSE_DRAG_AND_DROP + //----------------------------------------------------------------------------- // wxDataViewRenameTimer //----------------------------------------------------------------------------- @@ -1170,8 +1324,16 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i m_lineHeight = wxMax( 17, GetCharHeight() + 2 ); // 17 = mini icon height + 1 +#if wxUSE_DRAG_AND_DROP m_dragCount = 0; m_dragStart = wxPoint(0,0); + + m_dragEnabled = false; + m_dropEnabled = false; + m_dropHint = false; + m_dropHintLine = (unsigned int) -1; +#endif // wxUSE_DRAG_AND_DROP + m_lineLastClicked = (unsigned int) -1; m_lineBeforeLastClicked = (unsigned int) -1; m_lineSelectSingleOnUp = (unsigned int) -1; @@ -1202,6 +1364,259 @@ wxDataViewMainWindow::~wxDataViewMainWindow() delete m_renameTimer; } + +#if wxUSE_DRAG_AND_DROP +bool wxDataViewMainWindow::EnableDragSource( const wxDataFormat &format ) +{ + m_dragFormat = format; + m_dragEnabled = format != wxDF_INVALID; + + return true; +} + +bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) +{ + m_dropFormat = format; + m_dropEnabled = format != wxDF_INVALID; + + if (m_dropEnabled) + SetDropTarget( new wxDataViewDropTarget( new wxCustomDataObject( format ), this ) ); + + return true; +} + +void wxDataViewMainWindow::RemoveDropHint() +{ + if (m_dropHint) + { + m_dropHint = false; + RefreshRow( m_dropHintLine ); + m_dropHintLine = (unsigned int) -1; + } +} + +wxDragResult wxDataViewMainWindow::OnDragOver( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ) +{ + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); + + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + { + RemoveDropHint(); + return wxDragNone; + } + + wxDataViewItem item = GetItemByRow( row ); + + wxDataViewModel *model = GetOwner()->GetModel(); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + if (!m_owner->HandleWindowEvent( event )) + { + RemoveDropHint(); + return wxDragNone; + } + + if (!event.IsAllowed()) + { + RemoveDropHint(); + return wxDragNone; + } + + + if (m_dropHint && (row != m_dropHintLine)) + RefreshRow( m_dropHintLine ); + m_dropHint = true; + m_dropHintLine = row; + RefreshRow( row ); + + return def; +} + +bool wxDataViewMainWindow::OnDrop( wxDataFormat format, wxCoord x, wxCoord y ) +{ + RemoveDropHint(); + + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); + + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + return false; + + wxDataViewItem item = GetItemByRow( row ); + + wxDataViewModel *model = GetOwner()->GetModel(); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + if (!m_owner->HandleWindowEvent( event )) + return false; + + if (!event.IsAllowed()) + return false; + + return true; +} + +wxDragResult wxDataViewMainWindow::OnData( wxDataFormat format, wxCoord x, wxCoord y, wxDragResult def ) +{ + int xx = x; + int yy = y; + m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy ); + unsigned int row = GetLineAt( yy ); + + if ((row >= GetRowCount()) || (yy > GetEndOfLastCol())) + return wxDragNone; + + wxDataViewItem item = GetItemByRow( row ); + + wxDataViewModel *model = GetOwner()->GetModel(); + + wxCustomDataObject *obj = (wxCustomDataObject *) GetDropTarget()->GetDataObject(); + + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + event.SetDataFormat( format ); + event.SetDataSize( obj->GetSize() ); + event.SetDataBuffer( obj->GetData() ); + if (!m_owner->HandleWindowEvent( event )) + return wxDragNone; + + if (!event.IsAllowed()) + return wxDragNone; + + return def; +} + +void wxDataViewMainWindow::OnLeave() +{ + RemoveDropHint(); +} + +wxBitmap wxDataViewMainWindow::CreateItemBitmap( unsigned int row, int &indent ) +{ + int height = GetLineHeight( row ); + int width = 0; + unsigned int cols = GetOwner()->GetColumnCount(); + unsigned int col; + for (col = 0; col < cols; col++) + { + wxDataViewColumn *column = GetOwner()->GetColumnAt(col); + if (column->IsHidden()) + continue; // skip it! + width += column->GetWidth(); + } + + indent = 0; + if (!IsVirtualList()) + { + wxDataViewTreeNode *node = GetTreeNodeByRow(row); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; //try to use the m_lineHeight as the expander space + + if(!node->HasChildren()) + delete node; + } + width -= indent; + + wxBitmap bitmap( width, height ); + wxMemoryDC dc( bitmap ); + dc.SetFont( GetFont() ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( 0,0,width,height ); + + wxDataViewModel *model = m_owner->GetModel(); + + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); + if (!expander) + { + // TODO-RTL: last column for RTL support + expander = GetOwner()->GetColumnAt( 0 ); + GetOwner()->SetExpanderColumn(expander); + } + + + int x = 0; + for (col = 0; col < cols; col++) + { + wxDataViewColumn *column = GetOwner()->GetColumnAt( col ); + wxDataViewRenderer *cell = column->GetRenderer(); + + if (column->IsHidden()) + continue; // skip it! + + width = column->GetWidth(); + + if (column == expander) + width -= indent; + + wxVariant value; + wxDataViewItem item = GetItemByRow( row ); + model->GetValue( value, item, column->GetModelColumn()); + cell->SetValue( value ); + + if (cell->GetWantsAttr()) + { + wxDataViewItemAttr attr; + bool ret = model->GetAttr( item, column->GetModelColumn(), attr ); + if (ret) + cell->SetAttr( attr ); + cell->SetHasAttr( ret ); + } + + wxSize size = cell->GetSize(); + size.x = wxMin( 2*PADDING_RIGHTLEFT + size.x, width ); + size.y = height; + wxRect item_rect(x, 0, size.x, size.y); + + int align = cell->CalculateAlignment(); + // horizontal alignment: + item_rect.x = x; + if (align & wxALIGN_CENTER_HORIZONTAL) + item_rect.x = x + (width / 2) - (size.x / 2); + else if (align & wxALIGN_RIGHT) + item_rect.x = x + width - size.x; + //else: wxALIGN_LEFT is the default + + // vertical alignment: + item_rect.y = 0; + if (align & wxALIGN_CENTER_VERTICAL) + item_rect.y = (height / 2) - (size.y / 2); + else if (align & wxALIGN_BOTTOM) + item_rect.y = height - size.y; + //else: wxALIGN_TOP is the default + + // add padding + item_rect.x += PADDING_RIGHTLEFT; + item_rect.width = size.x - 2 * PADDING_RIGHTLEFT; + + //dc.SetClippingRegion( item_rect ); + cell->Render( item_rect, &dc, 0 ); + //dc.DestroyClippingRegion(); + + x += width; + } + + return bitmap; +} + +#endif // wxUSE_DRAG_AND_DROP + + void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxDataViewModel *model = GetOwner()->GetModel(); @@ -1226,7 +1641,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) unsigned int item_start = GetLineAt( wxMax(0,update.y) ); unsigned int item_count = wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1), - (int)(GetRowCount( ) - item_start)); + (int)(GetRowCount( ) - item_start)); unsigned int item_last = item_start + item_count; // compute which columns needs to be redrawn @@ -1320,6 +1735,17 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } +#if wxUSE_DRAG_AND_DROP + if (m_dropHint) + { + wxRect rect( x_start, GetLineStart( m_dropHintLine ), + x_last, GetLineHeight( m_dropHintLine ) ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + dc.DrawRectangle( rect ); + } +#endif // wxUSE_DRAG_AND_DROP + wxDataViewColumn *expander = GetOwner()->GetExpanderColumn(); if (!expander) { @@ -1409,8 +1835,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) else wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag); } - //force the expander column to left-center align - cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); + //force the expander column to left-center align + cell->SetAlignment( wxALIGN_CENTER_VERTICAL ); } if (node && !node->HasChildren()) { @@ -1477,7 +1903,11 @@ void wxDataViewMainWindow::OnRenameTimer() // We have to call this here because changes may just have // been made and no screen update taken place. if ( m_dirty ) + { + // TODO: use wxTheApp->SafeYieldFor(NULL, wxEVT_CATEGORY_UI) instead + // (needs to be tested!) wxSafeYield(); + } int xpos = 0; unsigned int cols = GetOwner()->GetColumnCount(); @@ -1492,17 +1922,30 @@ void wxDataViewMainWindow::OnRenameTimer() break; xpos += c->GetWidth(); } - wxRect labelRect( xpos, - GetLineStart( m_currentRow ), - m_currentCol->GetWidth(), - GetLineHeight( m_currentRow ) ); + + // we have to take an expander column into account and compute its indentation + // to get the editor at the correct x position where the actual text is + int indent = 0; + if (!IsVirtualList() && GetOwner()->GetExpanderColumn() == m_currentCol) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow); + indent = GetOwner()->GetIndent() * node->GetIndentLevel(); + indent = indent + m_lineHeight; + + if(!node->HasChildren()) + delete node; + } + + wxRect labelRect( xpos + indent, + GetLineStart( m_currentRow ), + m_currentCol->GetWidth() - indent, + GetLineHeight( m_currentRow ) ); GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y, - &labelRect.x, &labelRect.y); + &labelRect.x, &labelRect.y); wxDataViewItem item = GetItemByRow( m_currentRow ); m_currentCol->GetRenderer()->StartEditing( item, labelRect ); - } //------------------------------------------------------------------ @@ -1567,7 +2010,7 @@ bool Walker( wxDataViewTreeNode * node, DoJob & func ) continue; case DoJob::CONT: default: - ; + ; } } return false; @@ -1613,7 +2056,7 @@ bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxData static void DestroyTreeHelper( wxDataViewTreeNode * node); bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent, - const wxDataViewItem& item) + const wxDataViewItem& item) { if (!m_root) { @@ -1851,7 +2294,7 @@ unsigned int wxDataViewMainWindow::GetLastVisibleRow() { wxSize client_size = GetClientSize(); m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, - &client_size.x, &client_size.y ); + &client_size.x, &client_size.y ); //we should deal with the pixel here unsigned int row = GetLineAt(client_size.y) - 1; @@ -2032,7 +2475,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow ) void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event) { wxCHECK_RET( newCurrent < GetRowCount(), - _T("invalid item index in OnArrowChar()") ); + _T("invalid item index in OnArrowChar()") ); // if there is no selection, we cannot move it anywhere if (!HasCurrentRow()) @@ -2162,14 +2605,14 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const unsigned int yy = 0; for (;;) { - const wxDataViewTreeNode* node = GetTreeNodeByRow(row); - if (!node) - { - // not really correct... - return row + ((y-yy) / m_lineHeight); - } + const wxDataViewTreeNode* node = GetTreeNodeByRow(row); + if (!node) + { + // not really correct... + return row + ((y-yy) / m_lineHeight); + } - wxDataViewItem item = node->GetItem(); + wxDataViewItem item = node->GetItem(); if (node && !node->HasChildren()) { @@ -2178,11 +2621,11 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const wxDELETE(node); } - unsigned int cols = GetOwner()->GetColumnCount(); - unsigned int col; - int height = m_lineHeight; - for (col = 0; col < cols; col++) - { + 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! @@ -2196,13 +2639,13 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const wxDataViewRenderer *renderer2 = const_cast(renderer); renderer2->SetValue( value ); height = wxMax( height, renderer->GetSize().y ); - } + } - yy += height; - if (y < yy) - return row; + yy += height; + if (y < yy) + return row; - row++; + row++; } } @@ -2224,7 +2667,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const { // 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); + wxDELETE(node); } int height = m_lineHeight; @@ -2266,7 +2709,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = node->GetItem(); return DoJob::OK; } @@ -2294,7 +2737,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = wxDataViewItem( n ); return DoJob::OK; } @@ -2337,7 +2780,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = node; return DoJob::OK; } @@ -2371,7 +2814,7 @@ public: { current ++; if( current == static_cast(row)) - { + { ret = new wxDataViewTreeNode( parent ); ret->SetItem( wxDataViewItem( n )); ret->SetHasChildren(false); @@ -2411,10 +2854,30 @@ wxDataViewEvent wxDataViewMainWindow::SendExpanderEvent( wxEventType type, const return le; } + +bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const +{ + if (IsVirtualList()) + return false; + + wxDataViewTreeNode * node = GetTreeNodeByRow(row); + if (!node) + return false; + + if (!node->HasChildren()) + { + delete node; + return false; + } + + return node->IsOpen(); +} + + void wxDataViewMainWindow::OnExpanding( unsigned int row ) { if (IsVirtualList()) - return; + return; wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) @@ -2423,22 +2886,39 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) { if( !node->IsOpen()) { - wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); - //Check if the user prevent expanding - if( e.GetSkipped() ) + wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,node->GetItem()); + //Check if the user prevent expanding + if( e.GetSkipped() ) return; - node->ToggleOpen(); - //Here I build the children of current node - if( node->GetChildrenNumber() == 0 ) - { - SortPrepare(); - ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); - } - m_count = -1; - UpdateDisplay(); - //Send the expanded event - SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); + node->ToggleOpen(); + //Here I build the children of current node + if( node->GetChildrenNumber() == 0 ) + { + SortPrepare(); + ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node); + } + + // By expanding the node all row indices that are currently in the selection list + // and are greater than our node have become invalid. So we have to correct that now. + const unsigned rowAdjustment = node->GetSubTreeCount(); + for(unsigned i=0; i row) + ChangeCurrentRow(m_currentRow + rowAdjustment); + + m_count = -1; + UpdateDisplay(); + //Send the expanded event + SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,node->GetItem()); } else { @@ -2456,7 +2936,7 @@ void wxDataViewMainWindow::OnExpanding( unsigned int row ) void wxDataViewMainWindow::OnCollapsing(unsigned int row) { if (IsVirtualList()) - return; + return; wxDataViewTreeNode * node = GetTreeNodeByRow(row); if( node != NULL ) @@ -2468,7 +2948,55 @@ void wxDataViewMainWindow::OnCollapsing(unsigned int row) wxDataViewEvent e = SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,node->GetItem()); if( e.GetSkipped() ) return; + + // Find out if there are selected items below the current node. + bool selectCollapsingRow = false; + const unsigned rowAdjustment = node->GetSubTreeCount(); + unsigned maxRowToBeTested = row + rowAdjustment; + for(unsigned i=0; i row && testRow <= maxRowToBeTested) + { + selectCollapsingRow = true; + // get out as soon as we have found a node that is selected + break; + } + } + node->ToggleOpen(); + + // If the node to be closed has selected items the user won't see those any longer. + // We select the collapsing node in this case. + if(selectCollapsingRow) + { + SelectAllRows(false); + ChangeCurrentRow(row); + SelectRow(row, true); + SendSelectionChangedEvent(GetItemByRow(row)); + } + else + { + // if there were no selected items below our node we still need to "fix" the + // selection list to adjust for the changing of the row indices. + // We actually do the opposite of what we are doing in OnExpanding(). + for(unsigned i=0; i row && m_currentRow <= maxRowToBeTested) + ChangeCurrentRow(row); + else if(m_currentRow > row) + ChangeCurrentRow(m_currentRow - rowAdjustment); + } + m_count = -1; UpdateDisplay(); SendExpanderEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,nd->GetItem()); @@ -2499,6 +3027,9 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item if( model == NULL ) return NULL; + if (!item.IsOk()) + return m_root; + //Compose the a parent-chain of the finding item ItemList list; list.DeleteContents( true ); @@ -2532,7 +3063,7 @@ wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item if (nodes[i]->GetItem() == (**iter)) { if (nodes[i]->GetItem() == item) - return nodes[i]; + return nodes[i]; node = nodes[i]; found = true; @@ -2581,10 +3112,10 @@ wxRect wxDataViewMainWindow::GetItemRect( const wxDataViewItem & item, const wxD wxDataViewColumn *col = NULL; for( int i = 0, cols = GetOwner()->GetColumnCount(); i < cols; i ++ ) { - col = GetOwner()->GetColumnAt( i ); - x += col->GetWidth(); - if( GetOwner()->GetColumnAt(i+1) == column ) - break; + col = GetOwner()->GetColumnAt( i ); + x += col->GetWidth(); + if( GetOwner()->GetColumnAt(i+1) == column ) + break; } int w = col->GetWidth(); m_owner->CalcScrolledPosition( x, y, &x, &y ); @@ -2613,7 +3144,7 @@ class ItemToRowJob : public DoJob public: ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter) : m_iter(iter), - item(item_) + item(item_) { ret = -1; } @@ -2621,22 +3152,22 @@ public: //Maybe binary search will help to speed up this process virtual int operator() ( wxDataViewTreeNode * node) { - ret ++; - if( node->GetItem() == item ) - { - return DoJob::OK; - } + ret ++; + if( node->GetItem() == item ) + { + return DoJob::OK; + } - if( node->GetItem() == **m_iter ) - { - m_iter++; - return DoJob::CONT; - } - else - { - ret += node->GetSubTreeCount(); - return DoJob::IGR; - } + if( node->GetItem() == **m_iter ) + { + m_iter++; + return DoJob::CONT; + } + else + { + ret += node->GetSubTreeCount(); + return DoJob::IGR; + } } @@ -2699,6 +3230,7 @@ static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wx wxDataViewItemArray children; unsigned int num = model->GetChildren( item, children); + unsigned int index = 0; while( index < num ) { @@ -2761,7 +3293,7 @@ void wxDataViewMainWindow::DestroyTree() { if (!IsVirtualList()) { - ::DestroyTreeHelper(m_root); + ::DestroyTreeHelper(m_root); m_count = 0; m_root = NULL; } @@ -2787,7 +3319,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) { case WXK_RETURN: { - if (m_currentRow > 0) + if (m_currentRow >= 0) { wxWindow *parent = GetParent(); wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId()); @@ -2810,11 +3342,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event ) break; //Add the process for tree expanding/collapsing case WXK_LEFT: - OnCollapsing(m_currentRow); - break; - case WXK_RIGHT: - OnExpanding( m_currentRow); - break; + OnCollapsing(m_currentRow); + break; + case WXK_RIGHT: + OnExpanding( m_currentRow); + break; case WXK_END: if (!IsEmpty()) OnArrowChar( GetRowCount() - 1, event ); @@ -2888,14 +3420,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewRenderer *cell = col->GetRenderer(); unsigned int current = GetLineAt( y ); - if ((current > GetRowCount()) || (x > GetEndOfLastCol())) + if ((current >= GetRowCount()) || (x > GetEndOfLastCol())) { // Unselect all if below the last row ? return; } //Test whether the mouse is hovered on the tree item button - bool hover = false; + bool hoverOverExpander = false; if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) { wxDataViewTreeNode * node = GetTreeNodeByRow(current); @@ -2903,14 +3435,16 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { int indent = node->GetIndentLevel(); indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - if( rect.Contains( x, y) ) + + // we make the rectangle we are looking in a bit bigger than the actual + // visual expander so the user can hit that little thing reliably + wxRect rect( xpos + indent, + GetLineStart( current ) + (GetLineHeight(current) - m_lineHeight)/2, + m_lineHeight, m_lineHeight); + if( rect.Contains(x, y) ) { //So the mouse is over the expander - hover = true; + hoverOverExpander = true; if (m_underMouse && m_underMouse != node) { //wxLogMessage("Undo the row: %d", GetRowByItem(m_underMouse->GetItem())); @@ -2927,7 +3461,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (node!=NULL && !node->HasChildren()) delete node; } - if (!hover) + if (!hoverOverExpander) { if (m_underMouse != NULL) { @@ -2939,6 +3473,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewModel *model = GetOwner()->GetModel(); +#if wxUSE_DRAG_AND_DROP if (event.Dragging()) { if (m_dragCount == 0) @@ -2956,7 +3491,29 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) if (event.LeftIsDown()) { + m_owner->CalcUnscrolledPosition( m_dragStart.x, m_dragStart.y, &m_dragStart.x, &m_dragStart.y ); + unsigned int drag_item_row = GetLineAt( m_dragStart.y ); + wxDataViewItem item = GetItemByRow( drag_item_row ); + // Notify cell about drag + wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, m_owner->GetId() ); + event.SetEventObject( m_owner ); + event.SetItem( item ); + event.SetModel( model ); + if (!m_owner->HandleWindowEvent( event )) + return; + + if (!event.IsAllowed()) + return; + + wxDataObject *obj = event.GetDataObject(); + if (!obj) + return; + + wxDataViewDropSource drag( this, drag_item_row ); + drag.SetData( *obj ); + /* wxDragResult res = */ drag.DoDragDrop(); + delete obj; } return; } @@ -2964,8 +3521,9 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { m_dragCount = 0; } +#endif // wxUSE_DRAG_AND_DROP - bool forceClick = false; + bool simulateClick = false; if (event.ButtonDClick()) { @@ -2976,12 +3534,17 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) wxDataViewItem item = GetItemByRow(current); bool ignore_other_columns = ((GetOwner()->GetExpanderColumn() != col) && - (model->IsContainer(item)) && - (!model->HasContainerColumns(item))); + (model->IsContainer(item)) && + (!model->HasContainerColumns(item))); if (event.LeftDClick()) { - if ( current == m_lineLastClicked ) + if(hoverOverExpander) + { + // a double click on the expander will be converted into a "simulated" normal click + simulateClick = true; + } + else if ( current == m_lineLastClicked ) { if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE)) { @@ -2989,7 +3552,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + col->GetWidth(), GetLineHeight( current ) ); cell->Activate( cell_rect, model, item, col->GetModelColumn() ); } @@ -3009,47 +3572,22 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) { // The first click was on another item, so don't interpret this as // a double click, but as a simple click instead - forceClick = true; + simulateClick = true; } } - if (event.LeftUp()) + if (event.LeftUp() && !hoverOverExpander) { if (m_lineSelectSingleOnUp != (unsigned int)-1) { // select single line SelectAllRows( false ); SelectRow( m_lineSelectSingleOnUp, true ); + SendSelectionChangedEvent( GetItemByRow(m_lineSelectSingleOnUp) ); } - //Process the event of user clicking the expander - bool expander = false; - if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col)) - { - wxDataViewTreeNode * node = GetTreeNodeByRow(current); - if( node!=NULL && node->HasChildren() ) - { - int indent = node->GetIndentLevel(); - indent = GetOwner()->GetIndent()*indent; - wxRect rect( xpos + indent + EXPANDER_MARGIN, - GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, - m_lineHeight-2*EXPANDER_MARGIN, - m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET); - - if( rect.Contains( x, y) ) - { - expander = true; - if( node->IsOpen() ) - OnCollapsing(current); - else - OnExpanding( current ); - } - } - if (node && !node->HasChildren()) - delete node; - } //If the user click the expander, we do not do editing even if the column with expander are editable - if (m_lastOnSame && !expander && !ignore_other_columns) + if (m_lastOnSame && !ignore_other_columns) { if ((col == m_currentCol) && (current == m_currentRow) && (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) ) @@ -3061,7 +3599,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) m_lastOnSame = false; m_lineSelectSingleOnUp = (unsigned int)-1; } - else + else if(!event.LeftUp()) { // This is necessary, because after a DnD operation in // from and to ourself, the up event is swallowed by the @@ -3098,7 +3636,18 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) else if (event.MiddleDown()) { } - if (event.LeftDown() || forceClick) + + if((event.LeftDown() || simulateClick) && hoverOverExpander) + { + wxDataViewTreeNode* node = GetTreeNodeByRow(current); + // hoverOverExpander being true tells us that our node must be valid and have children. + // So we don't need any extra checks. + if( node->IsOpen() ) + OnCollapsing(current); + else + OnExpanding(current); + } + else if ((event.LeftDown() || simulateClick) && !hoverOverExpander) { SetFocus(); @@ -3137,7 +3686,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) ChangeCurrentRow(current); unsigned int lineFrom = oldCurrentRow, - lineTo = current; + lineTo = current; if ( lineTo < lineFrom ) { @@ -3163,7 +3712,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // Update selection here... m_currentCol = col; - m_lastOnSame = !forceClick && ((col == oldCurrentCol) && + m_lastOnSame = !simulateClick && ((col == oldCurrentCol) && (current == oldCurrentRow)) && oldWasSelected; // Call LeftClick after everything else as under GTK+ @@ -3174,7 +3723,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) model->GetValue( value, item, col->GetModelColumn() ); cell->SetValue( value ); wxRect cell_rect( xpos, GetLineStart( current ), - col->GetWidth(), GetLineHeight( current ) ); + col->GetWidth(), GetLineHeight( current ) ); /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn()); } } @@ -3239,11 +3788,11 @@ void wxDataViewCtrl::Init() } bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, - long style, const wxValidator& validator ) + const wxPoint& pos, const wxSize& size, + long style, const wxValidator& validator ) { - if ( (style & wxBORDER_MASK) == 0) - style |= wxBORDER_SUNKEN; +// if ( (style & wxBORDER_MASK) == 0) +// style |= wxBORDER_SUNKEN; Init(); @@ -3275,10 +3824,15 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, return true; } +wxBorder wxDataViewCtrl::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + #ifdef __WXMSW__ WXLRESULT wxDataViewCtrl::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) + WXWPARAM wParam, + WXLPARAM lParam) { WXLRESULT rc = wxDataViewCtrlBase::MSWWindowProc(nMsg, wParam, lParam); @@ -3298,7 +3852,7 @@ wxSize wxDataViewCtrl::GetSizeAvailableForScrollTarget(const wxSize& size) { wxSize newsize = size; if (!HasFlag(wxDV_NO_HEADER) && (m_headerArea)) - newsize.y -= m_headerArea->GetSize().y; + newsize.y -= m_headerArea->GetSize().y; return newsize; } @@ -3341,6 +3895,20 @@ bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) return true; } +#if wxUSE_DRAG_AND_DROP + +bool wxDataViewCtrl::EnableDragSource( const wxDataFormat &format ) +{ + return m_clientArea->EnableDragSource( format ); +} + +bool wxDataViewCtrl::EnableDropTarget( const wxDataFormat &format ) +{ + return m_clientArea->EnableDropTarget( format ); +} + +#endif // wxUSE_DRAG_AND_DROP + bool wxDataViewCtrl::AppendColumn( wxDataViewColumn *col ) { if (!wxDataViewCtrlBase::AppendColumn(col)) @@ -3412,7 +3980,7 @@ wxDataViewColumn *wxDataViewCtrl::GetColumnAt(unsigned int pos) const // columns can't be reordered if there is no header window which allows // to do this const unsigned idx = m_headerArea ? m_headerArea->GetColumnsOrder()[pos] - : pos; + : pos; return GetColumn(idx); } @@ -3430,7 +3998,7 @@ int wxDataViewCtrl::GetColumnIndex(const wxDataViewColumn *column) const } void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col), - unsigned int WXUNUSED(new_pos)) + unsigned int WXUNUSED(new_pos)) { // do _not_ reorder m_cols elements here, they should always be in the // order in which columns were added, we only display the columns in @@ -3480,7 +4048,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const { return m_sortingColumnIdx == wxNOT_FOUND ? NULL - : GetColumn(m_sortingColumnIdx); + : GetColumn(m_sortingColumnIdx); } //Selection code with wxDataViewItem as parameters @@ -3505,18 +4073,33 @@ int wxDataViewCtrl::GetSelections( wxDataViewItemArray & sel ) const void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel ) { wxDataViewSelection selection(wxDataViewSelectionCmp); + + wxDataViewItem last_parent; + int len = sel.GetCount(); for( int i = 0; i < len; i ++ ) { - int row = m_clientArea->GetRowByItem( sel[i] ); + wxDataViewItem item = sel[i]; + wxDataViewItem parent = GetModel()->GetParent( item ); + if (parent) + { + if (parent != last_parent) + ExpandAncestors(item); + } + + last_parent = parent; + int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) selection.Add( static_cast(row) ); } + m_clientArea->SetSelections( selection ); } void wxDataViewCtrl::Select( const wxDataViewItem & item ) { + ExpandAncestors( item ); + int row = m_clientArea->GetRowByItem( item ); if( row >= 0 ) { @@ -3640,6 +4223,10 @@ void wxDataViewCtrl::EnsureVisible( int row, int column ) void wxDataViewCtrl::EnsureVisible( const wxDataViewItem & item, const wxDataViewColumn * column ) { + ExpandAncestors( item ); + + m_clientArea->RecalculateDisplay(); + int row = m_clientArea->GetRowByItem(item); if( row >= 0 ) { @@ -3685,7 +4272,16 @@ void wxDataViewCtrl::Collapse( const wxDataViewItem & item ) m_clientArea->Collapse(row); } - #endif +bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const +{ + int row = m_clientArea->GetRowByItem( item ); + if (row != -1) + return m_clientArea->IsExpanded(row); + return false; +} + + +#endif // !wxUSE_GENERICDATAVIEWCTRL #endif