Mac-ify wxTreeCtrl further.

[wxWidgets.git] / src / html / m_list.cpp

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 58425f35c2cd234e422f223f11966ce4135d5174..ba6571362bba0f3eca61f8c298398d7508845bb8 100644 (file)
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -14,17 +14,17 @@
 
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/brush.h"
+    #include "wx/dc.h"

 #endif
 
 #endif
 

-

 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 


@@ -48,8 +48,8 @@ class wxHtmlListmarkCell : public wxHtmlCell
 
 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
 {
 
 wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID)
 {

-    m_Width = dc -> GetCharWidth();
-    m_Height = dc -> GetCharHeight();
+    m_Width = dc->GetCharWidth();
+    m_Height = dc->GetCharHeight();

     m_Descent = 0;
 }
 
     m_Descent = 0;
 }
 


@@ -59,7 +59,6 @@ void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int view_y1, int 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);
 {
     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,28 +85,33 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         wxHtmlContainerCell *c;
 
         // List Item:
         wxHtmlContainerCell *c;
 
         // List Item:

-        if (tag.GetName() == wxT("LI")) {
-            if (!tag.IsEnding()) {
-                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 (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();
+
+                c = m_WParser->OpenContainer();
+                c->SetWidthFloat(2 * m_WParser->GetCharWidth(), wxHTML_UNITS_PIXELS);
+                c->SetAlignHor(wxHTML_ALIGN_RIGHT);

                 if (m_Numbering == 0)
                 if (m_Numbering == 0)

-                    c -> InsertCell(new wxHtmlListmarkCell(m_WParser -> GetDC(), m_WParser -> GetActualColor()));
-                else {
+                    c->InsertCell(new wxHtmlListmarkCell(m_WParser->GetDC(), m_WParser->GetActualColor()));
+                else
+                {

                     wxString mark;
                     mark.Printf(wxT("%i."), m_Numbering);
                     wxString mark;
                     mark.Printf(wxT("%i."), m_Numbering);

-                    c -> InsertCell(new wxHtmlWordCell(mark, *(m_WParser -> GetDC())));
+                    c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC())));

                 }
                 }

-                m_WParser -> CloseContainer();
+                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++;
             }


@@ -115,31 +119,36 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         }
 
         // Begin of List (not-numbered): "UL", "OL"
         }
 
         // 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;
 
             int oldnum = m_Numbering;
 
             if (tag.GetName() == wxT("UL")) m_Numbering = 0;
             else m_Numbering = 1;
 

-            c = m_WParser -> GetContainer();
-            if (c -> GetFirstCell() != NULL) {
-                m_WParser -> CloseContainer();
-                m_WParser -> OpenContainer();
-                c = m_WParser -> GetContainer();
+            c = m_WParser->GetContainer();
+            if (c->GetFirstCell() != NULL)
+            {
+                m_WParser->CloseContainer();
+                m_WParser->OpenContainer();
+                c = m_WParser->GetContainer();

             }
             }

-            c -> SetAlignHor(wxHTML_ALIGN_LEFT);
-            c -> SetIndent(2 * m_WParser -> GetCharWidth(), wxHTML_INDENT_LEFT);
-            m_WParser -> OpenContainer() -> SetAlignVer(wxHTML_ALIGN_TOP);
+            c->SetAlignHor(wxHTML_ALIGN_LEFT);
+            c->SetIndent(2 * m_WParser->GetCharWidth(), wxHTML_INDENT_LEFT);
+            m_WParser->OpenContainer()->SetAlignVer(wxHTML_ALIGN_TOP);

 
 

-            m_WParser -> OpenContainer();
-            m_WParser -> OpenContainer();
+            m_WParser->OpenContainer();
+            m_WParser->OpenContainer();

             ParseInner(tag);
             ParseInner(tag);

-            m_WParser -> CloseContainer();

 
 

-            m_WParser -> CloseContainer();
-            m_WParser -> CloseContainer();
-            m_WParser -> CloseContainer();
-            m_WParser -> OpenContainer();
+            m_WParser->GetContainer()->SetIndent(0, wxHTML_INDENT_TOP);
+                // this is to prevent indetation in <li><p> case
+            m_WParser->CloseContainer();
+
+            m_WParser->CloseContainer();
+            m_WParser->CloseContainer();
+            m_WParser->CloseContainer();
+            m_WParser->OpenContainer();

 
             m_Numbering = oldnum;
             return TRUE;
 
             m_Numbering = oldnum;
             return TRUE;