Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation after last commit: semicolon after wxDELETE() is now required; also removed some other extra semicolons and other minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-03 00:10:06 +00:00
parent 604fba2d34
commit 59e601677a
1 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/datavgen.cpp
View File

@@ -2277,7 +2277,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
// 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
@@ -2372,8 +2372,8 @@ void wxDataViewMainWindow::OnRenameTimer()
class DoJob
{
public:
DoJob(){};
virtual ~DoJob(){};
DoJob() { }
virtual ~DoJob() { }
//The return value control how the tree-walker tranverse the tree
// 0: Job done, stop tranverse and return
@@ -2975,7 +2975,7 @@ int wxDataViewMainWindow::GetLineStart( 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);
}
unsigned int cols = GetOwner()->GetColumnCount();
@@ -3036,7 +3036,7 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) 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);
}
unsigned int cols = GetOwner()->GetColumnCount();
@@ -3085,7 +3085,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;
@@ -3121,7 +3121,7 @@ class RowToItemJob: public DoJob
{
public:
RowToItemJob( unsigned int row , int current ) { this->row = row; this->current = current;}
virtual ~RowToItemJob(){};
virtual ~RowToItemJob() { }
virtual int operator() ( wxDataViewTreeNode * node )
{
@@ -3192,7 +3192,7 @@ public:
ret = NULL;
parent = node;
}
virtual ~RowToTreeNodeJob(){};
virtual ~RowToTreeNodeJob(){ }
virtual int operator() ( wxDataViewTreeNode * node )
{
@@ -3467,9 +3467,12 @@ int wxDataViewMainWindow::RecalculateCount()
class ItemToRowJob : public DoJob
{
public:
ItemToRowJob(const wxDataViewItem & item, ItemList::const_iterator iter )
{ this->item = item ; ret = -1 ; m_iter = iter ; }
virtual ~ItemToRowJob(){};
ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
: m_iter(iter),
item(item_)
{
ret = -1;
}
//Maybe binary search will help to speed up this process
virtual int operator() ( wxDataViewTreeNode * node)
@@ -3502,6 +3505,7 @@ public:
}
//the row number is begin from zero
int GetResult() { return ret -1; }
private:
ItemList::const_iterator m_iter;
wxDataViewItem item;