linking fixes

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index abb94c4a3b9aea7569a90b455cccc4eab8339a7a..c907af3fe77a725e7b6dfc215176da631e50c70d 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -135,41 +135,75 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
     if (m_Word.Find(wxT('&')) != -1) 
     {
 #define ESCSEQ(escape, subst)  \
     if (m_Word.Find(wxT('&')) != -1) 
     {
 #define ESCSEQ(escape, subst)  \

-                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } 
-        static wxChar* substitutions[][3] = 
+                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
+        static wxChar* substitutions[][4] =

                 {
                 ESCSEQ("quot", "\""),
                 {
                 ESCSEQ("quot", "\""),

+                ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),

                 ESCSEQ("lt", "<"),
                 ESCSEQ("lt", "<"),

+                ESCSEQ("#60", "<"),

                 ESCSEQ("gt", ">"),
                 ESCSEQ("gt", ">"),

+                ESCSEQ("#62", ">"),
+
+                ESCSEQ("#94", "^"), /* ^ */

     
                 ESCSEQ("nbsp", " "),
     
                 ESCSEQ("nbsp", " "),

+                ESCSEQ("#32", " "),

                 ESCSEQ("iexcl", "!"),
                 ESCSEQ("iexcl", "!"),

-                ESCSEQ("cent", "\242"/* ¢ */),
+                ESCSEQ("#33", "!"),
+                ESCSEQ("cent", "¢"/* ¢ */),
+                ESCSEQ("#162", "¢"/* ¢ */),

     
     

-                ESCSEQ("yen", " "),
-                ESCSEQ("brkbar", " "),
-                ESCSEQ("sect", " "),
-                ESCSEQ("uml", " "),
+                ESCSEQ("trade", "(TM)"),
+                ESCSEQ("#153", "(TM)"),
+                ESCSEQ("#8482", "(TM)"),
+
+                ESCSEQ("yen", "¥"),
+                ESCSEQ("#165", "¥"),
+                ESCSEQ("brkbar", "¦"),
+                ESCSEQ("#166", "¦"),
+                ESCSEQ("sect", "§"),
+                ESCSEQ("#167", "§"),
+                ESCSEQ("uml", "¨"),
+                ESCSEQ("#168", "¨"),

     
     

-                ESCSEQ("copy", "(c)"),
-                ESCSEQ("ordf", " "),
-                ESCSEQ("laquo", " "),
-                ESCSEQ("not", " "),
+                ESCSEQ("copy", "©"), /* © */
+                ESCSEQ("#169", "©"),
+                ESCSEQ("ordf", "ª"),
+                ESCSEQ("#170", "ª"),
+                ESCSEQ("laquo", "«"), /* « */
+                ESCSEQ("#171", "«"),
+                ESCSEQ("not", "¬"),
+                ESCSEQ("#172", "¬"),

     
     

-                ESCSEQ("reg", "(r)"),
+                ESCSEQ("reg", "®"), /* ® */
+                ESCSEQ("#174", "®"),

     
     

-                ESCSEQ("deg", " "),
-                ESCSEQ("plusm", " "),
+                ESCSEQ("deg", "°"), /* ° */
+                ESCSEQ("#176", "°"),
+                ESCSEQ("plusm", "±"), /* ± */
+                ESCSEQ("#177", "±"),

     
     

-                ESCSEQ("acute", " "),
-                ESCSEQ("micro", " "),
-                ESCSEQ("para", " "),
+                ESCSEQ("acute", "´"),
+                ESCSEQ("#180", "´"),
+                ESCSEQ("macron", "¯"),
+                ESCSEQ("#175", "¯"),
+                ESCSEQ("micro", "µ"), /* µ */
+                ESCSEQ("#181", "µ"),
+                ESCSEQ("para", "¶"), /* ¶ */
+                ESCSEQ("#182", "¶"),

     
     

-                ESCSEQ("ordm", " "),
-                ESCSEQ("raquo", " "),
+                ESCSEQ("ordm", "º"), /* º */
+                ESCSEQ("#186", "º"),
+                ESCSEQ("raquo", "»"), /* » */
+                ESCSEQ("#187", "»"),

     
     

-                ESCSEQ("iquest", " "),
+                ESCSEQ("iquest", "¿"), /* ¿ */
+                ESCSEQ("#191", "¿"),

                 ESCSEQ("Agrave", "\300"/* À */),
                 ESCSEQ("Agrave", "\300"/* À */),

+                ESCSEQ("#193", "\300"/* À */),

     
                 ESCSEQ("Acirc", "\302"/* Â */),
                 ESCSEQ("Atilde", "\303"/* Ã */),
     
                 ESCSEQ("Acirc", "\302"/* Â */),
                 ESCSEQ("Atilde", "\303"/* Ã */),


@@ -200,7 +234,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),

-                ESCSEQ("agrave;","à"),
+                ESCSEQ("agrave","\340"/* à */),

                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),
                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),


@@ -234,14 +268,16 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 
                 /* this one should ALWAYS stay the last one!!! */
                 ESCSEQ("amp", "&"),
 
                 /* this one should ALWAYS stay the last one!!! */
                 ESCSEQ("amp", "&"),

+                ESCSEQ("#38", "&"),

 
                 { NULL, NULL, NULL }
                 };
 
         for (int i = 0; substitutions[i][0] != NULL; i++) 
         {
 
                 { NULL, NULL, NULL }
                 };
 
         for (int i = 0; substitutions[i][0] != NULL; i++) 
         {

-            m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE);
-            m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE);
+            m_Word.Replace(substitutions[i][0], substitutions[i][3], TRUE);
+            m_Word.Replace(substitutions[i][1], substitutions[i][3], TRUE);
+            m_Word.Replace(substitutions[i][2], substitutions[i][3], TRUE);

         }
     }
 
         }
     }
 


@@ -748,7 +784,7 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
         c = c->GetParent();
     }
 
         c = c->GetParent();
     }
 

-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);

     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);


@@ -768,7 +804,7 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
         c = c->GetParent();
     }
 
         c = c->GetParent();
     }
 

-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);

     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::DrawInvisible(dc, x, y);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::DrawInvisible(dc, x, y);