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

corrected warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-09-01 17:35:03 +00:00
parent 74c107ba48
commit cd3c2375e6
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/mac/carbon/stattext.cpp
View File

@@ -74,44 +74,44 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
return; return;
} }
int x = 0 ; int x = 0 ;
bool linedrawn = true; bool linedrawn = true;
while( paragraph.Length() > 0 ) while( paragraph.Length() > 0 )
{ {
dc.GetTextExtent( paragraph , &width , &height ) ; dc.GetTextExtent( paragraph , &width , &height ) ;
if ( width > m_width ) if ( width > m_width )
{ {
for ( int p = paragraph.Length() -1 ; p > 0 ; --p ) for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )
{ {
if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
{ {
int blank = (paragraph[p] == ' ') ? 0 : 1; int blank = (paragraph[p] == ' ') ? 0 : 1;
dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ; dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
if ( width <= m_width ) if ( width <= m_width )
{ {
int pos = x ; int pos = x ;
if ( HasFlag( wxALIGN_CENTER ) ) if ( HasFlag( wxALIGN_CENTER ) )
{ {
pos += ( m_width - width ) / 2 ; pos += ( m_width - width ) / 2 ;
} }
else if ( HasFlag( wxALIGN_RIGHT ) ) else if ( HasFlag( wxALIGN_RIGHT ) )
{ {
pos += ( m_width - width ) ; pos += ( m_width - width ) ;
} }
dc.DrawText( paragraph.Left(p + blank), pos , y) ; dc.DrawText( paragraph.Left(p + blank), pos , y) ;
y += height ; y += height ;
paragraph = paragraph.Mid(p+1) ; paragraph = paragraph.Mid(p+1) ;
linedrawn = true; linedrawn = true;
break ; break ;
} }
} }
} }
linedrawn = false; linedrawn = false;
} }
else else
@@ -120,15 +120,15 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
if ( HasFlag( wxALIGN_CENTER ) ) if ( HasFlag( wxALIGN_CENTER ) )
{ {
pos += ( m_width - width ) / 2 ; pos += ( m_width - width ) / 2 ;
} }
else if ( HasFlag( wxALIGN_RIGHT ) ) else if ( HasFlag( wxALIGN_RIGHT ) )
{ {
pos += ( m_width - width ) ; pos += ( m_width - width ) ;
} }
dc.DrawText( paragraph, pos , y) ; dc.DrawText( paragraph, pos , y) ;
paragraph=""; paragraph="";
y += height ; y += height ;
} }
} }
} }
@@ -177,7 +177,7 @@ void wxStaticText::OnDraw( wxDC &dc )
DrawParagraph(dc, paragraph,y); DrawParagraph(dc, paragraph,y);
} }
void wxStaticText::OnPaint( wxPaintEvent &event ) void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
OnDraw( dc ) ; OnDraw( dc ) ;

46
src/mac/stattext.cpp
View File

@@ -74,44 +74,44 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
return; return;
} }
int x = 0 ; int x = 0 ;
bool linedrawn = true; bool linedrawn = true;
while( paragraph.Length() > 0 ) while( paragraph.Length() > 0 )
{ {
dc.GetTextExtent( paragraph , &width , &height ) ; dc.GetTextExtent( paragraph , &width , &height ) ;
if ( width > m_width ) if ( width > m_width )
{ {
for ( int p = paragraph.Length() -1 ; p > 0 ; --p ) for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )
{ {
if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
{ {
int blank = (paragraph[p] == ' ') ? 0 : 1; int blank = (paragraph[p] == ' ') ? 0 : 1;
dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ; dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
if ( width <= m_width ) if ( width <= m_width )
{ {
int pos = x ; int pos = x ;
if ( HasFlag( wxALIGN_CENTER ) ) if ( HasFlag( wxALIGN_CENTER ) )
{ {
pos += ( m_width - width ) / 2 ; pos += ( m_width - width ) / 2 ;
} }
else if ( HasFlag( wxALIGN_RIGHT ) ) else if ( HasFlag( wxALIGN_RIGHT ) )
{ {
pos += ( m_width - width ) ; pos += ( m_width - width ) ;
} }
dc.DrawText( paragraph.Left(p + blank), pos , y) ; dc.DrawText( paragraph.Left(p + blank), pos , y) ;
y += height ; y += height ;
paragraph = paragraph.Mid(p+1) ; paragraph = paragraph.Mid(p+1) ;
linedrawn = true; linedrawn = true;
break ; break ;
} }
} }
} }
linedrawn = false; linedrawn = false;
} }
else else
@@ -120,15 +120,15 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
if ( HasFlag( wxALIGN_CENTER ) ) if ( HasFlag( wxALIGN_CENTER ) )
{ {
pos += ( m_width - width ) / 2 ; pos += ( m_width - width ) / 2 ;
} }
else if ( HasFlag( wxALIGN_RIGHT ) ) else if ( HasFlag( wxALIGN_RIGHT ) )
{ {
pos += ( m_width - width ) ; pos += ( m_width - width ) ;
} }
dc.DrawText( paragraph, pos , y) ; dc.DrawText( paragraph, pos , y) ;
paragraph=""; paragraph="";
y += height ; y += height ;
} }
} }
} }
@@ -177,7 +177,7 @@ void wxStaticText::OnDraw( wxDC &dc )
DrawParagraph(dc, paragraph,y); DrawParagraph(dc, paragraph,y);
} }
void wxStaticText::OnPaint( wxPaintEvent &event ) void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
{ {
wxPaintDC dc(this); wxPaintDC dc(this);
OnDraw( dc ) ; OnDraw( dc ) ;