]> git.saurik.com Git - wxWidgets.git/blob - src/html/m_list.cpp
a fix for the last fix
[wxWidgets.git] / src / html / m_list.cpp
1 /////////////////////////////////////////////////////////////////////////////
2 // Name: m_list.cpp
3 // Purpose: wxHtml module for lists
4 // Author: Vaclav Slavik
5 // RCS-ID: $Id$
6 // Copyright: (c) 1999 Vaclav Slavik
7 // Licence: wxWindows Licence
8 /////////////////////////////////////////////////////////////////////////////
9 #ifdef __GNUG__
10 #pragma implementation
11 #endif
12
13 #include "wx/wxprec.h"
14
15
16 #include "wx/defs.h"
17 #if wxUSE_HTML && wxUSE_STREAMS
18
19 #ifdef __BORDLANDC__
20 #pragma hdrstop
21 #endif
22
23 #ifndef WXPRECOMP
24 #include "wx/wx.h"
25 #endif
26
27
28 #include "wx/html/forcelnk.h"
29 #include "wx/html/m_templ.h"
30
31 #include "wx/html/htmlcell.h"
32
33 FORCE_LINK_ME(m_list)
34
35
36 //-----------------------------------------------------------------------------
37 // wxHtmlListmarkCell
38 //-----------------------------------------------------------------------------
39
40 class wxHtmlListmarkCell : public wxHtmlCell
41 {
42 private:
43 wxBrush m_Brush;
44 public:
45 wxHtmlListmarkCell(wxDC *dc, const wxColour& clr);
46 void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
47 };
48
49 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
50 {
51 m_Width = dc->GetCharWidth();
52 m_Height = dc->GetCharHeight();
53 m_Descent = 0;
54 }
55
56
57
58 void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
59 {
60 dc.SetBrush(m_Brush);
61 dc.DrawEllipse(x + m_PosX + m_Width / 4, y + m_PosY + m_Height / 4, m_Width / 2, m_Width / 2);
62 wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
63 }
64
65
66
67
68 //-----------------------------------------------------------------------------
69 // The list handler:
70 //-----------------------------------------------------------------------------
71
72
73 TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
74
75 TAG_HANDLER_VARS
76 int m_Numbering;
77 // this is number of actual item of list or 0 for dots
78
79 TAG_HANDLER_CONSTR(OLULLI)
80 {
81 m_Numbering = 0;
82 }
83
84 TAG_HANDLER_PROC(tag)
85 {
86 wxHtmlContainerCell *c;
87
88 // List Item:
89 if (tag.GetName() == wxT("LI"))
90 {
91 if (!tag.IsEnding())
92 {
93 m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP);
94 // this is to prevent indetation in <li><p> case
95 m_WParser->CloseContainer();
96 m_WParser->CloseContainer();
97
98 c = m_WParser->OpenContainer();
99 c->SetWidthFloat(2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS);
100 c->SetAlignHor(wxHTML_ALIGN_RIGHT);
101 if (m_Numbering == 0)
102 c->InsertCell(new wxHtmlListmarkCell(m_WParser->GetDC(), m_WParser->GetActualColor()));
103 else
104 {
105 wxString mark;
106 mark.Printf(wxT("%i."), m_Numbering);
107 c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC())));
108 }
109 m_WParser->CloseContainer();
110
111 c = m_WParser->OpenContainer();
112 c->SetIndent(m_WParser->GetCharWidth() / 4, wxHTML_INDENT_LEFT);
113 c->SetWidthFloat(-2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS);
114
115 m_WParser->OpenContainer();
116
117 if (m_Numbering != 0) m_Numbering++;
118 }
119 return FALSE;
120 }
121
122 // Begin of List (not-numbered): "UL", "OL"
123 else
124 {
125 int oldnum = m_Numbering;
126
127 if (tag.GetName() == wxT("UL")) m_Numbering = 0;
128 else m_Numbering = 1;
129
130 c = m_WParser->GetContainer();
131 if (c->GetFirstCell() != NULL)
132 {
133 m_WParser->CloseContainer();
134 m_WParser->OpenContainer();
135 c = m_WParser->GetContainer();
136 }
137 c->SetAlignHor(wxHTML_ALIGN_LEFT);
138 c->SetIndent(2 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
139 m_WParser->OpenContainer()->SetAlignVer(wxHTML_ALIGN_TOP);
140
141 m_WParser->OpenContainer();
142 m_WParser->OpenContainer();
143 ParseInner(tag);
144
145 m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP);
146 // this is to prevent indetation in <li><p> case
147 m_WParser->CloseContainer();
148
149 m_WParser->CloseContainer();
150 m_WParser->CloseContainer();
151 m_WParser->CloseContainer();
152 m_WParser->OpenContainer();
153
154 m_Numbering = oldnum;
155 return TRUE;
156 }
157 }
158
159 TAG_HANDLER_END(OLULLI)
160
161
162 TAGS_MODULE_BEGIN(List)
163
164 TAGS_MODULE_ADD(OLULLI)
165
166 TAGS_MODULE_END(List)
167
168 #endif