/////////////////////////////////////////////////////////////////////////////
-// Name: mod_tables.cpp
+// Name: m_tables.cpp
// Purpose: wxHtml module for tables
// Author: Vaclav Slavik
// RCS-ID: $Id$
#pragma implementation
#endif
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_HTML
#endif
#ifndef WXPRECOMP
-#include <wx/wx.h>
+#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.
*/
#include "wx/html/htmlcell.h"
-FORCE_LINK_ME(mod_tables)
+FORCE_LINK_ME(m_tables)
#define TABLE_BORDER_CLR_1 wxColour(0xC5, 0xC2, 0xC5)
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);
-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;
/* 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);
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)
/* 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;
}
wxString wd = tag.GetParam("WIDTH");
if (wd[wd.Length()-1] == '%') {
- sscanf(wd.c_str(), "%i%%", &m_ColsInfo[c].width);
+ 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);
+ 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;
}
}
// 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;
//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);
// 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 = 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;
}
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);
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]);
}
TAG_HANDLER_CONSTR(TABLE)
{
m_Table = NULL;
- m_tAlign = m_rAlign = wxEmptyString;
- m_OldAlign = wxHTML_ALIGN_LEFT;
+ m_tAlign = m_rAlign = wxEmptyString;
+ m_OldAlign = wxHTML_ALIGN_LEFT;
}
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);
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
m_WParser -> OpenContainer();
- if (tag.GetName() == "TH") /*header style*/ {
+ 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(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();
}
projects / wxWidgets.git / blobdiff