projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* GetValue() now returns true if the state is undetermined
[wxWidgets.git]
/
src
/
html
/
m_list.cpp
diff --git
a/src/html/m_list.cpp
b/src/html/m_list.cpp
index 144268218a4a62778e07bc5d01bedf2e1c12aadd..4050ee9cc0c14ad6d5abb96a83bcfe8a6a8095c2 100644
(file)
--- a/
src/html/m_list.cpp
+++ b/
src/html/m_list.cpp
@@
-6,7
+6,7
@@
// Copyright: (c) 1999 Vaclav Slavik
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) 1999 Vaclav Slavik
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation
#endif
#pragma implementation
#endif
@@
-44,7
+44,9
@@
class wxHtmlListmarkCell : public wxHtmlCell
public:
wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
public:
wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
- wxHtmlRenderingState& state);
+ wxHtmlRenderingInfo& info);
+
+ DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell)
};
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
};
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
@@
-58,7
+60,7
@@
wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCe
void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y,
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y,
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
- wxHtmlRendering
State& WXUNUSED(state
))
+ wxHtmlRendering
Info& WXUNUSED(info
))
{
dc.SetBrush(m_Brush);
dc.DrawEllipse(x + m_PosX + m_Width / 3, y + m_PosY + m_Height / 3,
{
dc.SetBrush(m_Brush);
dc.DrawEllipse(x + m_PosX + m_Width / 3, y + m_PosY + m_Height / 3,
@@
-133,7
+135,7
@@
TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
else m_Numbering = 1;
c = m_WParser->GetContainer();
else m_Numbering = 1;
c = m_WParser->GetContainer();
- if (c->GetFirstC
ell
() != NULL)
+ if (c->GetFirstC
hild
() != NULL)
{
m_WParser->CloseContainer();
m_WParser->OpenContainer();
{
m_WParser->CloseContainer();
m_WParser->OpenContainer();