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

Centralized wxDefaultPosition and TRUE->true, FALSE->false replacements. After previous change 'xcnt' is not used at all.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2004-05-19 09:36:50 +00:00
parent abb74e0f76
commit 49f6740f7b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/html/htmlcell.cpp
View File

@ -94,7 +94,7 @@ wxHtmlCell::wxHtmlCell() : wxObject()
m_Next = NULL; m_Next = NULL;
m_Parent = NULL; m_Parent = NULL;
m_Width = m_Height = m_Descent = 0; m_Width = m_Height = m_Descent = 0;
m_CanLiveOnPagebreak = TRUE; m_CanLiveOnPagebreak = true;
m_Link = NULL; m_Link = NULL;
} }
@ -139,10 +139,10 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks)
m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
{ {
*pagebreak = m_PosY; *pagebreak = m_PosY;
return TRUE; return true;
} }
return FALSE; return false;
} }
@ -260,7 +260,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
{ {
m_Word = word; m_Word = word;
dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
SetCanLiveOnPagebreak(FALSE); SetCanLiveOnPagebreak(false);
m_allowLinebreak = true; m_allowLinebreak = true;
} }
@ -283,7 +283,7 @@ void wxHtmlWordCell::Split(wxDC& dc,
wxPoint pt1 = (selFrom == wxDefaultPosition) ? wxPoint pt1 = (selFrom == wxDefaultPosition) ?
wxDefaultPosition : selFrom - GetAbsPos(); wxDefaultPosition : selFrom - GetAbsPos();
wxPoint pt2 = (selTo == wxDefaultPosition) ? wxPoint pt2 = (selTo == wxDefaultPosition) ?
wxPoint(m_Width, -1) : selTo - GetAbsPos(); wxPoint(m_Width, wxDefaultPosition.y) : selTo - GetAbsPos();
wxCoord charW, charH; wxCoord charW, charH;
unsigned len = m_Word.length(); unsigned len = m_Word.length();
@ -535,8 +535,8 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
m_AlignVer = wxHTML_ALIGN_BOTTOM; m_AlignVer = wxHTML_ALIGN_BOTTOM;
m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0; m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
m_UseBkColour = FALSE; m_UseBkColour = false;
m_UseBorder = FALSE; m_UseBorder = false;
m_MinHeight = 0; m_MinHeight = 0;
m_MinHeightAlign = wxHTML_ALIGN_TOP; m_MinHeightAlign = wxHTML_ALIGN_TOP;
m_LastLayout = -1; m_LastLayout = -1;
@ -581,7 +581,7 @@ int wxHtmlContainerCell::GetIndent(int ind) const
int wxHtmlContainerCell::GetIndentUnits(int ind) const int wxHtmlContainerCell::GetIndentUnits(int ind) const
{ {
bool p = FALSE; bool p = false;
if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0; if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0;
else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0; else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0;
else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0; else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0;
@ -600,13 +600,13 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks,
else else
{ {
wxHtmlCell *c = GetFirstChild(); wxHtmlCell *c = GetFirstChild();
bool rt = FALSE; bool rt = false;
int pbrk = *pagebreak - m_PosY; int pbrk = *pagebreak - m_PosY;
while (c) while (c)
{ {
if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages)) if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))
rt = TRUE; rt = true;
c = c->GetNext(); c = c->GetNext();
} }
if (rt) if (rt)
@ -645,7 +645,6 @@ void wxHtmlContainerCell::Layout(int w)
int s_width, nextWordWidth, s_indent; int s_width, nextWordWidth, s_indent;
int ysizeup = 0, ysizedown = 0; int ysizeup = 0, ysizedown = 0;
int MaxLineWidth = 0; int MaxLineWidth = 0;
int xcnt = 0;
int curLineWidth = 0; int curLineWidth = 0;
m_MaxTotalWidth = 0; m_MaxTotalWidth = 0;
@ -717,7 +716,6 @@ void wxHtmlContainerCell::Layout(int w)
curLineWidth += cell->GetMaxTotalWidth(); curLineWidth += cell->GetMaxTotalWidth();
cell = cell->GetNext(); cell = cell->GetNext();
xcnt++;
// compute length of the next word that would be added: // compute length of the next word that would be added:
nextWordWidth = 0; nextWordWidth = 0;
@ -816,7 +814,7 @@ void wxHtmlContainerCell::Layout(int w)
} }
ypos += ysizedown; ypos += ysizedown;
xpos = xcnt = 0; xpos = 0;
ysizeup = ysizedown = 0; ysizeup = ysizedown = 0;
line = cell; line = cell;
} }