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

fix some harmless warnings (last two parts of patch 1779004)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-14 17:00:45 +00:00
parent c07bf3a93f
commit b7fe22610e
2 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/datavcmn.cpp
View File

@@ -195,7 +195,7 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem
// items must be different
unsigned long litem1 = (unsigned long) item1.GetID();
unsigned long litem2 = (unsigned long) item2.GetID();
if (!ascending)
return litem2-litem2;
@@ -272,12 +272,14 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const
return wxDataViewItem( m_hash[row] );
}
int wxDataViewIndexListModel::Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
unsigned int column, bool ascending )
int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
const wxDataViewItem& item2,
unsigned int WXUNUSED(column),
bool ascending)
{
if (ascending)
return GetRow(item1) - GetRow(item2);
return GetRow(item2) - GetRow(item1);
}
@@ -313,7 +315,7 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item,
return 0;
children = m_hash;
return m_hash.GetCount();
}
@@ -408,7 +410,7 @@ bool wxDataViewRendererBase::FinishEditing()
GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col );
// m_editorCtrl->PopEventHandler( true );
// Now we should send Editing Done event
wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() );
event.SetDataViewColumn( GetOwner() );
@@ -614,7 +616,7 @@ wxDataViewColumn *
wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
wxDataViewColumn *ret = new wxDataViewColumn( label,
new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ),
model_column, width, align, flags );