X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89de9af3cbe9ddc877594e05380f0e30428677f1..f5166ed458810001245d1a0a9eda28fef3e54df8:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 962fa16d1e..76e0c45e64 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -44,7 +44,7 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) { m_tmpMouseMoved = FALSE; - m_tmpLastLink = wxEmptyString; + m_tmpLastLink = NULL; m_tmpCanDrawLocks = 0; m_FS = new wxFileSystem(); m_RelatedStatusBar = -1; @@ -69,9 +69,6 @@ wxHtmlWindow::~wxHtmlWindow() if (m_Cell) delete m_Cell; - wxList *parser_data = m_Parser -> GetTempData(); - if (parser_data) delete parser_data; - delete m_Parser; delete m_FS; } @@ -93,11 +90,11 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar) -void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes) +void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) { wxString op = m_OpenedPage; - m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes); + m_Parser -> SetFonts(normal_face, fixed_face, sizes); SetPage(wxT("")); // fonts changed => contents invalid if (!op.IsEmpty()) LoadPage(op); } @@ -261,7 +258,7 @@ void wxHtmlWindow::CreateLayout() if (!m_Cell) return; if (m_Style == wxHW_SCROLLBAR_NEVER) { - SetScrollbars(1, 1, 0, 0); // always off + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); } @@ -270,7 +267,7 @@ void wxHtmlWindow::CreateLayout() GetClientSize(&ClientWidth, &ClientHeight); #ifndef __WXMSW__ // VS : this looks extremely ugly under windoze, better fix needed! - SetScrollbars(1, 1, 0, ClientHeight * 2); // always on + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, ClientHeight * 2); // always on #endif GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); @@ -281,7 +278,7 @@ void wxHtmlWindow::CreateLayout() /*cheat: top-level frag is always container*/); } else { /* we fit into window, no need for scrollbars */ - SetScrollbars(1, 1, 0, 0); // disable... + SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable... GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); // ...and relayout } @@ -296,7 +293,6 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) wxString tmp; int p_fontsizes[7]; wxString p_fff, p_ffn; - int p_imf, p_imn; if (path != wxEmptyString) { oldpath = cfg -> GetPath(); @@ -306,13 +302,11 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path) m_Borders = cfg -> Read("wxHtmlWindow/Borders", m_Borders); p_fff = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); p_ffn = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); - p_imf = cfg -> Read("wxHtmlWindow/ItalicModeFixed", m_Parser -> m_ItalicModeFixed); - p_imn = cfg -> Read("wxHtmlWindow/ItalicModeNormal", m_Parser -> m_ItalicModeNormal); for (int i = 0; i < 7; i++) { tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]); } - SetFonts(p_ffn, p_imn, p_fff, p_imf, p_fontsizes); + SetFonts(p_ffn, p_fff, p_fontsizes); if (path != wxEmptyString) cfg -> SetPath(oldpath); @@ -333,8 +327,6 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path) cfg -> Write("wxHtmlWindow/Borders", (long) m_Borders); cfg -> Write("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed); cfg -> Write("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal); - cfg -> Write("wxHtmlWindow/ItalicModeFixed", (long) m_Parser -> m_ItalicModeFixed); - cfg -> Write("wxHtmlWindow/ItalicModeNormal", (long) m_Parser -> m_ItalicModeNormal); for (int i = 0; i < 7; i++) { tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i); cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]); @@ -361,9 +353,9 @@ bool wxHtmlWindow::HistoryBack() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + "#" + a); m_HistoryOn = TRUE; - Scroll(0, m_History[m_HistoryPos].GetPos()); -// wxYield(); + wxYield(); m_tmpCanDrawLocks--; + Scroll(0, m_History[m_HistoryPos].GetPos()); Refresh(); return TRUE; } @@ -387,9 +379,9 @@ bool wxHtmlWindow::HistoryForward() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + "#" + a); m_HistoryOn = TRUE; - Scroll(0, m_History[m_HistoryPos].GetPos()); -// wxYield(); + wxYield(); m_tmpCanDrawLocks--; + Scroll(0, m_History[m_HistoryPos].GetPos()); Refresh(); return TRUE; } @@ -426,9 +418,9 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) -void wxHtmlWindow::OnLinkClicked(const wxString& link) +void wxHtmlWindow::OnLinkClicked(wxHtmlLinkInfo *link) { - LoadPage(link); + LoadPage(link -> GetHref()); } @@ -527,7 +519,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) if (m_tmpMouseMoved && (m_Cell != NULL)) { int sx, sy; int x, y; - wxString lnk; + wxHtmlLinkInfo *lnk; ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP; wxGetMousePosition(&x, &y); @@ -535,13 +527,14 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) lnk = m_Cell -> GetLink(sx + x, sy + y); if (lnk != m_tmpLastLink) { - if (lnk == wxEmptyString) { + if (lnk == NULL) { SetCursor(cur_arrow); if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar); } else { SetCursor(cur_hand); - if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk, m_RelatedStatusBar); + if (m_RelatedStatusBar != -1) + m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar); } m_tmpLastLink = lnk; } @@ -586,14 +579,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) ///// default mod handlers are forced there: -FORCE_LINK(mod_layout) -FORCE_LINK(mod_fonts) -FORCE_LINK(mod_image) -FORCE_LINK(mod_list) -FORCE_LINK(mod_pre) -FORCE_LINK(mod_hline) -FORCE_LINK(mod_links) -FORCE_LINK(mod_tables) +FORCE_LINK(m_layout) +FORCE_LINK(m_fonts) +FORCE_LINK(m_image) +FORCE_LINK(m_list) +FORCE_LINK(m_dflist) +FORCE_LINK(m_pre) +FORCE_LINK(m_hline) +FORCE_LINK(m_links) +FORCE_LINK(m_tables) #endif