From: Václav Slavík Date: Wed, 16 Jul 2003 13:04:37 +0000 (+0000) Subject: removed GetHorizontalConstraints -- no longer needed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/67158ef673197ddc1a6ef977ccefc397a3798d84 removed GetHorizontalConstraints -- no longer needed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h index 80f49c23e1..3404b1592c 100644 --- a/include/wx/html/htmlcell.h +++ b/include/wx/html/htmlcell.h @@ -259,12 +259,6 @@ public: virtual bool IsLinebreakAllowed() const { return !IsFormattingCell(); } - // Returns y-coordinates that contraint the cell, i.e. left is highest - // and right lowest coordinate such that the cell lays between then. - // Note: this method does not return meaningful values if you haven't - // called Layout() before! - virtual void GetHorizontalConstraints(int *left, int *right) const; - // Returns true for simple == terminal cells, i.e. not composite ones. // This if for internal usage only and may disappear in future versions! virtual bool IsTerminalCell() const { return TRUE; } @@ -410,7 +404,6 @@ public: virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const; virtual const wxHtmlCell* Find(int condition, const void* param) const; virtual void OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event); - virtual void GetHorizontalConstraints(int *left, int *right) const; virtual wxHtmlCell* GetFirstChild() const { return m_Cells; } #if WXWIN_COMPATIBILITY_2_4 diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 7a4ff817a3..4df9e7bc2a 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -158,16 +158,6 @@ void wxHtmlCell::Layout(int WXUNUSED(w)) -void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const -{ - if (left) - *left = m_PosX; - if (right) - *right = m_PosX + m_Width; -} - - - const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const { return NULL; @@ -1046,30 +1036,6 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxM -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); - if (l < cleft) - 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; - - if (left) - *left = cleft; - if (right) - *right = cright; -} - - wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const { if ( m_Cells )