case insensitive <font face>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -147,6 +147,7 @@ wxHTML:
|
|||||||
- 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
|
- fixed alignment handling in tables
|
||||||
|
- fixed <font face="..."> handling to be case insensitive
|
||||||
|
|
||||||
2.3.2
|
2.3.2
|
||||||
-----
|
-----
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ FORCE_LINK_ME(m_fonts)
|
|||||||
TAG_HANDLER_BEGIN(FONT, "FONT")
|
TAG_HANDLER_BEGIN(FONT, "FONT")
|
||||||
|
|
||||||
TAG_HANDLER_VARS
|
TAG_HANDLER_VARS
|
||||||
wxSortedArrayString m_Faces;
|
wxArrayString m_Faces;
|
||||||
|
|
||||||
TAG_HANDLER_PROC(tag)
|
TAG_HANDLER_PROC(tag)
|
||||||
{
|
{
|
||||||
@@ -80,7 +80,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
|
|||||||
|
|
||||||
while (tk.HasMoreTokens())
|
while (tk.HasMoreTokens())
|
||||||
{
|
{
|
||||||
if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND)
|
if ((index = m_Faces.Index(tk.GetNextToken(), FALSE)) != wxNOT_FOUND)
|
||||||
{
|
{
|
||||||
m_WParser->SetFontFace(m_Faces[index]);
|
m_WParser->SetFontFace(m_Faces[index]);
|
||||||
m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
|
||||||
|
|||||||
Reference in New Issue
Block a user