X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5660c520d711e3a5396a42620d27c6ef5443f691..f51a6f6a0c11f2d5ce58bcb858f5dfa1c27299a5:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 81fd8b97ce..daab625a4c 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -14,7 +14,8 @@ #include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML + +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop @@ -58,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 } } @@ -68,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; } } @@ -85,7 +88,38 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) { if (m_Link) delete m_Link; - m_Link = new wxHtmlLinkInfo(link); + m_Link = NULL; + if (link.GetHref() != wxEmptyString) + m_Link = new wxHtmlLinkInfo(link); +} + + + +void wxHtmlCell::Layout(int w) +{ + SetPos(0, 0); + 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); +} + + + +void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int 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); + else return NULL; } @@ -101,113 +135,149 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell() if (m_Word.Find(wxT('&')) != -1) { #define ESCSEQ(escape, subst) \ - { wxT("&"escape";"), wxT("&"escape" "), wxT(subst) } - static wxChar* substitutions[][3] = + { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) } + static wxChar* substitutions[][4] = { ESCSEQ("quot", "\""), + ESCSEQ("#34", "\""), + ESCSEQ("#8220", "\""), + ESCSEQ("#8221", "\""), ESCSEQ("lt", "<"), + ESCSEQ("#60", "<"), ESCSEQ("gt", ">"), + ESCSEQ("#62", ">"), + + ESCSEQ("#94", "^"), /* ^ */ ESCSEQ("nbsp", " "), + ESCSEQ("#32", " "), ESCSEQ("iexcl", "!"), - ESCSEQ("cent", "¢"), + ESCSEQ("#33", "!"), + ESCSEQ("cent", "¢"/* ¢ */), + ESCSEQ("#162", "¢"/* ¢ */), - ESCSEQ("yen", " "), - ESCSEQ("brkbar", " "), - ESCSEQ("sect", " "), - ESCSEQ("uml", " "), + ESCSEQ("trade", "(TM)"), + ESCSEQ("#153", "(TM)"), + ESCSEQ("#8482", "(TM)"), + + ESCSEQ("yen", "¥"), + ESCSEQ("#165", "¥"), + ESCSEQ("brkbar", "¦"), + ESCSEQ("#166", "¦"), + ESCSEQ("sect", "§"), + ESCSEQ("#167", "§"), + ESCSEQ("uml", "¨"), + ESCSEQ("#168", "¨"), - ESCSEQ("copy", "(c)"), - ESCSEQ("ordf", " "), - ESCSEQ("laquo", " "), - ESCSEQ("not", " "), + ESCSEQ("copy", "©"), /* © */ + ESCSEQ("#169", "©"), + ESCSEQ("ordf", "ª"), + ESCSEQ("#170", "ª"), + ESCSEQ("laquo", "«"), /* « */ + ESCSEQ("#171", "«"), + ESCSEQ("not", "¬"), + ESCSEQ("#172", "¬"), - ESCSEQ("reg", "(r)"), + ESCSEQ("reg", "®"), /* ® */ + ESCSEQ("#174", "®"), - ESCSEQ("deg", " "), - ESCSEQ("plusm", " "), + ESCSEQ("deg", "°"), /* ° */ + ESCSEQ("#176", "°"), + ESCSEQ("plusm", "±"), /* ± */ + ESCSEQ("#177", "±"), - ESCSEQ("acute", " "), - ESCSEQ("micro", " "), - ESCSEQ("para", " "), + ESCSEQ("acute", "´"), + ESCSEQ("#180", "´"), + ESCSEQ("macron", "¯"), + ESCSEQ("#175", "¯"), + ESCSEQ("micro", "µ"), /* µ */ + ESCSEQ("#181", "µ"), + ESCSEQ("para", "¶"), /* ¶ */ + ESCSEQ("#182", "¶"), - ESCSEQ("ordm", " "), - ESCSEQ("raquo", " "), + ESCSEQ("ordm", "º"), /* º */ + ESCSEQ("#186", "º"), + ESCSEQ("raquo", "»"), /* » */ + ESCSEQ("#187", "»"), - ESCSEQ("iquest", " "), - ESCSEQ("Agrave", "À"), + ESCSEQ("iquest", "¿"), /* ¿ */ + ESCSEQ("#191", "¿"), + ESCSEQ("Agrave", "\300"/* À */), + ESCSEQ("#193", "\300"/* À */), - ESCSEQ("Acirc", "Â"), - ESCSEQ("Atilde", "Ã"), - ESCSEQ("Auml", "Ä"), + ESCSEQ("Acirc", "\302"/* Â */), + ESCSEQ("Atilde", "\303"/* Ã */), + ESCSEQ("Auml", "\304"/* Ä */), ESCSEQ("Aring", " "), ESCSEQ("AElig", " "), - ESCSEQ("Ccedil", "ç"), - ESCSEQ("Egrave", "È"), - ESCSEQ("Eacute", "É"), - ESCSEQ("Ecirc", "Ê"), - ESCSEQ("Euml", "Ë"), - ESCSEQ("Igrave", "Ì"), - - ESCSEQ("Icirc", "Î"), - ESCSEQ("Iuml", "Ï"), + ESCSEQ("Ccedil", "\347"/* ç */), + ESCSEQ("Egrave", "\310"/* È */), + ESCSEQ("Eacute", "\311"/* É */), + ESCSEQ("Ecirc", "\312"/* Ê */), + ESCSEQ("Euml", "\313"/* Ë */), + ESCSEQ("Igrave", "\314"/* Ì */), + + ESCSEQ("Icirc", "\316"/* Î */), + ESCSEQ("Iuml", "\317"/* Ï */), - ESCSEQ("Ntilde", "Ñ"), - ESCSEQ("Ograve", "Ò"), + ESCSEQ("Ntilde", "\321"/* Ñ */), + ESCSEQ("Ograve", "\322"/* Ò */), - ESCSEQ("Ocirc", "Ô"), - ESCSEQ("Otilde", "Õ"), - ESCSEQ("Ouml", "Ö"), + ESCSEQ("Ocirc", "\324"/* Ô */), + ESCSEQ("Otilde", "\325"/* Õ */), + ESCSEQ("Ouml", "\326"/* Ö */), ESCSEQ("Oslash", " "), - ESCSEQ("Ugrave", "Ù"), + ESCSEQ("Ugrave", "\331"/* Ù */), ESCSEQ("Ucirc", " "), - ESCSEQ("Uuml", "Ü"), + ESCSEQ("Uuml", "\334"/* Ü */), - ESCSEQ("szlig", "§"), - ESCSEQ("agrave;","à"), - ESCSEQ("aacute", "á"), - ESCSEQ("acirc", "â"), - ESCSEQ("atilde", "ã"), - ESCSEQ("auml", "ä"), + ESCSEQ("szlig", "\247"/* § */), + ESCSEQ("agrave","\340"/* à */), + ESCSEQ("aacute", "\341"/* á */), + ESCSEQ("acirc", "\342"/* â */), + ESCSEQ("atilde", "\343"/* ã */), + ESCSEQ("auml", "\344"/* ä */), ESCSEQ("aring", "a"), ESCSEQ("aelig", "ae"), - ESCSEQ("ccedil", "ç"), - ESCSEQ("egrave", "è"), - ESCSEQ("eacute", "é"), - ESCSEQ("ecirc", "ê"), - ESCSEQ("euml", "ë"), - ESCSEQ("igrave", "ì"), - ESCSEQ("iacute", "í"), + ESCSEQ("ccedil", "\347"/* ç */), + ESCSEQ("egrave", "\350"/* è */), + ESCSEQ("eacute", "\351"/* é */), + ESCSEQ("ecirc", "\352"/* ê */), + ESCSEQ("euml", "\353"/* ë */), + ESCSEQ("igrave", "\354"/* ì */), + ESCSEQ("iacute", "\355"/* í */), ESCSEQ("icirc", " "), - ESCSEQ("iuml", "ï"), + ESCSEQ("iuml", "\357"/* ï */), ESCSEQ("eth", " "), - ESCSEQ("ntilde", "ñ"), - ESCSEQ("ograve", "ò"), - ESCSEQ("oacute", "ó"), - ESCSEQ("ocirc", "ô"), - ESCSEQ("otilde", "õ"), - ESCSEQ("ouml", "ö"), + ESCSEQ("ntilde", "\361"/* ñ */), + ESCSEQ("ograve", "\362"/* ò */), + ESCSEQ("oacute", "\363"/* ó */), + ESCSEQ("ocirc", "\364"/* ô */), + ESCSEQ("otilde", "\365"/* õ */), + ESCSEQ("ouml", "\366"/* ö */), ESCSEQ("divide", " "), ESCSEQ("oslash", " "), - ESCSEQ("ugrave", "ù"), - ESCSEQ("uacute", "ú"), - ESCSEQ("ucirc", "û"), - ESCSEQ("uuml", "ü"), + ESCSEQ("ugrave", "\371"/* ù */), + ESCSEQ("uacute", "\372"/* ú */), + ESCSEQ("ucirc", "\373"/* û */), + ESCSEQ("uuml", "\374"/* ü */), ESCSEQ("yuml", ""), /* this one should ALWAYS stay the last one!!! */ ESCSEQ("amp", "&"), + ESCSEQ("#38", "&"), { NULL, NULL, NULL } }; for (int i = 0; substitutions[i][0] != NULL; i++) { - m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE); - m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE); + m_Word.Replace(substitutions[i][0], substitutions[i][3], TRUE); + m_Word.Replace(substitutions[i][1], substitutions[i][3], TRUE); + m_Word.Replace(substitutions[i][2], substitutions[i][3], TRUE); } } @@ -234,18 +304,23 @@ 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; m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT; m_UseBkColour = FALSE; m_UseBorder = FALSE; - m_MinHeight = m_MaxLineWidth = 0; + m_MinHeight = 0; m_MinHeightAlign = wxHTML_ALIGN_TOP; m_LastLayout = -1; } +wxHtmlContainerCell::~wxHtmlContainerCell() +{ + if (m_Cells) delete m_Cells; +} + void wxHtmlContainerCell::SetIndent(int i, int what, int units) @@ -290,14 +365,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; @@ -308,7 +385,8 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const void wxHtmlContainerCell::Layout(int w) { - if (m_LastLayout == w) { + if (m_LastLayout == w) + { wxHtmlCell::Layout(w); return; } @@ -318,6 +396,9 @@ void wxHtmlContainerCell::Layout(int w) int xdelta = 0, ybasicpos = 0, ydiff; int s_width, s_indent; int ysizeup = 0, ysizedown = 0; + int MaxLineWidth = 0; + int xcnt = 0; + /* @@ -325,19 +406,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)); } /* @@ -350,45 +434,73 @@ void wxHtmlContainerCell::Layout(int w) s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - m_MaxLineWidth = 0; - // 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 (xpos > m_MaxLineWidth) m_MaxLineWidth = xpos; + if ((cell == NULL) || (xpos + cell->GetWidth() > s_width)) + { + if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; if (ysizedown < 0) ysizedown = 0; switch (m_AlignHor) { - case wxHTML_ALIGN_LEFT : xdelta = 0; break; - case wxHTML_ALIGN_RIGHT : xdelta = 0 + (s_width - xpos); break; - case wxHTML_ALIGN_CENTER : xdelta = 0 + (s_width - xpos) / 2; break; + case wxHTML_ALIGN_LEFT : + case wxHTML_ALIGN_JUSTIFY : + xdelta = 0; + break; + case wxHTML_ALIGN_RIGHT : + xdelta = 0 + (s_width - xpos); + break; + case wxHTML_ALIGN_CENTER : + xdelta = 0 + (s_width - xpos) / 2; + break; } if (xdelta < 0) xdelta = 0; xdelta += s_indent; ypos += ysizeup; - while (line != cell) { - line -> SetPos(line -> GetPosX() + xdelta, ypos + line -> GetPosY()); - line = line -> GetNext(); + + if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL) + while (line != cell) + { + line->SetPos(line->GetPosX() + xdelta, + ypos + line->GetPosY()); + line = line->GetNext(); + } + else + { + int counter = 0; + int step = (s_width - xpos); + if (step < 0) step = 0; + xcnt--; + if (xcnt > 0) while (line != cell) + { + line->SetPos(line->GetPosX() + s_indent + + (counter++ * step / xcnt), + ypos + line->GetPosY()); + line = line->GetNext(); + } + xcnt++; } ypos += ysizedown; - xpos = 0; + xpos = xcnt = 0; ysizeup = ysizedown = 0; line = cell; } @@ -397,21 +509,24 @@ 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; } - m_MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); - if (m_Width < m_MaxLineWidth) m_Width = m_MaxLineWidth; + MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight); + if (m_Width < MaxLineWidth) m_Width = MaxLineWidth; m_LastLayout = w; @@ -425,9 +540,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); @@ -438,7 +555,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); @@ -450,11 +568,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); @@ -464,7 +583,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); } @@ -475,12 +594,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; } @@ -490,12 +610,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; } @@ -503,13 +624,16 @@ 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")) SetAlignHor(wxHTML_ALIGN_CENTER); else if (alg == wxT("LEFT")) SetAlignHor(wxHTML_ALIGN_LEFT); + else if (alg == wxT("JUSTIFY")) + SetAlignHor(wxHTML_ALIGN_JUSTIFY); else if (alg == wxT("RIGHT")) SetAlignHor(wxHTML_ALIGN_RIGHT); m_LastLayout = -1; @@ -520,15 +644,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); } @@ -542,8 +669,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; } @@ -554,17 +682,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(); } } } @@ -581,7 +712,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); } @@ -592,7 +724,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); } @@ -633,7 +766,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; } @@ -644,14 +777,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); } @@ -663,14 +797,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); } @@ -679,9 +814,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);