projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compilation/warning fixes.
[wxWidgets.git]
/
src
/
html
/
htmlcell.cpp
diff --git
a/src/html/htmlcell.cpp
b/src/html/htmlcell.cpp
index 909584da202fe00c0d3a07773574286c17eba105..7881b478f0c0a572077309342880b6d440b458d2 100644
(file)
--- a/
src/html/htmlcell.cpp
+++ b/
src/html/htmlcell.cpp
@@
-8,7
+8,7
@@
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation
+#pragma implementation
"htmlcell.h"
#endif
#include "wx/wxprec.h"
#endif
#include "wx/wxprec.h"
@@
-17,7
+17,7
@@
#if wxUSE_HTML && wxUSE_STREAMS
#if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BOR
D
LANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#pragma hdrstop
#endif
@@
-68,7
+68,7
@@
void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
-bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlCell::AdjustPagebreak(int *pagebreak
, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)
) const
{
if ((!m_CanLiveOnPagebreak) &&
m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
{
if ((!m_CanLiveOnPagebreak) &&
m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
@@
-215,10
+215,10
@@
int wxHtmlContainerCell::GetIndentUnits(int ind) const
-bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak
, int* known_pagebreaks, int number_of_pages
) const
{
if (!m_CanLiveOnPagebreak)
{
if (!m_CanLiveOnPagebreak)
- return wxHtmlCell::AdjustPagebreak(pagebreak);
+ return wxHtmlCell::AdjustPagebreak(pagebreak
, known_pagebreaks, number_of_pages
);
else
{
else
{
@@
-228,7
+228,7
@@
bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
while (c)
{
while (c)
{
- if (c->AdjustPagebreak(&pbrk))
+ if (c->AdjustPagebreak(&pbrk
, known_pagebreaks, number_of_pages
))
rt = TRUE;
c = c->GetNext();
}
rt = TRUE;
c = c->GetNext();
}
@@
-255,8
+255,8
@@
void wxHtmlContainerCell::Layout(int w)
m_Width = 0;
for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
cell->Layout(0);
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
- // contrainers and resets children's position to (0,0)
+ // this does two things: it recursively calls this code on all
+ // c
hild c
ontrainers and resets children's position to (0,0)
return;
}
return;
}
@@
-408,9
+408,8
@@
void wxHtmlContainerCell::Layout(int w)
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
// container visible, draw it:
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)
{
wxBrush myb = wxBrush(m_BkColour, wxSOLID);
if (m_UseBkColour)
{
wxBrush myb = wxBrush(m_BkColour, wxSOLID);
@@
-430,10
+429,10
@@
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
dc.SetPen(mypen1);
dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX, y + m_PosY + m_Height - 1);
dc.SetPen(mypen1);
dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX, y + m_PosY + m_Height - 1);
- dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width
- 1
, y + m_PosY);
+ dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width, y + m_PosY);
dc.SetPen(mypen2);
dc.DrawLine(x + m_PosX + m_Width - 1, y + m_PosY, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
dc.SetPen(mypen2);
dc.DrawLine(x + m_PosX + m_Width - 1, y + m_PosY, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
- dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width
- 1
, y + m_PosY + m_Height - 1);
+ dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width, y + m_PosY + m_Height - 1);
}
if (m_Cells)
}
if (m_Cells)
@@
-465,6
+464,15
@@
void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
}
}
+wxColour wxHtmlContainerCell::GetBackgroundColour()
+{
+ if (m_UseBkColour)
+ return m_BkColour;
+ else
+ return wxNullColour;
+}
+
+
wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
{
wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
{