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

wxHTML src code indentation now conforms (more) to wxWin coding style

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-11-05 14:59:59 +00:00
parent 1da7aa8c4a
commit 4f9297b0ee
23 changed files with 1437 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
src/html/htmlcell.cpp
View File

@@ -59,7 +59,7 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
wxHtmlLinkInfo lnk2(*lnk);
lnk2.SetEvent(&event);
lnk2.SetHtmlCell(this);
((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2);
((wxHtmlWindow*)parent)->OnLinkClicked(lnk2);
// note : this overcasting is legal because parent is *always* wxHtmlWindow
}
}
@@ -69,14 +69,16 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
{
if ((!m_CanLiveOnPagebreak) &&
m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) {
m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
{
*pagebreak = m_PosY;
if (m_Next != NULL) m_Next -> AdjustPagebreak(pagebreak);
if (m_Next != NULL) m_Next->AdjustPagebreak(pagebreak);
return TRUE;
}
else {
if (m_Next != NULL) return m_Next -> AdjustPagebreak(pagebreak);
else
{
if (m_Next != NULL) return m_Next->AdjustPagebreak(pagebreak);
else return FALSE;
}
}
@@ -96,27 +98,27 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
void wxHtmlCell::Layout(int w)
{
SetPos(0, 0);
if (m_Next) m_Next -> Layout(w);
if (m_Next) m_Next->Layout(w);
}
void wxHtmlCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2);
if (m_Next) m_Next->Draw(dc, x, y, view_y1, view_y2);
}
void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int y)
{
if (m_Next) m_Next -> DrawInvisible(dc, x, y);
if (m_Next) m_Next->DrawInvisible(dc, x, y);
}
const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const
{
if (m_Next) return m_Next -> Find(condition, param);
if (m_Next) return m_Next->Find(condition, param);
else return NULL;
}
@@ -266,7 +268,7 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
{
m_Cells = m_LastCell = NULL;
m_Parent = parent;
if (m_Parent) m_Parent -> InsertCell(this);
if (m_Parent) m_Parent->InsertCell(this);
m_AlignHor = wxHTML_ALIGN_LEFT;
m_AlignVer = wxHTML_ALIGN_BOTTOM;
m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
@@ -327,14 +329,16 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
if (!m_CanLiveOnPagebreak)
return wxHtmlCell::AdjustPagebreak(pagebreak);
else {
else
{
wxHtmlCell *c = GetFirstCell();
bool rt = FALSE;
int pbrk = *pagebreak - m_PosY;
while (c) {
if (c -> AdjustPagebreak(&pbrk)) rt = TRUE;
c = c -> GetNext();
while (c)
{
if (c->AdjustPagebreak(&pbrk)) rt = TRUE;
c = c->GetNext();
}
if (rt) *pagebreak = pbrk + m_PosY;
return rt;
@@ -345,7 +349,8 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
void wxHtmlContainerCell::Layout(int w)
{
if (m_LastLayout == w) {
if (m_LastLayout == w)
{
wxHtmlCell::Layout(w);
return;
}
@@ -365,19 +370,22 @@ void wxHtmlContainerCell::Layout(int w)
*/
if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) {
if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
{
if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
else m_Width = m_WidthFloat * w / 100;
}
else {
else
{
if (m_WidthFloat < 0) m_Width = w + m_WidthFloat;
else m_Width = m_WidthFloat;
}
if (m_Cells) {
if (m_Cells)
{
int l = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
int r = (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;
m_Cells -> Layout(m_Width - (l + r));
m_Cells->Layout(m_Width - (l + r));
}
/*
@@ -391,24 +399,27 @@ void wxHtmlContainerCell::Layout(int w)
s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
// my own layouting:
while (cell != NULL) {
switch (m_AlignVer) {
while (cell != NULL)
{
switch (m_AlignVer)
{
case wxHTML_ALIGN_TOP : ybasicpos = 0; break;
case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell -> GetHeight(); break;
case wxHTML_ALIGN_CENTER : ybasicpos = - cell -> GetHeight() / 2; break;
case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell->GetHeight(); break;
case wxHTML_ALIGN_CENTER : ybasicpos = - cell->GetHeight() / 2; break;
}
ydiff = cell -> GetHeight() + ybasicpos;
ydiff = cell->GetHeight() + ybasicpos;
if (cell -> GetDescent() + ydiff > ysizedown) ysizedown = cell -> GetDescent() + ydiff;
if (ybasicpos + cell -> GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell -> GetDescent());
if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff;
if (ybasicpos + cell->GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell->GetDescent());
cell -> SetPos(xpos, ybasicpos + cell -> GetDescent());
xpos += cell -> GetWidth();
cell = cell -> GetNext();
cell->SetPos(xpos, ybasicpos + cell->GetDescent());
xpos += cell->GetWidth();
cell = cell->GetNext();
xcnt++;
// force new line if occured:
if ((cell == NULL) || (xpos + cell -> GetWidth() > s_width)) {
if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
{
if (xpos > MaxLineWidth) MaxLineWidth = xpos;
if (ysizeup < 0) ysizeup = 0;
if (ysizedown < 0) ysizedown = 0;
@@ -430,10 +441,11 @@ void wxHtmlContainerCell::Layout(int w)
ypos += ysizeup;
if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
while (line != cell) {
line -> SetPos(line -> GetPosX() + xdelta,
ypos + line -> GetPosY());
line = line -> GetNext();
while (line != cell)
{
line->SetPos(line->GetPosX() + xdelta,
ypos + line->GetPosY());
line = line->GetNext();
}
else
{
@@ -441,11 +453,12 @@ void wxHtmlContainerCell::Layout(int w)
int step = (s_width - xpos);
if (step < 0) step = 0;
xcnt--;
if (xcnt > 0) while (line != cell) {
line -> SetPos(line -> GetPosX() + s_indent +
if (xcnt > 0) while (line != cell)
{
line->SetPos(line->GetPosX() + s_indent +
(counter++ * step / xcnt),
ypos + line -> GetPosY());
line = line -> GetNext();
ypos + line->GetPosY());
line = line->GetNext();
}
xcnt++;
}
@@ -460,14 +473,17 @@ void wxHtmlContainerCell::Layout(int w)
// setup height & width, depending on container layout:
m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom;
if (m_Height < m_MinHeight) {
if (m_MinHeightAlign != wxHTML_ALIGN_TOP) {
if (m_Height < m_MinHeight)
{
if (m_MinHeightAlign != wxHTML_ALIGN_TOP)
{
int diff = m_MinHeight - m_Height;
if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2;
cell = m_Cells;
while (cell) {
cell -> SetPos(cell -> GetPosX(), cell -> GetPosY() + diff);
cell = cell -> GetNext();
while (cell)
{
cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff);
cell = cell->GetNext();
}
}
m_Height = m_MinHeight;
@@ -488,9 +504,11 @@ void wxHtmlContainerCell::Layout(int w)
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
// container visible, draw it:
if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1)) {
if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1))
{
if (m_UseBkColour) {
if (m_UseBkColour)
{
wxBrush myb = wxBrush(m_BkColour, wxSOLID);
int real_y1 = mMax(y + m_PosY, view_y1);
@@ -501,7 +519,8 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1);
}
if (m_UseBorder) {
if (m_UseBorder)
{
wxPen mypen1(m_BorderColour1, 1, wxSOLID);
wxPen mypen2(m_BorderColour2, 1, wxSOLID);
@@ -513,11 +532,12 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
}
if (m_Cells) m_Cells -> Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
if (m_Cells) m_Cells->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
}
// container invisible, just proceed font+color changing:
else {
if (m_Cells) m_Cells -> DrawInvisible(dc, x + m_PosX, y + m_PosY);
else
{
if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
}
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
@@ -527,7 +547,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
{
if (m_Cells) m_Cells -> DrawInvisible(dc, x + m_PosX, y + m_PosY);
if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
wxHtmlCell::DrawInvisible(dc, x, y);
}
@@ -538,12 +558,13 @@ wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
wxHtmlCell *c = m_Cells;
int cx, cy, cw, ch;
while (c) {
cx = c -> GetPosX(), cy = c -> GetPosY();
cw = c -> GetWidth(), ch = c -> GetHeight();
while (c)
{
cx = c->GetPosX(), cy = c->GetPosY();
cw = c->GetWidth(), ch = c->GetHeight();
if ((x >= cx) && (x < cx + cw) && (y >= cy) && (y < cy + ch))
return c -> GetLink(x - cx, y - cy);
c = c -> GetNext();
return c->GetLink(x - cx, y - cy);
c = c->GetNext();
}
return NULL;
}
@@ -553,12 +574,13 @@ wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
{
if (!m_Cells) m_Cells = m_LastCell = f;
else {
m_LastCell -> SetNext(f);
else
{
m_LastCell->SetNext(f);
m_LastCell = f;
if (m_LastCell) while (m_LastCell -> GetNext()) m_LastCell = m_LastCell -> GetNext();
if (m_LastCell) while (m_LastCell->GetNext()) m_LastCell = m_LastCell->GetNext();
}
f -> SetParent(this);
f->SetParent(this);
m_LastLayout = -1;
}
@@ -566,7 +588,8 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
{
if (tag.HasParam(wxT("ALIGN"))) {
if (tag.HasParam(wxT("ALIGN")))
{
wxString alg = tag.GetParam(wxT("ALIGN"));
alg.MakeUpper();
if (alg == wxT("CENTER"))
@@ -585,15 +608,18 @@ void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale)
{
if (tag.HasParam(wxT("WIDTH"))) {
if (tag.HasParam(wxT("WIDTH")))
{
int wdi;
wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.Length()-1] == wxT('%')) {
if (wd[wd.Length()-1] == wxT('%'))
{
wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
}
else {
else
{
wxSscanf(wd.c_str(), wxT("%i"), &wdi);
SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS);
}
@@ -607,8 +633,9 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
{
const wxHtmlCell *r = NULL;
if (m_Cells) {
r = m_Cells -> Find(condition, param);
if (m_Cells)
{
r = m_Cells->Find(condition, param);
if (r) return r;
}
@@ -619,17 +646,20 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
{
if (m_Cells) {
if (m_Cells)
{
wxHtmlCell *c = m_Cells;
while (c) {
if ( (c -> GetPosX() <= x) &&
(c -> GetPosY() <= y) &&
(c -> GetPosX() + c -> GetWidth() > x) &&
(c -> GetPosY() + c -> GetHeight() > y)) {
c -> OnMouseClick(parent, x - c -> GetPosX(), y - c -> GetPosY(), event);
while (c)
{
if ( (c->GetPosX() <= x) &&
(c->GetPosY() <= y) &&
(c->GetPosX() + c->GetWidth() > x) &&
(c->GetPosY() + c->GetHeight() > y))
{
c->OnMouseClick(parent, x - c->GetPosX(), y - c->GetPosY(), event);
break;
}
c = c -> GetNext();
c = c->GetNext();
}
}
}
@@ -646,7 +676,8 @@ void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
if (m_Flags & wxHTML_CLR_BACKGROUND) {
if (m_Flags & wxHTML_CLR_BACKGROUND)
{
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
@@ -657,7 +688,8 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
if (m_Flags & wxHTML_CLR_BACKGROUND) {
if (m_Flags & wxHTML_CLR_BACKGROUND)
{
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
@@ -698,7 +730,7 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
{
int sx, sy;
m_Wnd = wnd;
m_Wnd -> GetSize(&sx, &sy);
m_Wnd->GetSize(&sx, &sy);
m_Width = sx, m_Height = sy;
m_WidthFloat = w;
}
@@ -709,14 +741,15 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;
while (c) {
absx += c -> GetPosX();
absy += c -> GetPosY();
c = c -> GetParent();
while (c)
{
absx += c->GetPosX();
absy += c->GetPosY();
c = c->GetParent();
}
((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty);
m_Wnd -> SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
@@ -728,14 +761,15 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;
while (c) {
absx += c -> GetPosX();
absy += c -> GetPosY();
c = c -> GetParent();
while (c)
{
absx += c->GetPosX();
absy += c->GetPosY();
c = c->GetParent();
}
((wxScrolledWindow*)(m_Wnd -> GetParent())) -> ViewStart(&stx, &sty);
m_Wnd -> SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
wxHtmlCell::DrawInvisible(dc, x, y);
}
@@ -744,9 +778,10 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
void wxHtmlWidgetCell::Layout(int w)
{
if (m_WidthFloat != 0) {
if (m_WidthFloat != 0)
{
m_Width = (w * m_WidthFloat) / 100;
m_Wnd -> SetSize(m_Width, m_Height);
m_Wnd->SetSize(m_Width, m_Height);
}
wxHtmlCell::Layout(w);