// the column count
virtual void UpdateDisplay();
+ virtual void OnInternalIdle();
+
// called Refresh afterwards
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
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;
wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
{ return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
-
- int m_scrollOffsetX;
- int m_buttonHeight;
+
+ int m_scrollOffsetX;
+ int m_buttonHeight;
+ bool m_delayedUpdate;
private:
DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
bool Cleared();
void Resort()
{
- SortPrepare();
- m_root->Resort();
+ if (m_root)
+ {
+ SortPrepare();
+ m_root->Resort();
+ }
UpdateDisplay();
}
m_dc = NULL;
m_align = align;
m_mode = mode;
+ m_wantsAttr = false;
+ m_hasAttr = false;
}
wxDataViewRenderer::~wxDataViewRenderer()
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
// ---------------------------------------------------------
SetTitle(title);
SetFlags(flags);
+ m_autosize = width < 0; // TODO
+
Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
}
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;
void wxDataViewColumn::SetWidth( int width )
{
- m_owner->m_headerArea->UpdateDisplay();
+ if (m_owner->m_headerArea) m_owner->m_headerArea->UpdateDisplay();
SetInternalWidth(width);
}
#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);
m_owner = parent;
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 ? m_buttonHeight : size.y;
+ h = m_buttonHeight;
+
+ wxSize new_size(w,h);
- if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
+ if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) )
return false;
// create the native WC_HEADER window:
WXHWND hwndParent = (HWND)parent->GetHandle();
- WXDWORD msStyle = WS_CHILD | HDS_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,
// the following is required to get the default win's font for
// header windows and must be done befor sending the HDM_LAYOUT msg
SetFont(GetFont());
-
+
return true;
}
wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
{
- return wxSize(80, m_buttonHeight );
+ return wxSize( 80, m_buttonHeight+2 );
}
-#ifndef HDF_SORTUP
-#define HDF_SORTUP 0x0400
-#endif
-#ifndef HDF_SORTDOWN
-#define HDF_SORTDOWN 0x0200
-#endif
+void wxDataViewHeaderWindowMSW::OnInternalIdle()
+{
+ if (m_delayedUpdate)
+ {
+ m_delayedUpdate = false;
+ UpdateDisplay();
+ }
+}
void wxDataViewHeaderWindowMSW::UpdateDisplay()
{
default:
// such alignment is not allowed for the column header!
- wxFAIL;
+ break; // wxFAIL;
}
SendMessage((HWND)m_hWnd, HDM_INSERTITEM,
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:
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 &&
const wxRect * WXUNUSED(rect))
{
m_scrollOffsetX += dx;
-
+
GetParent()->Layout();
}
int f)
{
// TODO: why is there a border + 2px around it?
- wxControl::DoSetSize( x+m_scrollOffsetX-2, y-2, w-m_scrollOffsetX+4, h+4, f );
+ wxControl::DoSetSize( x+m_scrollOffsetX+1, y+1, w-m_scrollOffsetX-2, h-2, f );
}
#else // !defined(__WXMSW__)
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
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();
}
- else
- switch( func( n ) )
- {
- case DoJob::OK :
- return true ;
- case DoJob::IGR:
- continue;
- case DoJob::CONT:
- default:
- ;
- }
- }
- return false;
-}
-
-bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
-{
- SortPrepare();
- wxDataViewTreeNode * node;
- node = FindNode(parent);
+ // Draw last vertical rule
+ dc.DrawLine(x, item_start * m_lineHeight,
+ x, item_last * m_lineHeight);
+ }
- if( node == NULL )
- return false;
+ // 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;
- node->SetHasChildren( true );
+ wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight );
+ wxRendererNative::Get().DrawItemSelectionRect
+ (
+ this,
+ dc,
+ rect,
+ flags
+ );
+ }
+ }
- if( g_model->IsContainer( item ) )
+ wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
+ if (!expander)
{
- wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
- newnode->SetItem(item);
- newnode->SetHasChildren( true );
- node->AddNode( newnode);
+ // TODO: last column for RTL support
+ expander = GetOwner()->GetColumn( 0 );
+ GetOwner()->SetExpanderColumn(expander);
}
- else
- node->AddLeaf( item.GetID() );
- node->ChangeSubTreeCount(1);
+ // 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();
- m_count = -1;
- UpdateDisplay();
+ if (col->IsHidden())
+ continue; // skipt it!
- return true;
-}
-void DestroyTreeHelper( wxDataViewTreeNode * node);
+ 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;
-bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
- const wxDataViewItem& item)
-{
- wxDataViewTreeNode * node = FindNode(parent);
+ if (m_root)
+ {
+ node = GetTreeNodeByRow(item);
+ if( node == NULL )
+ continue;
- wxCHECK_MSG( node != NULL, false, "item not found" );
- wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
+ dataitem = node->GetItem();
- int sub = -1;
- node->GetChildren().Remove( item.GetID() );
- //Manuplate selection
- if( m_selection.GetCount() > 1 )
- {
- m_selection.Empty();
- }
- bool isContainer = false;
- wxDataViewTreeNodes nds = node->GetNodes();
- for (size_t i = 0; i < nds.GetCount(); i ++)
- {
- if (nds[i]->GetItem() == item)
- {
- isContainer = true;
- break;
- }
- }
- if( isContainer )
- {
- wxDataViewTreeNode * n = NULL;
- wxDataViewTreeNodes nodes = node->GetNodes();
- int len = nodes.GetCount();
- for( int i = 0 ; i < len; i ++)
- {
- if( nodes[i]->GetItem() == item )
+ if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
+ continue;
+ }
+ else
{
- n = nodes[i];
- break;
+ dataitem = wxDataViewItem( (void*) item );
}
- }
- wxCHECK_MSG( n != NULL, false, "item not found" );
+ model->GetValue( value, dataitem, col->GetModelColumn());
+ cell->SetValue( value );
- node->GetNodes().Remove( n );
- sub -= n->GetSubTreeCount();
- DestroyTreeHelper(n);
- }
- //Make the row number invalid and get a new valid one when user call GetRowCount
- m_count = -1;
- node->ChangeSubTreeCount(sub);
- if( node->GetChildrenNumber() == 0)
- {
- node->GetParent()->GetNodes().Remove( node );
- delete node;
- }
+ if (cell->GetWantsAttr())
+ {
+ wxDataViewItemAttr attr;
+ bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
+ if (ret)
+ cell->SetAttr( attr );
+ cell->SetHasAttr( ret );
+ }
- //Change the current row to the last row if the current exceed the max row number
- if( m_currentRow > GetRowCount() )
- m_currentRow = m_count - 1;
+ // update the y offset
+ cell_rect.y = item * m_lineHeight;
- UpdateDisplay();
+ //Draw the expander here.
+ int indent = 0;
+ if ((m_root) && (col == expander))
+ {
+ indent = node->GetIndentLevel();
- return true;
-}
+ //Calculate the indent first
+ indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
-{
- SortPrepare();
- g_model->Resort();
+ 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
+ }
- //Send event
- wxWindow *parent = GetParent();
- wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
- le.SetEventObject(parent);
- le.SetModel(GetOwner()->GetModel());
- le.SetItem(item);
- parent->GetEventHandler()->ProcessEvent(le);
+ //force the expander column to left-center align
+ cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
+ }
- 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
+ // 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 rect( 0, row*m_lineHeight, MAX_VIRTUAL_WIDTH, m_lineHeight );
- m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
- Refresh( true, &rect );
+ wxRect item_rect(cell_rect.GetTopLeft(), size);
+ int align = cell->GetAlignment();
- return true;
-*/
- SortPrepare();
- g_model->Resort();
+ // 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
- //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);
+ // 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
- return true;
-}
+ // add padding
+ item_rect.x += PADDING_RIGHTLEFT;
+ item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
-bool wxDataViewMainWindow::Cleared()
-{
- SortPrepare();
+ //Here we add the tree indent
+ item_rect.x += indent;
- DestroyTree();
- UpdateDisplay();
+ int state = 0;
+ if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
+ state |= wxDATAVIEW_CELL_SELECTED;
- return true;
-}
+ // 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::UpdateDisplay()
-{
- m_dirty = true;
+ cell_rect.x += cell_rect.width;
+ }
}
-void wxDataViewMainWindow::OnInternalIdle()
+void wxDataViewMainWindow::OnRenameTimer()
{
- wxWindow::OnInternalIdle();
+ // We have to call this here because changes may just have
+ // been made and no screen update taken place.
+ if ( m_dirty )
+ wxSafeYield();
- if (m_dirty)
+ int xpos = 0;
+ unsigned int cols = GetOwner()->GetColumnCount();
+ unsigned int i;
+ for (i = 0; i < cols; i++)
{
- RecalculateDisplay();
- m_dirty = false;
- }
-}
+ wxDataViewColumn *c = GetOwner()->GetColumn( i );
+ if (c->IsHidden())
+ continue; // skip it!
-void wxDataViewMainWindow::RecalculateDisplay()
-{
- wxDataViewModel *model = GetOwner()->GetModel();
- if (!model)
- {
- Refresh();
- return;
+ if (c == m_currentCol)
+ break;
+ xpos += c->GetWidth();
}
+ wxRect labelRect( xpos, m_currentRow * m_lineHeight,
+ m_currentCol->GetWidth(), m_lineHeight );
- int width = GetEndOfLastCol();
- int height = GetRowCount() * m_lineHeight;
+ GetOwner()->CalcScrolledPosition( labelRect.x, labelRect.y,
+ &labelRect.x, &labelRect.y);
- SetVirtualSize( width, height );
- GetOwner()->SetScrollRate( 10, m_lineHeight );
+ wxDataViewItem item = GetItemByRow( m_currentRow );
+ m_currentCol->GetRenderer()->StartEditing( item, labelRect );
- Refresh();
}
-void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
+//------------------------------------------------------------------
+// Helper class for do operation on the tree node
+//------------------------------------------------------------------
+class DoJob
{
- wxWindow::ScrollWindow( dx, dy, rect );
+public:
+ DoJob(){};
+ virtual ~DoJob(){};
- if (GetOwner()->m_headerArea)
- GetOwner()->m_headerArea->ScrollWindow( dx, 0 );
-}
+ //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;
+};
-void wxDataViewMainWindow::ScrollTo( int rows, int column )
+bool Walker( wxDataViewTreeNode * node, DoJob & func )
{
- int x, y;
- m_owner->GetScrollPixelsPerUnit( &x, &y );
- int sy = rows*m_lineHeight/y;
- int sx = 0;
- if( column != -1 )
+ if( node==NULL )
+ return false;
+
+ switch( func( node ) )
{
- 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!
+ case DoJob::OK :
+ return true ;
+ case DoJob::IGR:
+ return false;
+ case DoJob::CONT:
+ default:
+ ;
+ }
- w = col->GetWidth();
- x_start += w;
- }
+ wxDataViewTreeNodes nodes = node->GetNodes();
+ wxDataViewTreeLeaves leaves = node->GetChildren();
- x_end = x_start + w;
- xe = xx + rect.width;
- if( x_end > xe )
- {
- sx = ( xx + x_end - xe )/x;
- }
- if( x_start < xx )
+ 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() )
{
- sx = x_start/x;
+ wxDataViewTreeNode * nd = nodes[nodes_i];
+ nodes_i++;
+
+ if( Walker( nd , func ) )
+ return true;
+
}
+ else
+ switch( func( n ) )
+ {
+ case DoJob::OK :
+ return true ;
+ case DoJob::IGR:
+ continue;
+ case DoJob::CONT:
+ default:
+ ;
+ }
}
- m_owner->Scroll( sx, sy );
+ return false;
}
-void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
+bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
{
- wxDataViewModel *model = GetOwner()->GetModel();
- wxAutoBufferedPaintDC dc( this );
+ if (!m_root)
+ {
+ m_count++;
+ UpdateDisplay();
+ return true;
+ }
- // prepare the DC
- dc.SetBackground(GetBackgroundColour());
- dc.Clear();
- GetOwner()->PrepareDC( dc );
- dc.SetFont( GetFont() );
+ SortPrepare();
- wxRect update = GetUpdateRegion().GetBox();
- m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
+ wxDataViewTreeNode * node;
+ node = FindNode(parent);
- // 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;
+ if( node == NULL )
+ return false;
- // 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++)
+ node->SetHasChildren( true );
+
+ if( g_model->IsContainer( item ) )
{
- wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
- if (col->IsHidden())
- continue; // skip it!
+ wxDataViewTreeNode * newnode = new wxDataViewTreeNode( node );
+ newnode->SetItem(item);
+ newnode->SetHasChildren( true );
+ node->AddNode( newnode);
+ }
+ else
+ node->AddLeaf( item.GetID() );
- unsigned int w = col->GetWidth();
- if (x_start+w >= (unsigned int)update.x)
- break;
+ node->ChangeSubTreeCount(1);
- x_start += w;
- }
+ m_count = -1;
+ UpdateDisplay();
- unsigned int col_last = col_start;
- unsigned int x_last = x_start;
- for (; col_last < cols; col_last++)
+ return true;
+}
+
+void DestroyTreeHelper( wxDataViewTreeNode * node);
+
+bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
+ const wxDataViewItem& item)
+{
+ if (!m_root)
{
- wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
- if (col->IsHidden())
- continue; // skip it!
+ m_count--;
+ if( m_currentRow > GetRowCount() )
+ m_currentRow = m_count - 1;
- if (x_last > (unsigned int)update.GetRight())
- break;
+ m_selection.Empty();
- x_last += col->GetWidth();
+ UpdateDisplay();
+
+ return true;
}
- // Draw horizontal rules if required
- if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
- {
- dc.SetPen(m_penRule);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ wxDataViewTreeNode * node = FindNode(parent);
- for (unsigned int i = item_start; i <= item_last+1; i++)
+ wxCHECK_MSG( node != NULL, false, "item not found" );
+ wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND, false, "item not found" );
+
+ int sub = -1;
+ node->GetChildren().Remove( item.GetID() );
+ //Manuplate selection
+ if( m_selection.GetCount() > 1 )
+ {
+ m_selection.Empty();
+ }
+ bool isContainer = false;
+ wxDataViewTreeNodes nds = node->GetNodes();
+ for (size_t i = 0; i < nds.GetCount(); i ++)
+ {
+ if (nds[i]->GetItem() == item)
{
- int y = i * m_lineHeight;
- dc.DrawLine(x_start, y, x_last, y);
+ isContainer = true;
+ break;
}
}
-
- // Draw vertical rules if required
- if ( m_owner->HasFlag(wxDV_VERT_RULES) )
+ if( isContainer )
{
- dc.SetPen(m_penRule);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
- int x = x_start;
- for (unsigned int i = col_start; i < col_last; i++)
+ wxDataViewTreeNode * n = NULL;
+ wxDataViewTreeNodes nodes = node->GetNodes();
+ int len = nodes.GetCount();
+ for( int i = 0 ; i < len; 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();
+ if( nodes[i]->GetItem() == item )
+ {
+ n = nodes[i];
+ break;
+ }
}
- // Draw last vertical rule
- dc.DrawLine(x, item_start * m_lineHeight,
- x, item_last * m_lineHeight);
- }
+ wxCHECK_MSG( n != NULL, false, "item not found" );
- // redraw the background for the items which are selected/current
- for (unsigned int item = item_start; item < item_last; item++)
+ node->GetNodes().Remove( n );
+ sub -= n->GetSubTreeCount();
+ DestroyTreeHelper(n);
+ }
+ //Make the row number invalid and get a new valid one when user call GetRowCount
+ m_count = -1;
+ node->ChangeSubTreeCount(sub);
+ if( node->GetChildrenNumber() == 0)
{
- 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
- );
- }
+ node->GetParent()->GetNodes().Remove( node );
+ delete node;
}
- wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
- if (!expander)
- {
- // TODO: last column for RTL support
- expander = GetOwner()->GetColumn( 0 );
- GetOwner()->SetExpanderColumn(expander);
- }
+ //Change the current row to the last row if the current exceed the max row number
+ if( m_currentRow > GetRowCount() )
+ m_currentRow = m_count - 1;
+
+ UpdateDisplay();
+
+ return true;
+}
+
+bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
+{
+ SortPrepare();
+ g_model->Resort();
- // 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();
+ //Send event
+ wxWindow *parent = GetParent();
+ wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, parent->GetId());
+ le.SetEventObject(parent);
+ le.SetModel(GetOwner()->GetModel());
+ le.SetItem(item);
+ parent->GetEventHandler()->ProcessEvent(le);
- if (col->IsHidden())
- continue; // skipt it!
+ 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
- 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;
+ 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 );
- wxDataViewItem dataitem = node->GetItem();
+ return true;
+*/
+ SortPrepare();
+ g_model->Resort();
- if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
- continue;
+ //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);
- model->GetValue( value, dataitem, col->GetModelColumn());
- cell->SetValue( value );
+ return true;
+}
- // update the y offset
- cell_rect.y = item * m_lineHeight;
+bool wxDataViewMainWindow::Cleared()
+{
+ DestroyTree();
- //Draw the expander here.
- int indent = node->GetIndentLevel();
- if( col == expander )
- {
- //Calculate the indent first
- indent = cell_rect.x + GetOwner()->GetIndent() * indent;
+ SortPrepare();
+ BuildTree( GetOwner()->GetModel() );
- 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
- }
+ UpdateDisplay();
- //force the expander column to left-center align
- cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
- }
+ return true;
+}
+void wxDataViewMainWindow::UpdateDisplay()
+{
+ m_dirty = true;
+}
- // 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;
+void wxDataViewMainWindow::OnInternalIdle()
+{
+ wxWindow::OnInternalIdle();
- wxRect item_rect(cell_rect.GetTopLeft(), size);
- int align = cell->GetAlignment();
+ if (m_dirty)
+ {
+ RecalculateDisplay();
+ m_dirty = false;
+ }
+}
- // horizontal alignment:
- item_rect.x = cell_rect.x;
- if (align & wxALIGN_CENTER_HORIZONTAL)
- item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
- else if (align & wxALIGN_RIGHT)
- item_rect.x = cell_rect.x + cell_rect.width - size.x;
- //else: wxALIGN_LEFT is the default
+void wxDataViewMainWindow::RecalculateDisplay()
+{
+ wxDataViewModel *model = GetOwner()->GetModel();
+ if (!model)
+ {
+ Refresh();
+ return;
+ }
- // 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
+ int width = GetEndOfLastCol();
+ int height = GetRowCount() * m_lineHeight;
- // add padding
- item_rect.x += PADDING_RIGHTLEFT;
- item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
+ SetVirtualSize( width, height );
+ GetOwner()->SetScrollRate( 10, m_lineHeight );
- //Here we add the tree indent
- item_rect.x += indent;
+ Refresh();
+}
- int state = 0;
- if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
- state |= wxDATAVIEW_CELL_SELECTED;
+void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
+{
+ wxWindow::ScrollWindow( dx, dy, rect );
- // 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();
+ 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;
}
- 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
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
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 )
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
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)
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();
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 )
//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() )
//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() )
model->AddNotifier( m_notifier );
+ m_clientArea->DestroyTree();
+
m_clientArea->BuildTree(model);
m_clientArea->UpdateDisplay();
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);
projects / wxWidgets.git / blobdiff