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

unused var warning in Mac build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-11 12:09:35 +00:00
parent 1c36a9d335
commit 95af070abd
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/html/htmlcell.cpp
View File

@@ -285,7 +285,6 @@ void wxHtmlWordCell::Split(wxDC& dc,
wxPoint pt2 = (selTo == wxDefaultPosition) ? wxPoint pt2 = (selTo == wxDefaultPosition) ?
wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos(); wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos();
wxCoord charW, charH;
unsigned len = m_Word.length(); unsigned len = m_Word.length();
unsigned i = 0; unsigned i = 0;
pos1 = 0; pos1 = 0;
@@ -296,17 +295,16 @@ void wxHtmlWordCell::Split(wxDC& dc,
pt1.x = 0; pt1.x = 0;
if ( pt2.y >= m_Height ) if ( pt2.y >= m_Height )
pt2.x = m_Width; pt2.x = m_Width;
#ifdef __WXMAC__
// before selection:
#ifdef __WXMAC__
// implementation using PartialExtents to support fractional widths // implementation using PartialExtents to support fractional widths
wxArrayInt widths ; wxArrayInt widths ;
dc.GetPartialTextExtents(m_Word,widths) ; dc.GetPartialTextExtents(m_Word,widths) ;
#endif
// before selection:
#ifdef __WXMAC__
while( i < len && pt1.x >= widths[i] ) while( i < len && pt1.x >= widths[i] )
i++ ; i++ ;
#else #else // __WXMAC__
wxCoord charW, charH;
while ( pt1.x > 0 && i < len ) while ( pt1.x > 0 && i < len )
{ {
dc.GetTextExtent(m_Word[i], &charW, &charH); dc.GetTextExtent(m_Word[i], &charW, &charH);
@@ -317,14 +315,14 @@ void wxHtmlWordCell::Split(wxDC& dc,
i++; i++;
} }
} }
#endif #endif // __WXMAC__/!__WXMAC__
// in selection: // in selection:
unsigned j = i; unsigned j = i;
#ifdef __WXMAC__ #ifdef __WXMAC__
while( j < len && pt2.x >= widths[j] ) while( j < len && pt2.x >= widths[j] )
j++ ; j++ ;
#else #else // __WXMAC__
pos2 = pos1; pos2 = pos1;
pt2.x -= pos2; pt2.x -= pos2;
while ( pt2.x > 0 && j < len ) while ( pt2.x > 0 && j < len )
@@ -337,7 +335,7 @@ void wxHtmlWordCell::Split(wxDC& dc,
j++; j++;
} }
} }
#endif #endif // __WXMAC__/!__WXMAC__
pos1 = i; pos1 = i;
pos2 = j; pos2 = j;
@@ -917,7 +915,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
dc.SetPen(*wxRED_PEN); dc.SetPen(*wxRED_PEN);
dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height); dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
#endif #endif
int xlocal = x + m_PosX; int xlocal = x + m_PosX;
int ylocal = y + m_PosY; int ylocal = y + m_PosY;
@@ -951,7 +949,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
// draw container's contents: // draw container's contents:
for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
{ {
// optimize drawing: don't render off-screen content: // optimize drawing: don't render off-screen content:
if ((ylocal + cell->GetPosY() <= view_y2) && if ((ylocal + cell->GetPosY() <= view_y2) &&
(ylocal + cell->GetPosY() + cell->GetHeight() > view_y1)) (ylocal + cell->GetPosY() + cell->GetHeight() > view_y1))