TIFF fix.

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

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 33e24919fb2c4a7fa39838478edb4148e35366fb..24a2d5c15185225df733a3167b7287d3a8c7f0df 100644 (file)
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_tables.cpp
+// Name:        m_tables.cpp

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


@@ -26,7 +26,7 @@
 
 /*
 REMARKS:
 
 /*
 REMARKS:

-    1. This version of mod_tables doesn't support auto-layout algorithm.
+    1. This version of m_tables doesn't support auto-layout algorithm.

        This means that all columns are of same width unless explicitly specified.
 */
 
        This means that all columns are of same width unless explicitly specified.
 */
 


@@ -36,7 +36,7 @@ REMARKS:
 
 #include "wx/html/htmlcell.h"
 
 
 #include "wx/html/htmlcell.h"
 

-FORCE_LINK_ME(mod_tables)
+FORCE_LINK_ME(m_tables)

 
 
 #define TABLE_BORDER_CLR_1  wxColour(0xC5, 0xC2, 0xC5)
 
 
 #define TABLE_BORDER_CLR_1  wxColour(0xC5, 0xC2, 0xC5)


@@ -93,9 +93,11 @@ class wxHtmlTableCell : public wxHtmlContainerCell
         int m_tBkg, m_rBkg;
         wxString m_tValign, m_rValign;
 
         int m_tBkg, m_rBkg;
         wxString m_tValign, m_rValign;
 

+        double m_PixelScale;
+

 
     public:
 
     public:

-        wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag);
+        wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0);

         ~wxHtmlTableCell();
         virtual void Layout(int w);
 
         ~wxHtmlTableCell();
         virtual void Layout(int w);
 


@@ -111,10 +113,11 @@ class wxHtmlTableCell : public wxHtmlContainerCell
 
 
 
 
 
 

-wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag)
+wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale)

  : wxHtmlContainerCell(parent)
 {
  : wxHtmlContainerCell(parent)
 {

-    m_HasBorders = (tag.HasParam("BORDER") && tag.GetParam("BORDER") != "0");
+    m_PixelScale = pixel_scale;
+    m_HasBorders = (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0"));

     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;
     m_ColsInfo = NULL;
     m_NumCols = m_NumRows = 0;
     m_CellInfo = NULL;


@@ -126,6 +129,8 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t
     if (tag.HasParam(wxT("VALIGN"))) m_tValign = tag.GetParam(wxT("VALIGN")); else m_tValign = wxEmptyString;
     if (tag.HasParam(wxT("CELLSPACING")) && tag.ScanParam(wxT("CELLSPACING"), wxT("%i"), &m_Spacing) == 1) {} else m_Spacing = 2;
     if (tag.HasParam(wxT("CELLPADDING")) && tag.ScanParam(wxT("CELLPADDING"), wxT("%i"), &m_Padding) == 1) {} else m_Padding = 3;
     if (tag.HasParam(wxT("VALIGN"))) m_tValign = tag.GetParam(wxT("VALIGN")); else m_tValign = wxEmptyString;
     if (tag.HasParam(wxT("CELLSPACING")) && tag.ScanParam(wxT("CELLSPACING"), wxT("%i"), &m_Spacing) == 1) {} else m_Spacing = 2;
     if (tag.HasParam(wxT("CELLPADDING")) && tag.ScanParam(wxT("CELLPADDING"), wxT("%i"), &m_Padding) == 1) {} else m_Padding = 3;

+    m_Spacing = (int)(m_PixelScale * (double)m_Spacing);
+    m_Padding = (int)(m_PixelScale * (double)m_Padding);

 
     if (m_HasBorders)
         SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2);
 
     if (m_HasBorders)
         SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2);


@@ -229,6 +234,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
             }
             else {
                 wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);
             }
             else {
                 wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);

+                m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width);

                 m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
             }
         }
                 m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
             }
         }


@@ -266,10 +272,10 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
     // vertical alignment:
     {
         wxString valign;
     // vertical alignment:
     {
         wxString valign;

-        if (tag.HasParam("VALIGN")) valign = tag.GetParam("VALIGN"); else valign = m_tValign;
+        if (tag.HasParam(wxT("VALIGN"))) valign = tag.GetParam(wxT("VALIGN")); else valign = m_tValign;

         valign.MakeUpper();
         valign.MakeUpper();

-        if (valign == "TOP") m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP;
-        else if (valign == "BOTTOM") m_CellInfo[r][c].valign = wxHTML_ALIGN_BOTTOM;
+        if (valign == wxT("TOP")) m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP;
+        else if (valign == wxT("BOTTOM")) m_CellInfo[r][c].valign = wxHTML_ALIGN_BOTTOM;

         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 
         else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER;
     }
 


@@ -360,6 +366,7 @@ void wxHtmlTableCell::Layout(int w)
                 fullwid = 0;
                 for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
                     fullwid += m_ColsInfo[i].pixwidth;
                 fullwid = 0;
                 for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
                     fullwid += m_ColsInfo[i].pixwidth;

+                fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing;

                 actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign);
                 actcell -> Layout(fullwid);
 
                 actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign);
                 actcell -> Layout(fullwid);
 


@@ -378,11 +385,12 @@ void wxHtmlTableCell::Layout(int w)
                 if (m_CellInfo[actrow][actcol].flag != cellUsed) continue;
                 actcell = m_CellInfo[actrow][actcol].cont;
                 actcell -> SetMinHeight(
                 if (m_CellInfo[actrow][actcol].flag != cellUsed) continue;
                 actcell = m_CellInfo[actrow][actcol].cont;
                 actcell -> SetMinHeight(

-                                 ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] - m_CellInfo[actrow][actcol].rowspan * m_Spacing,
+                                 ypos[actrow + m_CellInfo[actrow][actcol].rowspan] - ypos[actrow] -  m_Spacing,

                                  m_CellInfo[actrow][actcol].valign);
                 fullwid = 0;
                 for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
                     fullwid += m_ColsInfo[i].pixwidth;
                                  m_CellInfo[actrow][actcol].valign);
                 fullwid = 0;
                 for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++)
                     fullwid += m_ColsInfo[i].pixwidth;

+                fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing;

                 actcell -> Layout(fullwid);
                 actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]);
             }
                 actcell -> Layout(fullwid);
                 actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]);
             }


@@ -423,18 +431,18 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
         wxHtmlContainerCell *c;
 
         // new table started, backup upper-level table (if any) and create new:
         wxHtmlContainerCell *c;
 
         // new table started, backup upper-level table (if any) and create new:

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

             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;
             int m_OldAlign;
 
             oldcont = c = m_WParser -> OpenContainer();
 
             wxHtmlTableCell *oldt = m_Table;
             wxHtmlContainerCell *oldcont;
             int m_OldAlign;
 
             oldcont = c = m_WParser -> OpenContainer();
 

-            c -> SetWidthFloat(tag);
-            m_Table = new wxHtmlTableCell(c, tag);
+            c -> SetWidthFloat(tag, m_WParser -> GetPixelScale());
+            m_Table = new wxHtmlTableCell(c, tag, m_WParser -> GetPixelScale());

             m_OldAlign = m_WParser -> GetAlign();
             m_tAlign = wxEmptyString;
             m_OldAlign = m_WParser -> GetAlign();
             m_tAlign = wxEmptyString;

-            if (tag.HasParam("ALIGN")) m_tAlign = tag.GetParam("ALIGN");
+            if (tag.HasParam(wxT("ALIGN"))) m_tAlign = tag.GetParam(wxT("ALIGN"));

 
             ParseInner(tag);
 
 
             ParseInner(tag);
 


@@ -448,10 +456,10 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
 
         else if (m_Table && !tag.IsEnding()) {
             // new row in table
 
         else if (m_Table && !tag.IsEnding()) {
             // new row in table

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

                 m_Table -> AddRow(tag);
                 m_rAlign = m_tAlign;
                 m_Table -> AddRow(tag);
                 m_rAlign = m_tAlign;

-                if (tag.HasParam("ALIGN")) m_rAlign = tag.GetParam("ALIGN");
+                if (tag.HasParam(wxT("ALIGN"))) m_rAlign = tag.GetParam(wxT("ALIGN"));

             }
 
             // new cell
             }
 
             // new cell


@@ -462,7 +470,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
 
                 m_WParser -> OpenContainer();
 
 
                 m_WParser -> OpenContainer();
 

-                if (tag.GetName() == "TH") /*header style*/ {
+                if (tag.GetName() == wxT("TH")) /*header style*/ {

                     m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);
                 }
 
                     m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);
                 }
 


@@ -470,10 +478,10 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
                     wxString als;
 
                     als = m_rAlign;
                     wxString als;
 
                     als = m_rAlign;

-                    if (tag.HasParam("ALIGN")) als = tag.GetParam("ALIGN");
+                    if (tag.HasParam(wxT("ALIGN"))) als = tag.GetParam(wxT("ALIGN"));

                     als.MakeUpper();
                     als.MakeUpper();

-                    if (als == "RIGHT") m_WParser -> SetAlign(wxHTML_ALIGN_RIGHT);
-                    else if (als == "CENTER") m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);
+                    if (als == wxT("RIGHT")) m_WParser -> SetAlign(wxHTML_ALIGN_RIGHT);
+                    else if (als == wxT("CENTER")) m_WParser -> SetAlign(wxHTML_ALIGN_CENTER);

                 }
                 m_WParser -> OpenContainer();
             }
                 }
                 m_WParser -> OpenContainer();
             }