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

fixes for warnings about implicit double -> int conversions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-03-18 11:16:29 +00:00
parent 17b35e1d64
commit 25c71cccb5
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/html/m_tables.cpp
View File

@@ -116,7 +116,7 @@ private:
void ReallocRows(int rows); void ReallocRows(int rows);
// Computes minimal and maximal widths of columns. Needs to be called // Computes minimal and maximal widths of columns. Needs to be called
// only once, before first Layout(). // only once, before first Layout().
void ComputeMinMaxWidths(); void ComputeMinMaxWidths();
DECLARE_NO_COPY_CLASS(wxHtmlTableCell) DECLARE_NO_COPY_CLASS(wxHtmlTableCell)
@@ -128,7 +128,7 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
: wxHtmlContainerCell(parent) : wxHtmlContainerCell(parent)
{ {
m_PixelScale = pixel_scale; m_PixelScale = pixel_scale;
m_HasBorders = m_HasBorders =
(tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0")); (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));
m_ColsInfo = NULL; m_ColsInfo = NULL;
m_NumCols = m_NumRows = 0; m_NumCols = m_NumRows = 0;
@@ -288,14 +288,14 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan); tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan);
// VS: the standard says this about col/rowspan: // VS: the standard says this about col/rowspan:
// "This attribute specifies the number of rows spanned by the // "This attribute specifies the number of rows spanned by the
// current cell. The default value of this attribute is one ("1"). // current cell. The default value of this attribute is one ("1").
// The value zero ("0") means that the cell spans all rows from the // The value zero ("0") means that the cell spans all rows from the
// current row to the last row of the table." All mainstream // current row to the last row of the table." All mainstream
// browsers act as if 0==1, though, and so does wxHTML. // browsers act as if 0==1, though, and so does wxHTML.
if (m_CellInfo[r][c].colspan < 1) if (m_CellInfo[r][c].colspan < 1)
m_CellInfo[r][c].colspan = 1; m_CellInfo[r][c].colspan = 1;
if (m_CellInfo[r][c].rowspan < 1) if (m_CellInfo[r][c].rowspan < 1)
m_CellInfo[r][c].rowspan = 1; m_CellInfo[r][c].rowspan = 1;
if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1)) if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1))
@@ -351,7 +351,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
void wxHtmlTableCell::ComputeMinMaxWidths() void wxHtmlTableCell::ComputeMinMaxWidths()
{ {
if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return; if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return;
m_MaxTotalWidth = 0; m_MaxTotalWidth = 0;
int percentage = 0; int percentage = 0;
for (int c = 0; c < m_NumCols; c++) for (int c = 0; c < m_NumCols; c++)
@@ -401,7 +401,7 @@ void wxHtmlTableCell::ComputeMinMaxWidths()
void wxHtmlTableCell::Layout(int w) void wxHtmlTableCell::Layout(int w)
{ {
ComputeMinMaxWidths(); ComputeMinMaxWidths();
wxHtmlCell::Layout(w); wxHtmlCell::Layout(w);
/* /*
@@ -418,7 +418,7 @@ void wxHtmlTableCell::Layout(int w)
m_WidthFloat = -100; m_WidthFloat = -100;
m_Width = (100 + m_WidthFloat) * w / 100; m_Width = (100 + m_WidthFloat) * w / 100;
} }
else else
{ {
if (m_WidthFloat > 100) if (m_WidthFloat > 100)
m_WidthFloat = 100; m_WidthFloat = 100;
@@ -438,8 +438,8 @@ void wxHtmlTableCell::Layout(int w)
*/ */
/* 1. setup columns widths: /* 1. setup columns widths:
The algorithm tries to keep the table size less than w if possible. The algorithm tries to keep the table size less than w if possible.
*/ */
{ {
@@ -450,7 +450,7 @@ void wxHtmlTableCell::Layout(int w)
for (i = 0; i < m_NumCols; i++) for (i = 0; i < m_NumCols; i++)
if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS) if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS)
{ {
m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width,
m_ColsInfo[i].minWidth); m_ColsInfo[i].minWidth);
wpix -= m_ColsInfo[i].pixwidth; wpix -= m_ColsInfo[i].pixwidth;
} }
@@ -481,12 +481,12 @@ void wxHtmlTableCell::Layout(int w)
newWidth = w; newWidth = w;
else else
newWidth = newWidth * 100 / (100 - percentage); newWidth = newWidth * 100 / (100 - percentage);
newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing); newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing);
wpix -= m_Width - newWidth; wpix -= m_Width - newWidth;
m_Width = newWidth; m_Width = newWidth;
} }
// 1c. setup floating-width columns: // 1c. setup floating-width columns:
int wtemp = wpix; int wtemp = wpix;
@@ -527,10 +527,10 @@ void wxHtmlTableCell::Layout(int w)
{ {
// Assign with, make sure not to drop below minWidth // Assign with, make sure not to drop below minWidth
if (maxWidth) if (maxWidth)
m_ColsInfo[i].pixwidth = wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5; m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5);
else else
m_ColsInfo[i].pixwidth = wpix / j; m_ColsInfo[i].pixwidth = wpix / j;
// Make sure to leave enough space for the other columns // Make sure to leave enough space for the other columns
int minRequired = 0; int minRequired = 0;
int r; int r;
@@ -545,7 +545,7 @@ void wxHtmlTableCell::Layout(int w)
{ {
if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5)) if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5))
{ {
int diff = m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5); int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5));
maxWidth += diff - m_ColsInfo[i].maxWidth; maxWidth += diff - m_ColsInfo[i].maxWidth;
} }
else else
@@ -622,7 +622,7 @@ void wxHtmlTableCell::Layout(int w)
/* 4. adjust table's width if it was too small: */ /* 4. adjust table's width if it was too small: */
if (m_NumCols > 0) if (m_NumCols > 0)
{ {
int twidth = m_ColsInfo[m_NumCols-1].leftpos + int twidth = m_ColsInfo[m_NumCols-1].leftpos +
m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing; m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing;
if (twidth > m_Width) if (twidth > m_Width)
m_Width = twidth; m_Width = twidth;
@@ -682,7 +682,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
{ {
int width = 0; int width = 0;
wxSscanf(wd.c_str(), wxT("%i"), &width); wxSscanf(wd.c_str(), wxT("%i"), &width);
m_Table->SetWidthFloat(m_WParser->GetPixelScale() * width, wxHTML_UNITS_PIXELS); m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS);
} }
} }
else else
@@ -698,7 +698,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
m_WParser->SetAlign(oldAlign); m_WParser->SetAlign(oldAlign);
m_WParser->SetContainer(oldcont); m_WParser->SetContainer(oldcont);
m_WParser->CloseContainer(); m_WParser->CloseContainer();
m_Table = oldt; m_Table = oldt;
return TRUE; return TRUE;
} }