#include "wx/icon.h"
#include "wx/list.h"
#include "wx/listimpl.cpp"
+#include "wx/imaglist.h"
//-----------------------------------------------------------------------------
// classes
// 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
//-----------------------------------------------------------------------------
wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
{ return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
- int m_scrollOffsetX;
- int m_buttonHeight;
- bool m_delayedUpdate;
+ int m_scrollOffsetX;
+ int m_buttonHeight;
+ bool m_vetoColumnDrag;
+ bool m_delayedUpdate;
+ wxImageList *m_imageList;
private:
DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
{
}
- 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; }
}
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();
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();
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);
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 );
bool Cleared();
void Resort()
{
- if (m_root)
+ if (!IsVirtualList())
{
SortPrepare();
m_root->Resort();
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; }
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 );
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 );
}
void wxDataViewRenderer::SetAlignment( int align )
-{
+{
m_align=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;
}
SetAlignment(align);
SetFlags(flags);
- Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width);
+ Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
}
wxDataViewColumn::~wxDataViewColumn()
m_scrollOffsetX = 0;
m_delayedUpdate = false;
+ m_vetoColumnDrag = false;
m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
int x = pos.x == wxDefaultCoord ? 0 : pos.x,
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);
wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
{
+ delete m_imageList;
UnsubclassWin();
}
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;
if (col->IsHidden())
continue; // don't add it!
+ wxString title( col->GetTitle() );
HDITEM hdi;
hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
if (col->GetBitmap().IsOk())
{
- hdi.mask |= HDI_BITMAP;
- hdi.hbm = (HBITMAP) col->GetBitmap().GetHBITMAP();
+ m_imageList->Add( col->GetBitmap() );
+ hdi.mask |= HDI_IMAGE;
+ hdi.iImage = m_imageList->GetImageCount()-1;
}
- hdi.pszText = (wxChar *) col->GetTitle().wx_str();
+ 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_BITMAP;
-
+ hdi.fmt |= HDF_IMAGE;
+
//hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
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?
break;
case HDN_BEGINDRAG:
- // user has started to reorder a column
- if ((nmHDR->iItem != -1) && (!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;
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();
}
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;
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);
}
}
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
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,
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++)
{
wxDataViewTreeNode *node = NULL;
wxDataViewItem dataitem;
- if (m_root)
+ if (!IsVirtualList())
{
node = GetTreeNodeByRow(item);
if( node == NULL )
}
else
{
- dataitem = wxDataViewItem( (void*) item );
+ dataitem = wxDataViewItem( wxUIntToPtr(item) );
}
model->GetValue( value, dataitem, col->GetModelColumn());
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();
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() )
{
// 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);
}
// cannot be bigger than allocated space
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);
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;
};
switch( func( node ) )
{
case DoJob::OK :
- return true ;
+ return true;
case DoJob::IGR:
return false;
case DoJob::CONT:
- default:
- ;
+ default:
+ ;
}
wxDataViewTreeNodes nodes = node->GetNodes();
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() )
switch( func( n ) )
{
case DoJob::OK :
- return true ;
+ return true;
case DoJob::IGR:
continue;
case DoJob::CONT:
default:
- ;
+ ;
}
}
return false;
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 )
{
}
int width = GetEndOfLastCol();
- int height = GetRowCount() * m_lineHeight;
+ int height = GetLineStart( GetRowCount() );
SetVirtualSize( width, height );
GetOwner()->SetScrollRate( 10, m_lineHeight );
{
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 )
{
int y = 0;
m_owner->CalcUnscrolledPosition( x, y, &x, &y );
- return y / m_lineHeight;
+ return GetLineAt( y );
}
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 );
}
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;
}
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();
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();
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)
{
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<wxDataViewRenderer*>(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<wxDataViewRenderer*>(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<wxDataViewRenderer*>(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<int>(row))
{
- ret = node->GetItem() ;
+ ret = node->GetItem();
return DoJob::OK;
}
current ++;
if( current == static_cast<int>(row))
{
- ret = wxDataViewItem( n ) ;
+ ret = wxDataViewItem( n );
return DoJob::OK;
}
return DoJob::CONT;
wxDataViewItem GetResult(){ return ret; }
private:
unsigned int row;
- int current ;
+ int current;
wxDataViewItem ret;
};
{
if (!m_root)
{
- return wxDataViewItem( (void*) row );
+ return wxDataViewItem( wxUIntToPtr(row) );
}
else
{
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<int>(row))
{
- ret = node ;
+ ret = node;
return DoJob::OK;
}
{
int index = static_cast<int>(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;
current ++;
if( current == static_cast<int>(row))
{
- ret = new wxDataViewTreeNode( parent ) ;
+ ret = new wxDataViewTreeNode( parent );
ret->SetItem( wxDataViewItem( n ));
ret->SetHasChildren(false);
return DoJob::OK;
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 )
void wxDataViewMainWindow::OnExpanding( unsigned int row )
{
+ if (IsVirtualList())
+ return;
+
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
if( node != NULL )
{
void wxDataViewMainWindow::OnCollapsing(unsigned int row)
{
+ if (IsVirtualList())
+ return;
+
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
if( node != NULL )
{
node = node->GetParent();
if( node != NULL )
{
- int parent = GetRowByItem( node->GetItem() ) ;
+ int parent = GetRowByItem( node->GetItem() );
if( parent >= 0 )
{
SelectRow( row, false);
//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() )
{
wxDataViewTreeNodes nodes = node->GetNodes();
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;
}
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 ++ )
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)
if( node->GetItem() == **m_iter )
{
- m_iter++ ;
+ m_iter++;
return DoJob::CONT;
}
else
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;
};
-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;
static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
{
if( !model->IsContainer( item ) )
- return ;
+ return;
wxDataViewItemArray children;
unsigned int num = model->GetChildren( item, children);
{
wxDataViewTreeNode * n = new wxDataViewTreeNode( node );
n->SetItem(children[index]);
- n->SetHasChildren( true ) ;
+ n->SetHasChildren( true );
node->AddNode( n );
}
else
if (GetOwner()->GetModel()->IsVirtualListModel())
{
- m_count = -1 ;
+ m_count = -1;
return;
}
wxDataViewItem item;
SortPrepare();
BuildTreeHelper( model, item, m_root);
- m_count = -1 ;
+ m_count = -1;
}
static void DestroyTreeHelper( wxDataViewTreeNode * node )
if( node->GetNodeNumber() != 0 )
{
int len = node->GetNodeNumber();
- int i = 0 ;
+ int i = 0;
wxDataViewTreeNodes& nodes = node->GetNodes();
- for( ; i < len; i ++ )
+ for(; i < len; i ++ )
{
DestroyTreeHelper(nodes[i]);
}
void wxDataViewMainWindow::DestroyTree()
{
- if (m_root)
+ if (!IsVirtualList())
{
::DestroyTreeHelper(m_root);
m_count = 0;
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 ?
//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
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() );
}
//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;
wxFAIL_MSG( _T("how did we get here?") );
}
}
-
+
if (m_currentRow != oldCurrentRow)
RefreshRow( oldCurrentRow );
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 ) );
/* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
}
}
if (m_notifier)
GetModel()->RemoveNotifier( m_notifier );
- wxDataViewColumnList::const_iterator iter;
- for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
- {
- delete *iter;
- }
+ m_cols.Clear();
}
void wxDataViewCtrl::Init()
{
+ m_cols.DeleteContents(true);
m_notifier = NULL;
}
{
if ( (style & wxBORDER_MASK) == 0)
style |= wxBORDER_SUNKEN;
-
+
if (!wxControl::Create( parent, id, pos, size,
style | wxScrolledWindowStyle, validator))
return false;
Init();
#ifdef __WXMAC__
- MacSetClipChildren( true ) ;
+ MacSetClipChildren( true );
#endif
m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
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)
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;
bool wxDataViewCtrl::ClearColumns()
{
- m_cols.clear();
+ m_cols.Clear();
OnColumnChange();
return true;
}
void wxDataViewCtrl::SetSelections( const wxDataViewItemArray & sel )
{
- wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+ wxDataViewSelection selection(wxDataViewSelectionCmp);
int len = sel.GetCount();
for( int i = 0; i < len; i ++ )
{
void wxDataViewCtrl::SetSelections( const wxArrayInt & sel )
{
- wxDataViewSelection selection(wxDataViewSelectionCmp) ;
+ wxDataViewSelection selection(wxDataViewSelectionCmp);
int len = sel.GetCount();
for( int i = 0; i < len; i ++ )
{
projects / wxWidgets.git / blobdiff