X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..e6adf05834e880312efa3d59914ecc1d4f5f78a6:/src/html/m_list.cpp?ds=sidebyside diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp index cf6b010fae..51488e2d3d 100644 --- a/src/html/m_list.cpp +++ b/src/html/m_list.cpp @@ -55,11 +55,10 @@ wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCe -void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) +void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) { dc.SetBrush(m_Brush); dc.DrawEllipse(x + m_PosX + m_Width / 4, y + m_PosY + m_Height / 4, m_Width / 2, m_Width / 2); - wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } @@ -88,34 +87,32 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI") // List Item: if (tag.GetName() == wxT("LI")) { - if (!tag.IsEnding()) + m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP); + // this is to prevent indetation in
  • case + m_WParser->CloseContainer(); + m_WParser->CloseContainer(); + + c = m_WParser->OpenContainer(); + c->SetWidthFloat(2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS); + c->SetAlignHor(wxHTML_ALIGN_RIGHT); + if (m_Numbering == 0) + c->InsertCell(new wxHtmlListmarkCell(m_WParser->GetDC(), m_WParser->GetActualColor())); + else { - m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP); - // this is to prevent indetation in

  • case - m_WParser->CloseContainer(); - m_WParser->CloseContainer(); + wxString mark; + mark.Printf(wxT("%i."), m_Numbering); + c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC()))); + } + m_WParser->CloseContainer(); - c = m_WParser->OpenContainer(); - c->SetWidthFloat(2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS); - c->SetAlignHor(wxHTML_ALIGN_RIGHT); - if (m_Numbering == 0) - c->InsertCell(new wxHtmlListmarkCell(m_WParser->GetDC(), m_WParser->GetActualColor())); - else - { - wxString mark; - mark.Printf(wxT("%i."), m_Numbering); - c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC()))); - } - m_WParser->CloseContainer(); + c = m_WParser->OpenContainer(); + c->SetIndent(m_WParser->GetCharWidth() / 4, wxHTML_INDENT_LEFT); + c->SetWidthFloat(-2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS); - c = m_WParser->OpenContainer(); - c->SetIndent(m_WParser->GetCharWidth() / 4, wxHTML_INDENT_LEFT); - c->SetWidthFloat(-2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS); + m_WParser->OpenContainer(); - m_WParser->OpenContainer(); + if (m_Numbering != 0) m_Numbering++; - if (m_Numbering != 0) m_Numbering++; - } return FALSE; }