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

made GetRowCount() return size_t to avoid signed/unsigned warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-04 16:19:31 +00:00
parent d5e20cd8d4
commit 4a851b11c2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/datavgen.cpp
View File

@@ -177,7 +177,7 @@ public:
int GetEndOfLastCol(); int GetEndOfLastCol();
size_t GetFirstVisibleRow(); size_t GetFirstVisibleRow();
size_t GetLastVisibleRow(); size_t GetLastVisibleRow();
int GetRowCount(); size_t GetRowCount();
void SelectAllRows( bool on ); void SelectAllRows( bool on );
void SelectRow( size_t row, bool on ); void SelectRow( size_t row, bool on );
@@ -1145,7 +1145,7 @@ size_t wxDataViewMainWindow::GetLastVisibleRow()
return wxMin( GetRowCount()-1, (client_size.y/m_lineHeight)+1 ); return wxMin( GetRowCount()-1, (client_size.y/m_lineHeight)+1 );
} }
int wxDataViewMainWindow::GetRowCount() size_t wxDataViewMainWindow::GetRowCount()
{ {
return GetOwner()->GetModel()->GetNumberOfRows(); return GetOwner()->GetModel()->GetNumberOfRows();
} }
@@ -1159,13 +1159,13 @@ void wxDataViewMainWindow::ChangeCurrentRow( size_t row )
void wxDataViewMainWindow::SelectAllRows( bool on ) void wxDataViewMainWindow::SelectAllRows( bool on )
{ {
if (GetRowCount() == 0) return; if (IsEmpty())
return;
if (on) if (on)
{ {
m_selection.Clear(); m_selection.Clear();
size_t i; for (size_t i = 0; i < GetRowCount(); i++)
for (i = 0; i < GetRowCount(); i++)
m_selection.Add( i ); m_selection.Add( i );
Refresh(); Refresh();
} }
@@ -1278,7 +1278,8 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow ) void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
{ {
size_t count = GetRowCount(); size_t count = GetRowCount();
if (firstRow > count) return; if (firstRow > count)
return;
wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight ); wxRect rect( 0, firstRow*m_lineHeight, GetEndOfLastCol(), count * m_lineHeight );
m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y ); m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
@@ -1292,7 +1293,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
{ {
wxCHECK_RET( newCurrent < (size_t)GetRowCount(), 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 there is no selection, we cannot move it anywhere
@@ -1369,7 +1370,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break; break;
case WXK_DOWN: case WXK_DOWN:
if ( m_currentRow < (size_t)GetRowCount() - 1 ) if ( m_currentRow < GetRowCount() - 1 )
OnArrowChar( m_currentRow + 1, event ); OnArrowChar( m_currentRow + 1, event );
break; break;