X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1da7aa8c4a11689a82ca0e4df2923b08ebfc6822..038072e2f1eaf2bf32d748a71234d767ebba8919:/src/html/m_list.cpp

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 292e8ccde0..51488e2d3d 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -21,10 +21,10 @@
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/brush.h"
+    #include "wx/dc.h"
 #endif
 
-
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
@@ -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);
 }
 
 
@@ -86,50 +85,48 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         wxHtmlContainerCell *c;
 
         // List Item:
-        if (tag.GetName() == wxT("LI")) 
-	    {
-            if (!tag.IsEnding()) 
-	        {
-                m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP);
-                    // this is to prevent indetation in <li><p> case
-                m_WParser->CloseContainer();
-                m_WParser->CloseContainer();
+        if (tag.GetName() == wxT("LI"))
+        {
+            m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP);
+                // this is to prevent indetation in <li><p> 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 
-		        {
-                    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;
         }
 
         // Begin of List (not-numbered): "UL", "OL"
-        else 
-	    {
+        else
+        {
             int oldnum = m_Numbering;
 
             if (tag.GetName() == wxT("UL")) m_Numbering = 0;
             else m_Numbering = 1;
 
             c = m_WParser->GetContainer();
-            if (c->GetFirstCell() != NULL) 
-	        {
+            if (c->GetFirstCell() != NULL)
+            {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
                 c = m_WParser->GetContainer();