AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some warnings suppressed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-10-06 18:12:41 +00:00
parent 07818da861
commit b540eb2bee
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/grid.cpp
View File

@ -3045,7 +3045,6 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
int horizAlign,
int vertAlign )
{
int i;
long textWidth, textHeight;
long lineWidth, lineHeight;
wxArrayString lines;
@ -3123,7 +3122,7 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
break;
}
for ( i = 0; i < lines.GetCount(); i++ )
for ( size_t i = 0; i < lines.GetCount(); i++ )
{
dc.DrawText( lines[i], (long)x, (long)y );
y += lineHeight;
@ -3141,10 +3140,10 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
{
// TODO: this won't work for WXMAC ? (lines end with '\r')
//
// => use wxTextFile functions then (VZ)
int startPos = 0;
int pos;
while ( startPos < value.Length() )
while ( startPos < (int)value.Length() )
{
pos = value.Mid(startPos).Find( '\n' );
if ( pos < 0 )
@ -3168,7 +3167,7 @@ void wxGrid::StringToLines( const wxString& value, wxArrayString& lines )
}
startPos += pos+1;
}
if ( startPos < value.Length() )
if ( startPos < (int)value.Length() )
{
lines.Add( value.Mid( startPos ) );
}
@ -3183,7 +3182,7 @@ void wxGrid::GetTextBoxSize( wxDC& dc,
long h = 0;
long lineW, lineH;
int i;
size_t i;
for ( i = 0; i < lines.GetCount(); i++ )
{
dc.GetTextExtent( lines[i], &lineW, &lineH );