fix for assert when setting tooltip for a readonly combo

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

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index feaae666fe5f475637bb2995acfaec973867cbcd..3e4b9023e35b197fd86fe1d62519b201758d74ad 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$
@@ -10,18 +10,18 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -30,7 +30,7 @@
 
 #include "wx/html/htmlcell.h"
 
-FORCE_LINK_ME(mod_list)
+FORCE_LINK_ME(m_list)
 
 
 //-----------------------------------------------------------------------------
@@ -86,26 +86,26 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         wxHtmlContainerCell *c;
 
         // List Item:
-        if (tag.GetName() == "LI") {
+        if (tag.GetName() == wxT("LI")) {
             if (!tag.IsEnding()) {
                 m_WParser -> CloseContainer();
                 m_WParser -> CloseContainer();
 
                 c = m_WParser -> OpenContainer();
-                c -> SetWidthFloat(2 * m_WParser -> GetCharWidth(), HTML_UNITS_PIXELS);
-                c -> SetAlignHor(HTML_ALIGN_RIGHT);
+                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("%i.", m_Numbering);
+                    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, HTML_INDENT_LEFT);
-                c -> SetWidthFloat(-2 * m_WParser -> GetCharWidth(), HTML_UNITS_PIXELS);
+                c -> SetIndent(m_WParser -> GetCharWidth() / 4, wxHTML_INDENT_LEFT);
+                c -> SetWidthFloat(-2 * m_WParser -> GetCharWidth(), wxHTML_UNITS_PIXELS);
 
                 m_WParser -> OpenContainer();
 
@@ -118,7 +118,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
         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();
@@ -127,9 +127,9 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
                 m_WParser -> OpenContainer();
                 c = m_WParser -> GetContainer();
             }
-            c -> SetAlignHor(HTML_ALIGN_LEFT);
-            c -> SetIndent(2 * m_WParser -> GetCharWidth(), HTML_INDENT_LEFT);
-            m_WParser -> OpenContainer() -> SetAlignVer(HTML_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();