X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ccabb813a537c2541f88eb39a83f964d2d42f00..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/html/htmlwin.cpp?ds=sidebyside diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 5166612f44..212d556d99 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -262,8 +262,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } - - f = m_FS->OpenFile(location); + + f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); if (f == NULL) { @@ -306,7 +306,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) { - wxYield(); ScrollToAnchor(f->GetAnchor()); } @@ -336,7 +335,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (needs_refresh) { - wxYield(); m_tmpCanDrawLocks--; Refresh(); } @@ -494,7 +492,6 @@ bool wxHtmlWindow::HistoryBack() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); @@ -525,7 +522,6 @@ bool wxHtmlWindow::HistoryForward() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh();