X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/026d1fac6683dff963e0fd32a0ed4072f0cd3ba3..c3357a037ccab61e344470ce252f7f88ae3cf689:/src/html/htmlcell.cpp?ds=sidebyside diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 3f8e3b1f4f..909584da20 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -47,7 +47,7 @@ wxHtmlCell::wxHtmlCell() : wxObject() wxHtmlCell::~wxHtmlCell() { - if (m_Link) delete m_Link; + delete m_Link; } @@ -60,8 +60,9 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, wxHtmlLinkInfo lnk2(*lnk); lnk2.SetEvent(&event); lnk2.SetHtmlCell(this); - ((wxHtmlWindow*)parent)->OnLinkClicked(lnk2); - // note : this overcasting is legal because parent is *always* wxHtmlWindow + + // note : this cast is legal because parent is *always* wxHtmlWindow + wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2); } } @@ -71,12 +72,12 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const { if ((!m_CanLiveOnPagebreak) && m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) - { + { *pagebreak = m_PosY; return TRUE; } - else - return FALSE; + + return FALSE; } @@ -114,6 +115,14 @@ const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED } +wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y) const +{ + if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height ) + return wxConstCast(this, wxHtmlCell); + + return NULL; +} + //----------------------------------------------------------------------------- // wxHtmlWordCell @@ -218,7 +227,7 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const int pbrk = *pagebreak - m_PosY; while (c) - { + { if (c->AdjustPagebreak(&pbrk)) rt = TRUE; c = c->GetNext(); @@ -236,17 +245,17 @@ void wxHtmlContainerCell::Layout(int w) wxHtmlCell::Layout(w); if (m_LastLayout == w) return; - + // VS: Any attempt to layout with negative or zero width leads to hell, // but we can't ignore such attempts completely, since it sometimes // happen (e.g. when trying how small a table can be). The best thing we // can do is to set the width of child cells to zero - if (w < 1) + if (w < 1) { m_Width = 0; for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) cell->Layout(0); - // this does two things: it recursively calls this code on all child + // this does two things: it recursively calls this code on all child // contrainers and resets children's position to (0,0) return; } @@ -299,7 +308,7 @@ void wxHtmlContainerCell::Layout(int w) 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; @@ -316,7 +325,7 @@ void wxHtmlContainerCell::Layout(int w) // force new line if occured: if ((cell == NULL) || (xpos + cell->GetWidth() > s_width)) - { + { if (xpos > MaxLineWidth) MaxLineWidth = xpos; if (ysizeup < 0) ysizeup = 0; if (ysizedown < 0) ysizedown = 0; @@ -339,7 +348,7 @@ void wxHtmlContainerCell::Layout(int w) if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL) while (line != cell) - { + { line->SetPos(line->GetPosX() + xdelta, ypos + line->GetPosY()); line = line->GetNext(); @@ -351,7 +360,7 @@ void wxHtmlContainerCell::Layout(int w) if (step < 0) step = 0; xcnt--; if (xcnt > 0) while (line != cell) - { + { line->SetPos(line->GetPosX() + s_indent + (counter++ * step / xcnt), ypos + line->GetPosY()); @@ -373,12 +382,12 @@ void wxHtmlContainerCell::Layout(int w) 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(); } @@ -403,7 +412,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) { if (m_UseBkColour) - { + { wxBrush myb = wxBrush(m_BkColour, wxSOLID); int real_y1 = mMax(y + m_PosY, view_y1); @@ -415,7 +424,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) } if (m_UseBorder) - { + { wxPen mypen1(m_BorderColour1, 1, wxSOLID); wxPen mypen2(m_BorderColour2, 1, wxSOLID); @@ -459,18 +468,12 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y) wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const { - wxHtmlCell *c = m_Cells; - int cx, cy, cw, ch; + wxHtmlCell *cell = FindCellByPos(x, y); - 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 NULL; + // VZ: I don't know if we should pass absolute or relative coords to + // wxHtmlCell::GetLink()? As the base class version just ignores them + // anyhow, it hardly matters right now but should still be clarified + return cell ? cell->GetLink(x, y) : NULL; } @@ -518,12 +521,12 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale wxString wd = tag.GetParam(wxT("WIDTH")); if (wd[wd.Length()-1] == wxT('%')) - { + { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT); } else - { + { wxSscanf(wd.c_str(), wxT("%i"), &wdi); SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS); } @@ -549,25 +552,29 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co } - -void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) +wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const { - if (m_Cells) + for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() ) { - 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); - break; - } - c = c->GetNext(); + int cx = cell->GetPosX(), + cy = cell->GetPosY(); + + if ( (cx <= x) && (cx + cell->GetWidth() > x) && + (cy <= y) && (cy + cell->GetHeight() > y) ) + { + return cell->FindCellByPos(x - cx, y - cy); } } + + return NULL; +} + + +void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event) +{ + wxHtmlCell *cell = FindCellByPos(x, y); + if ( cell ) + cell->OnMouseClick(parent, x, y, event); } @@ -576,7 +583,7 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const { int cleft = m_PosX + m_Width, cright = m_PosX; // worst case int l, r; - + for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext()) { cell->GetHorizontalConstraints(&l, &r); @@ -584,7 +591,7 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const cleft = l; if (r > cright) cright = r; - } + } cleft -= (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft; cright += (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;