Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index a0dae73b81327a6fa4efb8dbb11263047236b642..e6c3269665b3dd59f940b6ad80da958439a45d76 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -13,6 +13,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#include "wx/defs.h"

 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__
 #if wxUSE_HTML
 
 #ifdef __BORDLANDC__


@@ -32,16 +33,61 @@
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 

+wxHtmlCell::wxHtmlCell() : wxObject() 
+{
+    m_Next = NULL; 
+    m_Parent = NULL; 
+    m_Width = m_Height = m_Descent = 0; 
+    m_CanLiveOnPagebreak = TRUE;
+    m_Link = NULL;
+}
+
+wxHtmlCell::~wxHtmlCell() 
+{
+    if (m_Link) delete m_Link; 
+    if (m_Next) delete m_Next;
+}
+

 
 

-void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
-                              bool WXUNUSED(left),
-                              bool WXUNUSED(middle),
-                              bool WXUNUSED(right))
+void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, 
+                              const wxMouseEvent& event)

 {
 {

-    wxString lnk = GetLink(x, y);
-    if (lnk != wxEmptyString)
-        ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk);
+    wxHtmlLinkInfo *lnk = GetLink(x, y);
+    if (lnk != NULL)
+    {
+        wxHtmlLinkInfo lnk2(*lnk);
+        lnk2.SetEvent(&event);
+        lnk2.SetHtmlCell(this);
+        ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk2);

         // note : this overcasting is legal because parent is *always* wxHtmlWindow
         // note : this overcasting is legal because parent is *always* wxHtmlWindow

+    }
+}
+
+
+
+bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
+{
+    if ((!m_CanLiveOnPagebreak) && 
+                m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) {
+        *pagebreak = m_PosY;
+        if (m_Next != NULL) m_Next -> AdjustPagebreak(pagebreak);
+        return TRUE;
+    }
+    
+    else {
+        if (m_Next != NULL) return m_Next -> AdjustPagebreak(pagebreak);
+        else return FALSE;
+    }
+}
+
+
+
+void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) 
+{
+    if (m_Link) delete m_Link;
+    m_Link = NULL;
+    if (link.GetHref() != wxEmptyString)
+        m_Link = new wxHtmlLinkInfo(link);

 }
 
 
 }
 
 


@@ -53,12 +99,122 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;

-    m_Word.Replace("&nbsp;", " ", TRUE);
-    m_Word.Replace("&quot;", "\"", TRUE);
-    m_Word.Replace("&lt;", "<", TRUE);
-    m_Word.Replace("&gt;", ">", TRUE);
-    m_Word.Replace("&amp;", "&", TRUE);
+    
+    if (m_Word.Find(wxT('&')) != -1) 
+    {
+#define ESCSEQ(escape, subst)  \
+                  { wxT("&"escape";"), wxT("&"escape" "), wxT(subst) } 
+        static wxChar* substitutions[][3] = 
+                {
+                ESCSEQ("quot", "\""),
+                ESCSEQ("lt", "<"),
+                ESCSEQ("gt", ">"),
+    
+                ESCSEQ("nbsp", " "),
+                ESCSEQ("iexcl", "!"),
+                ESCSEQ("cent", "¢"),
+    
+                ESCSEQ("yen", " "),
+                ESCSEQ("brkbar", " "),
+                ESCSEQ("sect", " "),
+                ESCSEQ("uml", " "),
+    
+                ESCSEQ("copy", "(c)"),
+                ESCSEQ("ordf", " "),
+                ESCSEQ("laquo", " "),
+                ESCSEQ("not", " "),
+    
+                ESCSEQ("reg", "(r)"),
+    
+                ESCSEQ("deg", " "),
+                ESCSEQ("plusm", " "),
+    
+                ESCSEQ("acute", " "),
+                ESCSEQ("micro", " "),
+                ESCSEQ("para", " "),
+    
+                ESCSEQ("ordm", " "),
+                ESCSEQ("raquo", " "),
+    
+                ESCSEQ("iquest", " "),
+                ESCSEQ("Agrave", "À"),
+    
+                ESCSEQ("Acirc", "Â"),
+                ESCSEQ("Atilde", "Ã"),
+                ESCSEQ("Auml", "Ä"),
+                ESCSEQ("Aring", " "),
+                ESCSEQ("AElig", " "),
+                ESCSEQ("Ccedil", "ç"),
+                ESCSEQ("Egrave", "È"),
+                ESCSEQ("Eacute", "É"),
+                ESCSEQ("Ecirc", "Ê"),
+                ESCSEQ("Euml", "Ë"),
+                ESCSEQ("Igrave", "Ì"),
+
+                ESCSEQ("Icirc", "Î"),
+                ESCSEQ("Iuml", "Ï"),
+    
+                ESCSEQ("Ntilde", "Ñ"),
+                ESCSEQ("Ograve", "Ò"),
+    
+                ESCSEQ("Ocirc", "Ô"),
+                ESCSEQ("Otilde", "Õ"),
+                ESCSEQ("Ouml", "Ö"),
+    
+                ESCSEQ("Oslash", " "),
+                ESCSEQ("Ugrave", "Ù"),
+    
+                ESCSEQ("Ucirc", " "),
+                ESCSEQ("Uuml", "Ü"),
+    
+                ESCSEQ("szlig", "§"),
+                ESCSEQ("agrave;","à"),
+                ESCSEQ("aacute", "á"),
+                ESCSEQ("acirc", "â"),
+                ESCSEQ("atilde", "ã"),
+                ESCSEQ("auml", "ä"),
+                ESCSEQ("aring", "a"),
+                ESCSEQ("aelig", "ae"),
+                ESCSEQ("ccedil", "ç"),
+                ESCSEQ("egrave", "è"),
+                ESCSEQ("eacute", "é"),
+                ESCSEQ("ecirc", "ê"),
+                ESCSEQ("euml", "ë"),
+                ESCSEQ("igrave", "ì"),
+                ESCSEQ("iacute", "í"),
+                ESCSEQ("icirc", " "),
+                ESCSEQ("iuml", "ï"),
+                ESCSEQ("eth", " "),
+                ESCSEQ("ntilde", "ñ"),
+                ESCSEQ("ograve", "ò"),
+                ESCSEQ("oacute", "ó"),
+                ESCSEQ("ocirc", "ô"),
+                ESCSEQ("otilde", "õ"),
+                ESCSEQ("ouml", "ö"),
+                ESCSEQ("divide", " "),
+                ESCSEQ("oslash", " "),
+                ESCSEQ("ugrave", "ù"),
+                ESCSEQ("uacute", "ú"),
+                ESCSEQ("ucirc", "û"),
+                ESCSEQ("uuml", "ü"),
+    
+                ESCSEQ("yuml", ""),
+
+                /* this one should ALWAYS stay the last one!!! */
+                ESCSEQ("amp", "&"),
+
+                { 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);
+        }
+    }
+

     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);

+    SetCanLiveOnPagebreak(FALSE);

 }
 
 
 }
 
 


@@ -81,35 +237,37 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
     m_Cells = m_LastCell = NULL;
     m_Parent = parent;
     if (m_Parent) m_Parent -> InsertCell(this);
     m_Cells = m_LastCell = NULL;
     m_Parent = parent;
     if (m_Parent) m_Parent -> InsertCell(this);

-    m_AlignHor = HTML_ALIGN_LEFT;
-    m_AlignVer = HTML_ALIGN_BOTTOM;
+    m_AlignHor = wxHTML_ALIGN_LEFT;
+    m_AlignVer = wxHTML_ALIGN_BOTTOM;

     m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
     m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;

-    m_WidthFloat = 100; m_WidthFloatUnits = HTML_UNITS_PERCENT;
+    m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;

     m_UseBkColour = FALSE;
     m_UseBorder = FALSE;
     m_UseBkColour = FALSE;
     m_UseBorder = FALSE;

-    m_MinHeight = m_MaxLineWidth = 0;
-    m_MinHeightAlign = HTML_ALIGN_TOP;
+    m_MinHeight = 0;
+    m_MinHeightAlign = wxHTML_ALIGN_TOP;
+    m_LastLayout = -1;

 }
 
 
 
 void wxHtmlContainerCell::SetIndent(int i, int what, int units)
 {
 }
 
 
 
 void wxHtmlContainerCell::SetIndent(int i, int what, int units)
 {

-    int val = (units == HTML_UNITS_PIXELS) ? i : -i;
-    if (what & HTML_INDENT_LEFT) m_IndentLeft = val;
-    if (what & HTML_INDENT_RIGHT) m_IndentRight = val;
-    if (what & HTML_INDENT_TOP) m_IndentTop = val;
-    if (what & HTML_INDENT_BOTTOM) m_IndentBottom = val;
+    int val = (units == wxHTML_UNITS_PIXELS) ? i : -i;
+    if (what & wxHTML_INDENT_LEFT) m_IndentLeft = val;
+    if (what & wxHTML_INDENT_RIGHT) m_IndentRight = val;
+    if (what & wxHTML_INDENT_TOP) m_IndentTop = val;
+    if (what & wxHTML_INDENT_BOTTOM) m_IndentBottom = val;
+    m_LastLayout = -1;

 }
 
 
 
 int wxHtmlContainerCell::GetIndent(int ind) const
 {
 }
 
 
 
 int wxHtmlContainerCell::GetIndent(int ind) const
 {

-    if (ind & HTML_INDENT_LEFT) return m_IndentLeft;
-    else if (ind & HTML_INDENT_RIGHT) return m_IndentRight;
-    else if (ind & HTML_INDENT_TOP) return m_IndentTop;
-    else if (ind & HTML_INDENT_BOTTOM) return m_IndentBottom;
+    if (ind & wxHTML_INDENT_LEFT) return m_IndentLeft;
+    else if (ind & wxHTML_INDENT_RIGHT) return m_IndentRight;
+    else if (ind & wxHTML_INDENT_TOP) return m_IndentTop;
+    else if (ind & wxHTML_INDENT_BOTTOM) return m_IndentBottom;

     else return -1; /* BUG! Should not be called... */
 }
 
     else return -1; /* BUG! Should not be called... */
 }
 


@@ -119,23 +277,52 @@ int wxHtmlContainerCell::GetIndent(int ind) const
 int wxHtmlContainerCell::GetIndentUnits(int ind) const
 {
     bool p = FALSE;
 int wxHtmlContainerCell::GetIndentUnits(int ind) const
 {
     bool p = FALSE;

-    if (ind & HTML_INDENT_LEFT) p = m_IndentLeft < 0;
-    else if (ind & HTML_INDENT_RIGHT) p = m_IndentRight < 0;
-    else if (ind & HTML_INDENT_TOP) p = m_IndentTop < 0;
-    else if (ind & HTML_INDENT_BOTTOM) p = m_IndentBottom < 0;
-    if (p) return HTML_UNITS_PERCENT;
-    else return HTML_UNITS_PIXELS;
+    if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0;
+    else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0;
+    else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0;
+    else if (ind & wxHTML_INDENT_BOTTOM) p = m_IndentBottom < 0;
+    if (p) return wxHTML_UNITS_PERCENT;
+    else return wxHTML_UNITS_PIXELS;
+}
+
+
+
+bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
+{
+    if (!m_CanLiveOnPagebreak) 
+        return wxHtmlCell::AdjustPagebreak(pagebreak);
+
+    else {
+        wxHtmlCell *c = GetFirstCell();
+        bool rt = FALSE;
+        int pbrk = *pagebreak - m_PosY;
+
+        while (c) {
+            if (c -> AdjustPagebreak(&pbrk)) rt = TRUE;
+            c = c -> GetNext();
+        }
+        if (rt) *pagebreak = pbrk + m_PosY;
+        return rt;
+    }

 }
 
 
 
 void wxHtmlContainerCell::Layout(int w)
 {
 }
 
 
 
 void wxHtmlContainerCell::Layout(int w)
 {

+    if (m_LastLayout == w) {
+        wxHtmlCell::Layout(w);
+        return;
+    } 
+

     wxHtmlCell *cell = m_Cells, *line = m_Cells;
     long xpos = 0, ypos = m_IndentTop;
     int xdelta = 0, ybasicpos = 0, ydiff;
     int s_width, s_indent;
     int ysizeup = 0, ysizedown = 0;
     wxHtmlCell *cell = m_Cells, *line = m_Cells;
     long xpos = 0, ypos = m_IndentTop;
     int xdelta = 0, ybasicpos = 0, ydiff;
     int s_width, s_indent;
     int ysizeup = 0, ysizedown = 0;

+    int MaxLineWidth = 0;
+    int xcnt = 0;
+

 
     /*
 
 
     /*
 


@@ -143,7 +330,7 @@ void wxHtmlContainerCell::Layout(int w)
 
     */
 
 
     */
 

-    if (m_WidthFloatUnits == HTML_UNITS_PERCENT) {
+    if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) {

         if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
         else m_Width = m_WidthFloat * w / 100;
     }
         if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
         else m_Width = m_WidthFloat * w / 100;
     }


@@ -168,14 +355,12 @@ void wxHtmlContainerCell::Layout(int w)
     s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
     s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
 
     s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
     s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
 

-    m_MaxLineWidth = 0;
-

     // my own layouting:
     while (cell != NULL) {
         switch (m_AlignVer) {
     // my own layouting:
     while (cell != NULL) {
         switch (m_AlignVer) {

-            case HTML_ALIGN_TOP :      ybasicpos = 0; break;
-            case HTML_ALIGN_BOTTOM :   ybasicpos = - cell -> GetHeight(); break;
-            case HTML_ALIGN_CENTER :   ybasicpos = - cell -> GetHeight() / 2; break;
+            case wxHTML_ALIGN_TOP :      ybasicpos = 0; break;
+            case wxHTML_ALIGN_BOTTOM :   ybasicpos = - cell -> GetHeight(); break;
+            case wxHTML_ALIGN_CENTER :   ybasicpos = - cell -> GetHeight() / 2; break;

         }
         ydiff = cell -> GetHeight() + ybasicpos;
 
         }
         ydiff = cell -> GetHeight() + ybasicpos;
 


@@ -185,28 +370,51 @@ void wxHtmlContainerCell::Layout(int w)
         cell -> SetPos(xpos, ybasicpos + cell -> GetDescent());
         xpos += cell -> GetWidth();
         cell = cell -> GetNext();
         cell -> SetPos(xpos, ybasicpos + cell -> GetDescent());
         xpos += cell -> GetWidth();
         cell = cell -> GetNext();

+        xcnt++;

 
         // force new line if occured:
         if ((cell == NULL) || (xpos + cell -> GetWidth() > s_width)) {
 
         // force new line if occured:
         if ((cell == NULL) || (xpos + cell -> GetWidth() > s_width)) {

-            if (xpos > m_MaxLineWidth) m_MaxLineWidth = xpos;
+            if (xpos > MaxLineWidth) MaxLineWidth = xpos;

             if (ysizeup < 0) ysizeup = 0;
             if (ysizedown < 0) ysizedown = 0;
             switch (m_AlignHor) {
             if (ysizeup < 0) ysizeup = 0;
             if (ysizedown < 0) ysizedown = 0;
             switch (m_AlignHor) {

-                case HTML_ALIGN_LEFT : xdelta = 0; break;
-                case HTML_ALIGN_RIGHT : xdelta = 0 + (s_width - xpos); break;
-                case HTML_ALIGN_CENTER : xdelta = 0 + (s_width - xpos) / 2; break;
+                case wxHTML_ALIGN_LEFT : 
+                case wxHTML_ALIGN_JUSTIFY : 
+                         xdelta = 0; 
+                         break;
+                case wxHTML_ALIGN_RIGHT : 
+                         xdelta = 0 + (s_width - xpos); 
+                         break;
+                case wxHTML_ALIGN_CENTER : 
+                         xdelta = 0 + (s_width - xpos) / 2; 
+                         break;

             }
             if (xdelta < 0) xdelta = 0;
             xdelta += s_indent;
 
             ypos += ysizeup;
             }
             if (xdelta < 0) xdelta = 0;
             xdelta += s_indent;
 
             ypos += ysizeup;

-            while (line != cell) {
-                line -> SetPos(line -> GetPosX() + xdelta, ypos + line -> GetPosY());
-                line = line -> GetNext();
+            
+            if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
+                while (line != cell) {
+                    line -> SetPos(line -> GetPosX() + xdelta, 
+                                   ypos + line -> GetPosY());
+                    line = line -> GetNext();
+                }
+            else
+            { 
+                int counter = 0;
+                int step = (s_width - xpos);
+                if (step < 0) step = 0;
+                while (line != cell) {
+                    line -> SetPos(line -> GetPosX() + s_indent +
+                                   (counter++ * step / xcnt),
+                                   ypos + line -> GetPosY());
+                    line = line -> GetNext();
+                }

             }
 
             ypos += ysizedown;
             }
 
             ypos += ysizedown;

-            xpos = 0;
+            xpos = xcnt = 0;

             ysizeup = ysizedown = 0;
             line = cell;
         }
             ysizeup = ysizedown = 0;
             line = cell;
         }


@@ -216,9 +424,9 @@ void wxHtmlContainerCell::Layout(int w)
     m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom;
 
     if (m_Height < m_MinHeight) {
     m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom;
 
     if (m_Height < m_MinHeight) {

-        if (m_MinHeightAlign != HTML_ALIGN_TOP) {
+        if (m_MinHeightAlign != wxHTML_ALIGN_TOP) {

             int diff = m_MinHeight - m_Height;
             int diff = m_MinHeight - m_Height;

-            if (m_MinHeightAlign == HTML_ALIGN_CENTER) diff /= 2;
+            if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2;

             cell = m_Cells;
             while (cell) {
                 cell -> SetPos(cell -> GetPosX(), cell -> GetPosY() + diff);
             cell = m_Cells;
             while (cell) {
                 cell -> SetPos(cell -> GetPosX(), cell -> GetPosY() + diff);


@@ -228,8 +436,10 @@ void wxHtmlContainerCell::Layout(int w)
         m_Height = m_MinHeight;
     }
 
         m_Height = m_MinHeight;
     }
 

-    m_MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
-    if (m_Width < m_MaxLineWidth) m_Width = m_MaxLineWidth;
+    MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
+    if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
+
+    m_LastLayout = w;

 
     wxHtmlCell::Layout(w);
 }
 
     wxHtmlCell::Layout(w);
 }


@@ -286,7 +496,7 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
 
 
 
 
 
 

-wxString wxHtmlContainerCell::GetLink(int x, int y) const
+wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const

 {
     wxHtmlCell *c = m_Cells;
     int cx, cy, cw, ch;
 {
     wxHtmlCell *c = m_Cells;
     int cx, cy, cw, ch;


@@ -298,7 +508,7 @@ wxString wxHtmlContainerCell::GetLink(int x, int y) const
             return c -> GetLink(x - cx, y - cy);
         c = c -> GetNext();
     }
             return c -> GetLink(x - cx, y - cy);
         c = c -> GetNext();
     }

-    return wxEmptyString;
+    return NULL;

 }
 
 
 }
 
 


@@ -312,40 +522,45 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
         if (m_LastCell) while (m_LastCell -> GetNext()) m_LastCell = m_LastCell -> GetNext();
     }
     f -> SetParent(this);
         if (m_LastCell) while (m_LastCell -> GetNext()) m_LastCell = m_LastCell -> GetNext();
     }
     f -> SetParent(this);

+    m_LastLayout = -1;

 }
 
 
 
 void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
 {
 }
 
 
 
 void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
 {

-    if (tag.HasParam("ALIGN")) {
-        wxString alg = tag.GetParam("ALIGN");
+    if (tag.HasParam(wxT("ALIGN"))) {
+        wxString alg = tag.GetParam(wxT("ALIGN"));

         alg.MakeUpper();
         alg.MakeUpper();

-        if (alg == "CENTER")
-            SetAlignHor(HTML_ALIGN_CENTER);
-        else if (alg == "LEFT")
-            SetAlignHor(HTML_ALIGN_LEFT);
-        else if (alg == "RIGHT")
-            SetAlignHor(HTML_ALIGN_RIGHT);
+        if (alg == wxT("CENTER"))
+            SetAlignHor(wxHTML_ALIGN_CENTER);
+        else if (alg == wxT("LEFT"))
+            SetAlignHor(wxHTML_ALIGN_LEFT);
+        else if (alg == wxT("JUSTIFY"))
+            SetAlignHor(wxHTML_ALIGN_JUSTIFY);
+        else if (alg == wxT("RIGHT"))
+            SetAlignHor(wxHTML_ALIGN_RIGHT);
+        m_LastLayout = -1;

     }
 }
 
 
 
     }
 }
 
 
 

-void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag)
+void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale)

 {
 {

-    if (tag.HasParam("WIDTH")) {
+    if (tag.HasParam(wxT("WIDTH"))) {

         int wdi;
         int wdi;

-        wxString wd = tag.GetParam("WIDTH");
+        wxString wd = tag.GetParam(wxT("WIDTH"));

 
 

-        if (wd[wd.Length()-1] == '%') {
-            sscanf(wd.c_str(), "%i%%", &wdi);
-            SetWidthFloat(wdi, HTML_UNITS_PERCENT);
+        if (wd[wd.Length()-1] == wxT('%')) {
+            wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
+            SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);

         }
         else {
         }
         else {

-            sscanf(wd.c_str(), "%i", &wdi);
-            SetWidthFloat(wdi, HTML_UNITS_PIXELS);
+            wxSscanf(wd.c_str(), wxT("%i"), &wdi);
+            SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS);

         }
         }

+        m_LastLayout = -1;

     }
 }
 
     }
 }
 


@@ -365,7 +580,7 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
 
 
 
 
 
 

-void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left, bool middle, bool right)
+void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)

 {
     if (m_Cells) {
         wxHtmlCell *c = m_Cells;
 {
     if (m_Cells) {
         wxHtmlCell *c = m_Cells;


@@ -374,7 +589,7 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left
                     (c -> GetPosY() <= y) &&
                     (c -> GetPosX() + c -> GetWidth() > x) &&
                     (c -> GetPosY() + c -> GetHeight() > y)) {
                     (c -> GetPosY() <= y) &&
                     (c -> GetPosX() + c -> GetWidth() > x) &&
                     (c -> GetPosY() + c -> GetHeight() > y)) {

-                c -> OnMouseClick(parent, x - c -> GetPosX(), y - c -> GetPosY(), left, middle, right);
+                c -> OnMouseClick(parent, x - c -> GetPosX(), y - c -> GetPosY(), event);

                 break;
             }
             c = c -> GetNext();
                 break;
             }
             c = c -> GetNext();


@@ -392,9 +607,9 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, bool left
 
 void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
 
 void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {

-    if (m_Flags & HTML_CLR_FOREGROUND)
+    if (m_Flags & wxHTML_CLR_FOREGROUND)

         dc.SetTextForeground(m_Colour);
         dc.SetTextForeground(m_Colour);

-    if (m_Flags & HTML_CLR_BACKGROUND) {
+    if (m_Flags & wxHTML_CLR_BACKGROUND) {

         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }


@@ -403,9 +618,9 @@ void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 
 void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
 {
 
 void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
 {

-    if (m_Flags & HTML_CLR_FOREGROUND)
+    if (m_Flags & wxHTML_CLR_FOREGROUND)

         dc.SetTextForeground(m_Colour);
         dc.SetTextForeground(m_Colour);

-    if (m_Flags & HTML_CLR_BACKGROUND) {
+    if (m_Flags & wxHTML_CLR_BACKGROUND) {

         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }


@@ -421,13 +636,13 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
 
 void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
 
 void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {

-    dc.SetFont(*m_Font);
+    dc.SetFont(m_Font);

     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
 {
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
 {

-    dc.SetFont(*m_Font);
+    dc.SetFont(m_Font);

     wxHtmlCell::DrawInvisible(dc, x, y);
 }
 
     wxHtmlCell::DrawInvisible(dc, x, y);
 }
 


@@ -463,13 +678,8 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
         c = c -> GetParent();
     }
 
         c = c -> GetParent();
     }
 

-#ifdef __WXMSW__

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

-    m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy  - HTML_SCROLL_STEP * sty, m_Width, m_Height);
-#else
-
-    m_Wnd -> SetSize(absx, absy, m_Width, m_Height);
-#endif
+    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);
 }
 
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }


@@ -487,13 +697,9 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
         c = c -> GetParent();
     }
 
         c = c -> GetParent();
     }
 

-#ifdef __WXMSW__

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

-    m_Wnd -> SetSize(absx - HTML_SCROLL_STEP * stx, absy  - HTML_SCROLL_STEP * sty, m_Width, m_Height);
-#else
+    m_Wnd -> SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);

 
 

-    m_Wnd -> SetSize(absx, absy, m_Width, m_Height);
-#endif

     wxHtmlCell::DrawInvisible(dc, x, y);
 }
 
     wxHtmlCell::DrawInvisible(dc, x, y);
 }