Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to HTML tables alignment

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-10 23:43:34 +00:00
parent b6ed456530
commit 2755d43750
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -130,6 +130,7 @@ wxHTML:
- fixed wxHtmlHelpController's cache files handling on big endian machines - fixed wxHtmlHelpController's cache files handling on big endian machines
- added blocking and redirecting capabilities to wxHtmlWindow via - added blocking and redirecting capabilities to wxHtmlWindow via
wxHtmlWindow::OnOpeningURL() wxHtmlWindow::OnOpeningURL()
- fixed alignment handling in tables
2.3.2 2.3.2
----- -----

34
src/html/m_tables.cpp
View File

@@ -524,13 +524,11 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
TAG_HANDLER_VARS TAG_HANDLER_VARS
wxHtmlTableCell* m_Table; wxHtmlTableCell* m_Table;
wxString m_tAlign, m_rAlign; wxString m_tAlign, m_rAlign;
int m_OldAlign;
TAG_HANDLER_CONSTR(TABLE) TAG_HANDLER_CONSTR(TABLE)
{ {
m_Table = NULL; m_Table = NULL;
m_tAlign = m_rAlign = wxEmptyString; m_tAlign = m_rAlign = wxEmptyString;
m_OldAlign = wxHTML_ALIGN_LEFT;
} }
@@ -548,14 +546,14 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
c->SetWidthFloat(tag, m_WParser->GetPixelScale()); c->SetWidthFloat(tag, m_WParser->GetPixelScale());
m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
m_OldAlign = m_WParser->GetAlign(); int oldAlign = m_WParser->GetAlign();
m_tAlign = wxEmptyString; m_tAlign = wxEmptyString;
if (tag.HasParam(wxT("ALIGN"))) if (tag.HasParam(wxT("ALIGN")))
m_tAlign = tag.GetParam(wxT("ALIGN")); m_tAlign = tag.GetParam(wxT("ALIGN"));
ParseInner(tag); ParseInner(tag);
m_WParser->SetAlign(m_OldAlign); m_WParser->SetAlign(oldAlign);
m_WParser->SetContainer(oldcont); m_WParser->SetContainer(oldcont);
m_WParser->CloseContainer(); m_WParser->CloseContainer();
@@ -578,29 +576,29 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
// new cell // new cell
else else
{ {
m_WParser->SetAlign(m_OldAlign);
c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table)); c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table));
m_Table->AddCell(c, tag); m_Table->AddCell(c, tag);
m_WParser->OpenContainer(); m_WParser->OpenContainer();
if (tag.GetName() == wxT("TH")) /*header style*/ if (tag.GetName() == wxT("TH")) /*header style*/
{
m_WParser->SetAlign(wxHTML_ALIGN_CENTER); m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
} else
m_WParser->SetAlign(wxHTML_ALIGN_LEFT);
{ wxString als;
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);
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("CENTER"))
m_WParser->SetAlign(wxHTML_ALIGN_CENTER);
}
m_WParser->OpenContainer(); m_WParser->OpenContainer();
} }
} }