Bug fix in GetLabelFromText

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

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index d23cd4044705bf1d5029e0edb4bfada936aee83c..58425f35c2cd234e422f223f11966ce4135d5174 100644 (file)
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_list.cpp
+// Name:        m_list.cpp

 // Purpose:     wxHtml module for lists
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for lists
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -10,7 +10,7 @@
 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"


@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #ifndef WXPRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 
 #endif
 
 


@@ -30,7 +30,7 @@
 
 #include "wx/html/htmlcell.h"
 
 
 #include "wx/html/htmlcell.h"
 

-FORCE_LINK_ME(mod_list)
+FORCE_LINK_ME(m_list)

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -86,7 +86,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         wxHtmlContainerCell *c;
 
         // List Item:
         wxHtmlContainerCell *c;
 
         // List Item:

-        if (tag.GetName() == "LI") {
+        if (tag.GetName() == wxT("LI")) {

             if (!tag.IsEnding()) {
                 m_WParser -> CloseContainer();
                 m_WParser -> CloseContainer();
             if (!tag.IsEnding()) {
                 m_WParser -> CloseContainer();
                 m_WParser -> CloseContainer();


@@ -98,7 +98,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
                     c -> InsertCell(new wxHtmlListmarkCell(m_WParser -> GetDC(), m_WParser -> GetActualColor()));
                 else {
                     wxString mark;
                     c -> InsertCell(new wxHtmlListmarkCell(m_WParser -> GetDC(), m_WParser -> GetActualColor()));
                 else {
                     wxString mark;

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

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


@@ -118,7 +118,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         else {
             int oldnum = m_Numbering;
 
         else {
             int oldnum = m_Numbering;
 

-            if (tag.GetName() == "UL") m_Numbering = 0;
+            if (tag.GetName() == wxT("UL")) m_Numbering = 0;

             else m_Numbering = 1;
 
             c = m_WParser -> GetContainer();
             else m_Numbering = 1;
 
             c = m_WParser -> GetContainer();