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

removed GetHorizontalConstraints -- no longer needed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-16 13:04:37 +00:00
parent 36863a0a71
commit 67158ef673
2 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/html/htmlcell.h
View File

@@ -259,12 +259,6 @@ public:
virtual bool IsLinebreakAllowed() const virtual bool IsLinebreakAllowed() const
{ return !IsFormattingCell(); } { 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. // Returns true for simple == terminal cells, i.e. not composite ones.
// This if for internal usage only and may disappear in future versions! // This if for internal usage only and may disappear in future versions!
virtual bool IsTerminalCell() const { return TRUE; } virtual bool IsTerminalCell() const { return TRUE; }
@@ -410,7 +404,6 @@ public:
virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const; virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const;
virtual const wxHtmlCell* Find(int condition, const void* param) 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 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; } virtual wxHtmlCell* GetFirstChild() const { return m_Cells; }
#if WXWIN_COMPATIBILITY_2_4 #if WXWIN_COMPATIBILITY_2_4

34
src/html/htmlcell.cpp
View File

@@ -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 const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const
{ {
return NULL; 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 wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
{ {
if ( m_Cells ) if ( m_Cells )