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

added <font face> support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-24 23:27:20 +00:00
parent 194fa2aca0
commit f1ad10f373
3 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/html/m_fonts.cpp
View File

@@ -26,16 +26,22 @@
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
#include "wx/fontenum.h"
#include "wx/tokenzr.h"
FORCE_LINK_ME(m_fonts)
TAG_HANDLER_BEGIN(FONT, "FONT")
TAG_HANDLER_VARS
wxSortedArrayString m_Faces;
TAG_HANDLER_PROC(tag)
{
wxColour oldclr = m_WParser -> GetActualColor();
int oldsize = m_WParser -> GetFontSize();
wxString oldface = m_WParser -> GetFontFace();
if (tag.HasParam(wxT("COLOR"))) {
unsigned long tmp = 0;
@@ -58,16 +64,37 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
}
}
if (tag.HasParam(wxT("FACE"))) {
if (m_Faces.GetCount() == 0) {
wxFontEnumerator enu;
enu.EnumerateFacenames();
m_Faces = *enu.GetFacenames();
}
wxStringTokenizer tk(tag.GetParam(wxT("FACE")), ",");
int index;
while (tk.HasMoreTokens())
if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND) {
m_WParser -> SetFontFace(m_Faces[index]);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
break;
}
}
ParseInner(tag);
if (oldclr != m_WParser -> GetActualColor()) {
m_WParser -> SetActualColor(oldclr);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(oldclr));
}
if (oldface != m_WParser -> GetFontFace()) {
m_WParser -> SetFontFace(oldface);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
}
if (oldsize != m_WParser -> GetFontSize()) {
m_WParser -> SetFontSize(oldsize);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
}
if (oldclr != m_WParser -> GetActualColor()) {
m_WParser -> SetActualColor(oldclr);
m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(oldclr));
}
return TRUE;
}