Unicode compilation fixes for BC++ 5

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index dd4e4502a76f37f468d0c079eeb5a3a25e8eb8ef..f9f50db98f1534d5481509e73380945766220aac 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,20 +33,60 @@
 // 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,
                               bool WXUNUSED(left),
                               bool WXUNUSED(middle),
                               bool WXUNUSED(right))
 {

-    wxString lnk = GetLink(x, y);
-    if (lnk != wxEmptyString)
+    wxHtmlLinkInfo *lnk = GetLink(x, y);
+    if (lnk != NULL)

         ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk);
         // note : this overcasting is legal because parent is *always* wxHtmlWindow
 }
 
 
 
         ((wxHtmlWindow*)parent) -> OnLinkClicked(lnk);
         // note : this overcasting is legal because parent is *always* wxHtmlWindow
 }
 
 
 

+bool wxHtmlCell::AdjustPagebreak(int *pagebreak)
+{
+    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 = new wxHtmlLinkInfo(link);
+}
+
+
+

 //-----------------------------------------------------------------------------
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------


@@ -53,12 +94,29 @@ 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) 
+    {
+        static wxChar* substitutions[][3] = 
+                {
+                    { wxT("&nbsp;"), wxT("&nbsp "), wxT(" ") },
+                    { wxT("&copy;"), wxT("&copy "), wxT("(c)") },
+                    { wxT("&quot;"), wxT("&quot "), wxT("\"") },
+                    { wxT("&lt;"), wxT("&lt "), wxT("<") },
+                    { wxT("&gt;"), wxT("&gt "), wxT(">") },
+                    { wxT("&amp;"), wxT("&amp "), wxT("&")  /*this one should be last one*/ },
+                    { 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 +139,35 @@ 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_MinHeight = m_MaxLineWidth = 0;
     m_UseBkColour = FALSE;
     m_UseBorder = FALSE;
     m_MinHeight = m_MaxLineWidth = 0;

-    m_MinHeightAlign = HTML_ALIGN_TOP;
+    m_MinHeightAlign = wxHTML_ALIGN_TOP;

 }
 
 
 
 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;

 }
 
 
 
 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,12 +177,33 @@ 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)
+{
+    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;
+    }

 }
 
 
 }
 
 


@@ -143,7 +222,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;
     }


@@ -173,9 +252,9 @@ void wxHtmlContainerCell::Layout(int w)
     // 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;
 


@@ -192,9 +271,9 @@ void wxHtmlContainerCell::Layout(int w)
             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 : 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;
             }
             if (xdelta < 0) xdelta = 0;
             xdelta += s_indent;


@@ -216,9 +295,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);


@@ -286,7 +365,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 +377,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;

 }
 
 
 }
 
 


@@ -318,33 +397,33 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
 
 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("RIGHT"))
+            SetAlignHor(wxHTML_ALIGN_RIGHT);

     }
 }
 
 
 
     }
 }
 
 
 

-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);

         }
     }
 }
         }
     }
 }


@@ -392,9 +471,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 +482,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 +500,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);
 }
 


@@ -464,7 +543,7 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
     }
 
     ((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);
+    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);
 }


@@ -483,7 +562,7 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
     }
 
     ((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);
+    m_Wnd -> SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);

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