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

fixed bug in SetFonts (caused segfault in wxHtmlHelpFrame)

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

4
src/html/htmlwin.cpp
View File

@@ -98,7 +98,7 @@ void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxStri
wxString op = m_OpenedPage; wxString op = m_OpenedPage;
m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes); m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
SetPage(wxT("")); // fonts changed => contents invalid SetPage(wxT("<html><body></body></html>")); // fonts changed => contents invalid
if (!op.IsEmpty()) LoadPage(op); if (!op.IsEmpty()) LoadPage(op);
} }
@@ -311,7 +311,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]); p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
} }
m_Parser -> SetFonts(p_ffn, p_imn, p_fff, p_imf, p_fontsizes); SetFonts(p_ffn, p_imn, p_fff, p_imf, p_fontsizes);
if (path != wxEmptyString) if (path != wxEmptyString)
cfg -> SetPath(oldpath); cfg -> SetPath(oldpath);