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

wxHtmlWindow::OnLinkClicked and wxHtmlCell::Get/SetLink and wxHtmlWinParser::GetSetLink now work with wxHtmlLinkInfo instead of wxString (making it ready for frames) ************** also fixed font size interpretation to conform to HTML (1..6 instead of wrong -2..4)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-23 21:11:46 +00:00
parent 2ea24d9f47
commit f2c2fa4d62
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/html/winpars.cpp
View File

@@ -107,14 +107,15 @@ void wxHtmlWinParser::InitParser(const wxString& source)
wxASSERT_MSG(m_DC != NULL, _("no DC assigned to wxHtmlWinParser!!")); wxASSERT_MSG(m_DC != NULL, _("no DC assigned to wxHtmlWinParser!!"));
m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE; m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
m_FontSize = 0; m_FontSize = 3; //default one
CreateCurrentFont(); // we're selecting default font into CreateCurrentFont(); // we're selecting default font into
m_DC -> GetTextExtent("H", &m_CharWidth, &m_CharHeight); m_DC -> GetTextExtent("H", &m_CharWidth, &m_CharHeight);
/* NOTE : we're not using GetCharWidth/Height() because /* NOTE : we're not using GetCharWidth/Height() because
of differences under X and win of differences under X and win
*/ */
m_Link = ""; m_UseLink = FALSE;
m_Link = wxHtmlLinkInfo("", "");
m_LinkColor.Set(0, 0, 0xFF); m_LinkColor.Set(0, 0, 0xFF);
m_ActualColor.Set(0, 0, 0); m_ActualColor.Set(0, 0, 0);
m_Align = wxHTML_ALIGN_LEFT; m_Align = wxHTML_ALIGN_LEFT;
@@ -242,13 +243,22 @@ wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
} }
void wxHtmlWinParser::SetFontSize(int s)
{
if (s < 1) s = 1;
else if (s > 7) s = 7;
m_FontSize = s;
}
wxFont* wxHtmlWinParser::CreateCurrentFont() wxFont* wxHtmlWinParser::CreateCurrentFont()
{ {
int fb = GetFontBold(), int fb = GetFontBold(),
fi = GetFontItalic(), fi = GetFontItalic(),
fu = GetFontUnderlined(), fu = GetFontUnderlined(),
ff = GetFontFixed(), ff = GetFontFixed(),
fs = GetFontSize() + 2 /*remap from <-2;4> to <0;7>*/ ; fs = GetFontSize() - 1 /*remap from <1;7> to <0;6>*/ ;
if (m_FontsTable[fb][fi][fu][ff][fs] == NULL) { if (m_FontsTable[fb][fi][fu][ff][fs] == NULL) {
m_FontsTable[fb][fi][fu][ff][fs] = m_FontsTable[fb][fi][fu][ff][fs] =
@@ -265,6 +275,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
{
m_Link = link;
m_UseLink = (link.GetHref() != wxEmptyString);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxHtmlWinTagHandler // wxHtmlWinTagHandler