/////////////////////////////////////////////////////////////////////////////
-// Name: m_fonts.cpp
+// Name: src/html/m_fonts.cpp
// Purpose: wxHtml module for fonts & colors of fonts
// Author: Vaclav Slavik
-// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
-#include "wx/wx.h"
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
#endif
#include "wx/html/forcelnk.h"
FORCE_LINK_ME(m_fonts)
-TAG_HANDLER_BEGIN(FONT, "FONT")
+TAG_HANDLER_BEGIN(FONT, "FONT" )
TAG_HANDLER_VARS
- wxSortedArrayString m_Faces;
+ wxArrayString m_Faces;
+
+ TAG_HANDLER_CONSTR(FONT) { }
TAG_HANDLER_PROC(tag)
{
wxString oldface = m_WParser->GetFontFace();
if (tag.HasParam(wxT("COLOR")))
- {
- unsigned long tmp = 0;
+ {
wxColour clr;
- if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1)
- {
- clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16),
- (unsigned char)((tmp & 0x00FF00) >> 8),
- (unsigned char)(tmp & 0x0000FF));
+ if (tag.GetParamAsColour(wxT("COLOR"), &clr))
+ {
m_WParser->SetActualColor(clr);
m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr));
}
}
if (tag.HasParam(wxT("SIZE")))
- {
+ {
long tmp = 0;
- wxChar c = tag.GetParam(wxT("SIZE"))[(unsigned int) 0];
- if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1)
- {
- if (c == '+' || c == '-')
+ const wxString sizeStr = tag.GetParam(wxT("SIZE"));
+ if (sizeStr.ToLong(&tmp))
+ {
+ wxChar c = sizeStr[0];
+ if (c == wxT('+') || c == wxT('-'))
m_WParser->SetFontSize(oldsize+tmp);
else
m_WParser->SetFontSize(tmp);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ 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")), ",");
+ m_Faces = wxFontEnumerator::GetFacenames();
+
+ wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(","));
int index;
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->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
break;
}
- }
+ }
}
ParseInner(tag);
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;
+ return true;
}
TAG_HANDLER_END(FONT)
-TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
+TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE,DEL")
+
+ TAG_HANDLER_CONSTR(FACES_U) { }
TAG_HANDLER_PROC(tag)
{
int underlined = m_WParser->GetFontUnderlined();
- m_WParser->SetFontUnderlined(TRUE);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->SetFontUnderlined(true);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
ParseInner(tag);
m_WParser->SetFontUnderlined(underlined);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ return true;
}
TAG_HANDLER_END(FACES_U)
TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
+ TAG_HANDLER_CONSTR(FACES_B) { }
TAG_HANDLER_PROC(tag)
{
int bold = m_WParser->GetFontBold();
- m_WParser->SetFontBold(TRUE);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->SetFontBold(true);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
ParseInner(tag);
m_WParser->SetFontBold(bold);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ return true;
}
TAG_HANDLER_END(FACES_B)
TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
+ TAG_HANDLER_CONSTR(FACES_I) { }
TAG_HANDLER_PROC(tag)
{
int italic = m_WParser->GetFontItalic();
- m_WParser->SetFontItalic(TRUE);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->SetFontItalic(true);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
ParseInner(tag);
m_WParser->SetFontItalic(italic);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ return true;
}
TAG_HANDLER_END(FACES_I)
TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
+ TAG_HANDLER_CONSTR(FACES_TT) { }
TAG_HANDLER_PROC(tag)
{
int fixed = m_WParser->GetFontFixed();
- m_WParser->SetFontFixed(TRUE);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->SetFontFixed(true);
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
ParseInner(tag);
m_WParser->SetFontFixed(fixed);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ return true;
}
TAG_HANDLER_END(FACES_TT)
TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
+ TAG_HANDLER_CONSTR(Hx) { }
TAG_HANDLER_PROC(tag)
{
old_f = m_WParser->GetFontFixed();
old_al = m_WParser->GetAlign();
- m_WParser->SetFontBold(TRUE);
- m_WParser->SetFontItalic(FALSE);
- m_WParser->SetFontUnderlined(FALSE);
- m_WParser->SetFontFixed(FALSE);
+ m_WParser->SetFontBold(true);
+ m_WParser->SetFontItalic(false);
+ m_WParser->SetFontUnderlined(false);
+ m_WParser->SetFontFixed(false);
if (tag.GetName() == wxT("H1"))
m_WParser->SetFontSize(7);
else if (tag.GetName() == wxT("H3"))
m_WParser->SetFontSize(5);
else if (tag.GetName() == wxT("H4"))
- {
+ {
m_WParser->SetFontSize(5);
- m_WParser->SetFontItalic(TRUE);
- m_WParser->SetFontBold(FALSE);
+ m_WParser->SetFontItalic(true);
+ m_WParser->SetFontBold(false);
}
else if (tag.GetName() == wxT("H5"))
m_WParser->SetFontSize(4);
else if (tag.GetName() == wxT("H6"))
- {
+ {
m_WParser->SetFontSize(4);
- m_WParser->SetFontItalic(TRUE);
- m_WParser->SetFontBold(FALSE);
+ m_WParser->SetFontItalic(true);
+ m_WParser->SetFontBold(false);
}
c = m_WParser->GetContainer();
- if (c->GetFirstCell())
- {
+ if (c->GetFirstChild())
+ {
m_WParser->CloseContainer();
m_WParser->OpenContainer();
c = m_WParser->GetContainer();
m_WParser->SetFontFixed(old_f);
m_WParser->SetAlign(old_al);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
m_WParser->CloseContainer();
m_WParser->OpenContainer();
c = m_WParser->GetContainer();
c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
- return TRUE;
+ return true;
}
TAG_HANDLER_END(Hx)
TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
+ TAG_HANDLER_CONSTR(BIGSMALL) { }
TAG_HANDLER_PROC(tag)
{
int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1;
m_WParser->SetFontSize(sz);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
ParseInner(tag);
m_WParser->SetFontSize(oldsize);
- m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
- return TRUE;
+ m_WParser->GetContainer()->InsertCell(
+ new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
+ return true;
}
TAG_HANDLER_END(BIGSMALL)
projects / wxWidgets.git / blobdiff