X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01325161d50f20b8c894397a6a70f9d788576343..e8f60bac1ab18be00b4e433f5db7b0261c5f17da:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index af88b562d9..d1abf09252 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$ @@ -7,26 +7,25 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif #include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML -#ifdef __BORDLANDC__ +#if wxUSE_HTML && wxUSE_STREAMS +#ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WXPRECOMP -#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. */ @@ -36,7 +35,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) @@ -48,84 +47,114 @@ FORCE_LINK_ME(mod_tables) //----------------------------------------------------------------------------- -typedef struct { - int width, units; // universal - int leftpos, pixwidth, maxrealwidth; // temporary (depends on width of table) - } colStruct; +struct colStruct +{ + int width, units; + // width of the column either in pixels or percents + // ('width' is the number, 'units' determines its meaning) + int minWidth, maxWidth; + // minimal/maximal column width. This is needed by HTML 4.0 + // layouting algorithm and can be determined by trying to + // layout table cells with width=1 and width=infinity + int leftpos, pixwidth, maxrealwidth; + // temporary (depends on actual width of table) +}; -typedef enum { - cellSpan, - cellUsed, - cellFree - } cellState; +enum cellState +{ + cellSpan, + cellUsed, + cellFree +}; -typedef struct { - wxHtmlContainerCell *cont; - int colspan, rowspan; - int minheight, valign; - cellState flag; - } cellStruct; +struct cellStruct +{ + wxHtmlContainerCell *cont; + int colspan, rowspan; + int minheight, valign; + cellState flag; +}; class wxHtmlTableCell : public wxHtmlContainerCell { - protected: - /* These are real attributes: */ - bool m_HasBorders; - // should we draw borders or not? - int m_NumCols, m_NumRows; - // number of columns; rows - colStruct *m_ColsInfo; - // array of column information - cellStruct **m_CellInfo; - // 2D array of all cells in the table : m_CellInfo[row][column] - int m_Spacing; - // spaces between cells - int m_Padding; - // cells internal indentation - - private: - /* ...and these are valid only during parsing of table: */ - int m_ActualCol, m_ActualRow; - // number of actual column (ranging from 0..m_NumCols) - - // default values (for table and row): - int m_tBkg, m_rBkg; - wxString m_tValign, m_rValign; - - - public: - wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag); - ~wxHtmlTableCell(); - virtual void Layout(int w); - - void AddRow(const wxHtmlTag& tag); - void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); - private: - void ReallocCols(int cols); - void ReallocRows(int rows); - // reallocates memory to given number of cols/rows - // and changes m_NumCols/m_NumRows value to reflect this change - // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!! +protected: + /* These are real attributes: */ + + // should we draw borders or not? + bool m_HasBorders; + // number of columns; rows + int m_NumCols, m_NumRows; + // array of column information + colStruct *m_ColsInfo; + // 2D array of all cells in the table : m_CellInfo[row][column] + cellStruct **m_CellInfo; + // spaces between cells + int m_Spacing; + // cells internal indentation + int m_Padding; + +private: + /* ...and these are valid only when parsing the table: */ + + // number of actual column (ranging from 0..m_NumCols) + int m_ActualCol, m_ActualRow; + + // default values (for table and row): + wxColour m_tBkg, m_rBkg; + wxString m_tValign, m_rValign; + + double m_PixelScale; + + +public: + wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); + ~wxHtmlTableCell(); + virtual void Layout(int w); + + void AddRow(const wxHtmlTag& tag); + void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); + +private: + // Reallocates memory to given number of cols/rows + // and changes m_NumCols/m_NumRows value to reflect this change + // NOTE! You CAN'T change m_NumCols/m_NumRows before calling this!! + void ReallocCols(int cols); + void ReallocRows(int rows); + + // Computes minimal and maximal widths of columns. Needs to be called + // only once, before first Layout(). + void ComputeMinMaxWidths(); + + DECLARE_NO_COPY_CLASS(wxHtmlTableCell) }; -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; m_ActualCol = m_ActualRow = -1; /* scan params: */ - m_tBkg = m_rBkg = -1; - 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; + if (tag.HasParam(wxT("BGCOLOR"))) + tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg); + if (tag.HasParam(wxT("VALIGN"))) + m_tValign = tag.GetParam(wxT("VALIGN")); + else + m_tValign = wxEmptyString; + if (!tag.GetParamAsInt(wxT("CELLSPACING"), &m_Spacing)) + m_Spacing = 2; + if (!tag.GetParamAsInt(wxT("CELLPADDING"), &m_Padding)) + 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); @@ -136,7 +165,8 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t wxHtmlTableCell::~wxHtmlTableCell() { if (m_ColsInfo) free(m_ColsInfo); - if (m_CellInfo) { + if (m_CellInfo) + { for (int i = 0; i < m_NumRows; i++) free(m_CellInfo[i]); free(m_CellInfo); @@ -149,16 +179,19 @@ void wxHtmlTableCell::ReallocCols(int cols) { int i,j; - for (i = 0; i < m_NumRows; i++) { + for (i = 0; i < m_NumRows; i++) + { m_CellInfo[i] = (cellStruct*) realloc(m_CellInfo[i], sizeof(cellStruct) * cols); for (j = m_NumCols; j < cols; j++) m_CellInfo[i][j].flag = cellFree; } m_ColsInfo = (colStruct*) realloc(m_ColsInfo, sizeof(colStruct) * cols); - for (j = m_NumCols; j < cols; j++) { + for (j = m_NumCols; j < cols; j++) + { m_ColsInfo[j].width = 0; m_ColsInfo[j].units = wxHTML_UNITS_PERCENT; + m_ColsInfo[j].minWidth = m_ColsInfo[j].maxWidth = -1; } m_NumCols = cols; @@ -169,39 +202,58 @@ 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) - ReallocRows(m_ActualRow + 2); - m_ActualRow++; m_ActualCol = -1; + // VS: real allocation of row entry is done in AddCell in order + // to correctly handle empty rows (i.e. "") + // m_ActualCol == -1 indicates that AddCell has to allocate new row. - /* scan params: */ + // scan params: m_rBkg = m_tBkg; - 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; + if (tag.HasParam(wxT("BGCOLOR"))) + tag.GetParamAsColour(wxT("BGCOLOR"), &m_rBkg); + if (tag.HasParam(wxT("VALIGN"))) + m_rValign = tag.GetParam(wxT("VALIGN")); + else + m_rValign = m_tValign; } void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) { - do { + // Is this cell in new row? + // VS: we can't do it in AddRow, see my comment there + if (m_ActualCol == -1) + { + if (m_ActualRow + 1 > m_NumRows - 1) + ReallocRows(m_ActualRow + 2); + m_ActualRow++; + } + + // cells & columns: + do + { m_ActualCol++; - } while ((m_ActualCol < m_NumCols) && (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree)); + } while ((m_ActualCol < m_NumCols) && + (m_CellInfo[m_ActualRow][m_ActualCol].flag != cellFree)); + if (m_ActualCol > m_NumCols - 1) ReallocCols(m_ActualCol + 1); @@ -218,15 +270,19 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) // width: { - if (tag.HasParam("WIDTH")) { - wxString wd = tag.GetParam("WIDTH"); + if (tag.HasParam(wxT("WIDTH"))) + { + wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == '%') { + if (wd[wd.Length()-1] == wxT('%')) + { wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width); m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; } - else { + 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; } } @@ -235,13 +291,28 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) // spanning: { - 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)) { + tag.GetParamAsInt(wxT("COLSPAN"), &m_CellInfo[r][c].colspan); + tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan); + + // VS: the standard says this about col/rowspan: + // "This attribute specifies the number of rows spanned by the + // current cell. The default value of this attribute is one ("1"). + // The value zero ("0") means that the cell spans all rows from the + // current row to the last row of the table." All mainstream + // browsers act as if 0==1, though, and so does wxHTML. + if (m_CellInfo[r][c].colspan < 1) + m_CellInfo[r][c].colspan = 1; + if (m_CellInfo[r][c].rowspan < 1) + m_CellInfo[r][c].rowspan = 1; + + if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1)) + { int i, j; - if (r + m_CellInfo[r][c].rowspan > m_NumRows) ReallocRows(r + m_CellInfo[r][c].rowspan); - if (c + m_CellInfo[r][c].colspan > m_NumCols) ReallocCols(c + m_CellInfo[r][c].colspan); + if (r + m_CellInfo[r][c].rowspan > m_NumRows) + ReallocRows(r + m_CellInfo[r][c].rowspan); + if (c + m_CellInfo[r][c].colspan > m_NumCols) + ReallocCols(c + m_CellInfo[r][c].colspan); for (i = r; i < r + m_CellInfo[r][c].rowspan; i++) for (j = c; j < c + m_CellInfo[r][c].colspan; j++) m_CellInfo[i][j].flag = cellSpan; @@ -251,46 +322,80 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) //background color: { - int bk = m_rBkg; - 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); - } + wxColour bk = m_rBkg; + if (tag.HasParam(wxT("BGCOLOR"))) + tag.GetParamAsColour(wxT("BGCOLOR"), &bk); + if (bk.Ok()) + cell->SetBackgroundColour(bk); } if (m_HasBorders) - cell -> SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); + cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); // 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; } - cell -> SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); + cell->SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); } - - +void wxHtmlTableCell::ComputeMinMaxWidths() +{ + if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return; + + for (int c = 0; c < m_NumCols; c++) + { + for (int r = 0; r < m_NumRows; r++) + { + cellStruct& cell = m_CellInfo[r][c]; + if (cell.flag == cellUsed) + { + cell.cont->Layout(2*m_Padding + 1); + int width = cell.cont->GetWidth(); + width -= (cell.colspan-1) * m_Spacing; + // HTML 4.0 says it is acceptable to distribute min/max + width /= cell.colspan; + for (int j = 0; j < cell.colspan; j++) + if (width > m_ColsInfo[c+j].minWidth) + m_ColsInfo[c+j].minWidth = width; + } + } + } + + // FIXME -- compute maxWidth as well. Not needed yet, so there's no + // point in computing it. +} void wxHtmlTableCell::Layout(int w) { + ComputeMinMaxWidths(); + + wxHtmlCell::Layout(w); + /* WIDTH ADJUSTING : */ - if (m_WidthFloatUnits == wxHTML_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; } - else { + else + { if (m_WidthFloat < 0) m_Width = w + m_WidthFloat; else m_Width = m_WidthFloat; } @@ -306,33 +411,47 @@ void wxHtmlTableCell::Layout(int w) { int wpix = m_Width - (m_NumCols + 1) * m_Spacing; int i, j; - int wtemp = 0; // 1a. setup fixed-width columns: for (i = 0; i < m_NumCols; i++) if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS) - wpix -= (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width); + { + m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, + m_ColsInfo[i].minWidth); + wpix -= m_ColsInfo[i].pixwidth; + } // 1b. setup floating-width columns: + int wtemp = 0; for (i = 0; i < m_NumCols; i++) if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) - wtemp += (m_ColsInfo[i].pixwidth = m_ColsInfo[i].width * wpix / 100); + { + m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width * wpix / 100, + m_ColsInfo[i].minWidth); + wtemp += m_ColsInfo[i].pixwidth; + } wpix -= wtemp; // 1c. setup defalut columns (no width specification supplied): - // NOTE! This algorithm doesn't conform to HTML standard : it assigns equal widths - // instead of optimal + // FIXME: This algorithm doesn't conform to HTML standard : it assigns + // equal widths instead of optimal for (i = j = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) j++; for (i = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) - m_ColsInfo[i].pixwidth = wpix / j; + { + // FIXME: this is not optimal, because if we allocate more than + // wpix/j pixels to one column, we should try to allocate + // smaller place to other columns + m_ColsInfo[i].pixwidth = wxMax(wpix/j, m_ColsInfo[i].minWidth); + } } /* 2. compute positions of columns: */ { int wpos = m_Spacing; - for (int i = 0; i < m_NumCols; i++) { + for (int i = 0; i < m_NumCols; i++) + { m_ColsInfo[i].leftpos = wpos; wpos += m_ColsInfo[i].pixwidth + m_Spacing; } @@ -346,10 +465,11 @@ void wxHtmlTableCell::Layout(int w) int fullwid; wxHtmlContainerCell *actcell; - for (actrow = 0; actrow <= m_NumRows; actrow++) ypos[actrow] = m_Spacing; - - for (actrow = 0; actrow < m_NumRows; actrow++) { - + ypos[0] = m_Spacing; + for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1; + for (actrow = 0; actrow < m_NumRows; actrow++) + { + if (ypos[actrow] == -1) ypos[actrow] = ypos[actrow-1]; // 3a. sub-layout and detect max height: for (actcol = 0; actcol < m_NumCols; actcol++) { @@ -358,37 +478,47 @@ void wxHtmlTableCell::Layout(int w) fullwid = 0; for (int i = actcol; i < m_CellInfo[actrow][actcol].colspan + actcol; i++) fullwid += m_ColsInfo[i].pixwidth; - actcell -> SetMinHeight(m_CellInfo[actrow][actcol].minheight, m_CellInfo[actrow][actcol].valign); - actcell -> Layout(fullwid); + 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 (ypos[actrow] + actcell -> GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing > ypos[actrow + m_CellInfo[actrow][actcol].rowspan]) + if (ypos[actrow] + actcell->GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing > ypos[actrow + m_CellInfo[actrow][actcol].rowspan]) ypos[actrow + m_CellInfo[actrow][actcol].rowspan] = - ypos[actrow] + actcell -> GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing; + ypos[actrow] + actcell->GetHeight() + m_CellInfo[actrow][actcol].rowspan * m_Spacing; } } - - for (actrow = 0; actrow < m_NumRows; actrow++) { - + for (actrow = 0; actrow < m_NumRows; actrow++) + { // 3b. place cells in row & let'em all have same height: - for (actcol = 0; actcol < m_NumCols; actcol++) { + for (actcol = 0; actcol < m_NumCols; actcol++) + { 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, + actcell->SetMinHeight( + 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; - actcell -> Layout(fullwid); - actcell -> SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); + fullwid += (m_CellInfo[actrow][actcol].colspan - 1) * m_Spacing; + actcell->Layout(fullwid); + actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); } - } m_Height = ypos[m_NumRows]; delete[] ypos; } + + /* 4. adjust table's width if it was too small: */ + if (m_NumCols > 0) + { + int twidth = m_ColsInfo[m_NumCols-1].leftpos + + m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing; + if (twidth > m_Width) + m_Width = twidth; + } } @@ -406,13 +536,11 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") TAG_HANDLER_VARS wxHtmlTableCell* m_Table; wxString m_tAlign, m_rAlign; - int m_OldAlign; TAG_HANDLER_CONSTR(TABLE) { m_Table = NULL; m_tAlign = m_rAlign = wxEmptyString; - m_OldAlign = wxHTML_ALIGN_LEFT; } @@ -421,59 +549,69 @@ 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(); + oldcont = c = m_WParser->OpenContainer(); - c -> SetWidthFloat(tag); - m_Table = new wxHtmlTableCell(c, tag); - m_OldAlign = m_WParser -> GetAlign(); + c->SetWidthFloat(tag, m_WParser->GetPixelScale()); + m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); + int 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); - m_WParser -> SetAlign(m_OldAlign); - m_WParser -> SetContainer(oldcont); - m_WParser -> CloseContainer(); + m_WParser->SetAlign(oldAlign); + m_WParser->SetContainer(oldcont); + m_WParser->CloseContainer(); + m_Table = oldt; return TRUE; } - else if (m_Table && !tag.IsEnding()) { + else if (m_Table) + { // new row in table - if (tag.GetName() == "TR") { - m_Table -> AddRow(tag); + 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 - else { - m_WParser -> SetAlign(m_OldAlign); - c = m_WParser -> SetContainer(new wxHtmlContainerCell(m_Table)); - m_Table -> AddCell(c, tag); - - m_WParser -> OpenContainer(); - - if (tag.GetName() == "TH") /*header style*/ { - m_WParser -> SetAlign(wxHTML_ALIGN_CENTER); - } - - { - wxString als; - - als = m_rAlign; - if (tag.HasParam("ALIGN")) als = tag.GetParam("ALIGN"); - als.MakeUpper(); - if (als == "RIGHT") m_WParser -> SetAlign(wxHTML_ALIGN_RIGHT); - else if (als == "CENTER") m_WParser -> SetAlign(wxHTML_ALIGN_CENTER); - } - m_WParser -> OpenContainer(); + else + { + c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table)); + m_Table->AddCell(c, tag); + + m_WParser->OpenContainer(); + + if (tag.GetName() == wxT("TH")) /*header style*/ + m_WParser->SetAlign(wxHTML_ALIGN_CENTER); + else + m_WParser->SetAlign(wxHTML_ALIGN_LEFT); + + wxString als; + + als = m_rAlign; + if (tag.HasParam(wxT("ALIGN"))) + als = tag.GetParam(wxT("ALIGN")); + als.MakeUpper(); + if (als == wxT("RIGHT")) + m_WParser->SetAlign(wxHTML_ALIGN_RIGHT); + else if (als == wxT("LEFT")) + m_WParser->SetAlign(wxHTML_ALIGN_LEFT); + else if (als == wxT("CENTER")) + m_WParser->SetAlign(wxHTML_ALIGN_CENTER); + + m_WParser->OpenContainer(); } } return FALSE;