]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a97a264)
fixed bug in SetFonts (caused segfault in wxHtmlHelpFrame)
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 5 Dec 1999 19:32:21 +0000 (19:32 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 5 Dec 1999 19:32:21 +0000 (19:32 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/html/htmlwin.cpp patch | blob | blame | history

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index c1bdbfb3ee67963f5ea98e1dd13f35bf5d1133da..8f7ec80830f2dda7a8fd3c735aecdd9fca32b5c2 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -98,7 +98,7 @@ void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxStri
     wxString op = m_OpenedPage;
 
     m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
     wxString op = m_OpenedPage;
 
     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);
         p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
     }
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), 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)
         cfg -> SetPath(oldpath);
 
     if (path != wxEmptyString)
         cfg -> SetPath(oldpath);
wxWidgets (Impactor)