X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2136a764e5537bdaef62439893b20de937b8935f..4a64bee465c0dbf3d97fbf290cb2fef4ad41ca34:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 007a09dedb..24a2d5c151 100644 --- 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$ @@ -11,21 +11,22 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" +#include "wx/defs.h" #if wxUSE_HTML #ifdef __BORDLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif /* 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. */ @@ -35,7 +36,7 @@ REMARKS: #include "wx/html/htmlcell.h" -FORCE_LINK_ME(mod_tables) +FORCE_LINK_ME(m_tables) #define TABLE_BORDER_CLR_1 wxColour(0xC5, 0xC2, 0xC5) @@ -92,9 +93,11 @@ class wxHtmlTableCell : public wxHtmlContainerCell int m_tBkg, m_rBkg; wxString m_tValign, m_rValign; + double m_PixelScale; + public: - wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag); + wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); ~wxHtmlTableCell(); virtual void Layout(int w); @@ -110,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) { - 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; @@ -121,10 +125,12 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t /* scan params: */ m_tBkg = m_rBkg = -1; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &m_tBkg); - if (tag.HasParam("VALIGN")) m_tValign = tag.GetParam("VALIGN"); else m_tValign = wxEmptyString; - if (tag.HasParam("CELLSPACING") && tag.ScanParam("CELLSPACING", "%i", &m_Spacing) == 1) {} else m_Spacing = 2; - if (tag.HasParam("CELLPADDING") && tag.ScanParam("CELLPADDING", "%i", &m_Padding) == 1) {} else m_Padding = 3; + if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &m_tBkg); + 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); @@ -157,7 +163,7 @@ void wxHtmlTableCell::ReallocCols(int cols) m_ColsInfo = (colStruct*) realloc(m_ColsInfo, sizeof(colStruct) * cols); for (j = m_NumCols; j < cols; j++) { m_ColsInfo[j].width = 0; - m_ColsInfo[j].units = HTML_UNITS_PERCENT; + m_ColsInfo[j].units = wxHTML_UNITS_PERCENT; } m_NumCols = cols; @@ -168,19 +174,21 @@ void wxHtmlTableCell::ReallocCols(int cols) void wxHtmlTableCell::ReallocRows(int rows) { m_CellInfo = (cellStruct**) realloc(m_CellInfo, sizeof(cellStruct*) * rows); - if (m_NumCols != 0) { - int x = rows - 1; - m_CellInfo[x] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols); - for (int i = 0; i < m_NumCols; i++) - m_CellInfo[x][i].flag = cellFree; + for (int row = m_NumRows; row < rows ; row++) + { + if (m_NumCols == 0) + m_CellInfo[row] = NULL; + else + { + m_CellInfo[row] = (cellStruct*) malloc(sizeof(cellStruct) * m_NumCols); + for (int col = 0; col < m_NumCols; col++) + m_CellInfo[row][col].flag = cellFree; + } } - else - m_CellInfo[rows - 1] = NULL; m_NumRows = rows; } - void wxHtmlTableCell::AddRow(const wxHtmlTag& tag) { if (m_ActualRow + 1 > m_NumRows - 1) @@ -190,8 +198,8 @@ void wxHtmlTableCell::AddRow(const wxHtmlTag& tag) /* scan params: */ m_rBkg = m_tBkg; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &m_rBkg); - if (tag.HasParam("VALIGN")) m_rValign = tag.GetParam("VALIGN"); else m_rValign = m_tValign; + if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &m_rBkg); + if (tag.HasParam(wxT("VALIGN"))) m_rValign = tag.GetParam(wxT("VALIGN")); else m_rValign = m_tValign; } @@ -211,7 +219,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) m_CellInfo[r][c].rowspan = 1; m_CellInfo[r][c].flag = cellUsed; m_CellInfo[r][c].minheight = 0; - m_CellInfo[r][c].valign = HTML_ALIGN_TOP; + m_CellInfo[r][c].valign = wxHTML_ALIGN_TOP; /* scan for parameters: */ @@ -221,12 +229,13 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) wxString wd = tag.GetParam("WIDTH"); if (wd[wd.Length()-1] == '%') { - sscanf(wd.c_str(), "%i%%", &m_ColsInfo[c].width); - m_ColsInfo[c].units = HTML_UNITS_PERCENT; + wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width); + m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; } else { - sscanf(wd.c_str(), "%i", &m_ColsInfo[c].width); - m_ColsInfo[c].units = HTML_UNITS_PIXELS; + 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; } } } @@ -234,8 +243,8 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) // spanning: { - if (tag.HasParam("COLSPAN")) tag.ScanParam("COLSPAN", "%i", &m_CellInfo[r][c].colspan); - if (tag.HasParam("ROWSPAN")) tag.ScanParam("ROWSPAN", "%i", &m_CellInfo[r][c].rowspan); + if (tag.HasParam(wxT("COLSPAN"))) tag.ScanParam(wxT("COLSPAN"), wxT("%i"), &m_CellInfo[r][c].colspan); + if (tag.HasParam(wxT("ROWSPAN"))) tag.ScanParam(wxT("ROWSPAN"), wxT("%i"), &m_CellInfo[r][c].rowspan); if ((m_CellInfo[r][c].colspan != 1) || (m_CellInfo[r][c].rowspan != 1)) { int i, j; @@ -251,7 +260,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) //background color: { int bk = m_rBkg; - if (tag.HasParam("BGCOLOR")) tag.ScanParam("BGCOLOR", "#%lX", &bk); + if (tag.HasParam(wxT("BGCOLOR"))) tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &bk); if (bk != -1) { wxColour clr = wxColour((bk & 0xFF0000) >> 16 , (bk & 0x00FF00) >> 8, (bk & 0x0000FF)); cell -> SetBackgroundColour(clr); @@ -263,14 +272,14 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) // 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(); - if (valign == "TOP") m_CellInfo[r][c].valign = HTML_ALIGN_TOP; - else if (valign == "BOTTOM") m_CellInfo[r][c].valign = HTML_ALIGN_BOTTOM; - else m_CellInfo[r][c].valign = HTML_ALIGN_CENTER; + 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; } - cell -> SetIndent(m_Padding, HTML_INDENT_ALL, HTML_UNITS_PIXELS); + cell -> SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); } @@ -285,7 +294,7 @@ void wxHtmlTableCell::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; } @@ -309,12 +318,12 @@ void wxHtmlTableCell::Layout(int w) // 1a. setup fixed-width columns: for (i = 0; i < m_NumCols; i++) - if (m_ColsInfo[i].units == HTML_UNITS_PIXELS) + if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS) wpix -= (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width); // 1b. setup floating-width columns: for (i = 0; i < m_NumCols; i++) - if ((m_ColsInfo[i].units == HTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) + if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) wtemp += (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width * wpix / 100); wpix -= wtemp; @@ -357,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 += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing; actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign); actcell -> Layout(fullwid); @@ -375,11 +385,12 @@ void wxHtmlTableCell::Layout(int w) 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; + fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing; actcell -> Layout(fullwid); actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); } @@ -410,8 +421,8 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") TAG_HANDLER_CONSTR(TABLE) { m_Table = NULL; - m_tAlign = m_rAlign = wxEmptyString; - m_OldAlign = HTML_ALIGN_LEFT; + m_tAlign = m_rAlign = wxEmptyString; + m_OldAlign = wxHTML_ALIGN_LEFT; } @@ -420,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: - if (tag.GetName() == "TABLE") { + if (tag.GetName() == wxT("TABLE")) { 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; - if (tag.HasParam("ALIGN")) m_tAlign = tag.GetParam("ALIGN"); + if (tag.HasParam(wxT("ALIGN"))) m_tAlign = tag.GetParam(wxT("ALIGN")); ParseInner(tag); @@ -445,10 +456,10 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") 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; - if (tag.HasParam("ALIGN")) m_rAlign = tag.GetParam("ALIGN"); + if (tag.HasParam(wxT("ALIGN"))) m_rAlign = tag.GetParam(wxT("ALIGN")); } // new cell @@ -459,18 +470,18 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") m_WParser -> OpenContainer(); - if (tag.GetName() == "TH") /*header style*/ { - m_WParser -> SetAlign(HTML_ALIGN_CENTER); + if (tag.GetName() == wxT("TH")) /*header style*/ { + m_WParser -> SetAlign(wxHTML_ALIGN_CENTER); } { 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(); - if (als == "RIGHT") m_WParser -> SetAlign(HTML_ALIGN_RIGHT); - else if (als == "CENTER") m_WParser -> SetAlign(HTML_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(); }