removed wxYield from wxHtmlWindow (seems to work w/o it and yielding caused reentrancy problems)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -306,7 +306,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
m_OpenedPage = f->GetLocation();
|
m_OpenedPage = f->GetLocation();
|
||||||
if (f->GetAnchor() != wxEmptyString)
|
if (f->GetAnchor() != wxEmptyString)
|
||||||
{
|
{
|
||||||
wxYield();
|
|
||||||
ScrollToAnchor(f->GetAnchor());
|
ScrollToAnchor(f->GetAnchor());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,7 +335,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
|
|
||||||
if (needs_refresh)
|
if (needs_refresh)
|
||||||
{
|
{
|
||||||
wxYield();
|
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
Refresh();
|
Refresh();
|
||||||
}
|
}
|
||||||
@@ -494,7 +492,6 @@ bool wxHtmlWindow::HistoryBack()
|
|||||||
if (a == wxEmptyString) LoadPage(l);
|
if (a == wxEmptyString) LoadPage(l);
|
||||||
else LoadPage(l + wxT("#") + a);
|
else LoadPage(l + wxT("#") + a);
|
||||||
m_HistoryOn = TRUE;
|
m_HistoryOn = TRUE;
|
||||||
wxYield();
|
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
|
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
|
||||||
Refresh();
|
Refresh();
|
||||||
@@ -525,7 +522,6 @@ bool wxHtmlWindow::HistoryForward()
|
|||||||
if (a == wxEmptyString) LoadPage(l);
|
if (a == wxEmptyString) LoadPage(l);
|
||||||
else LoadPage(l + wxT("#") + a);
|
else LoadPage(l + wxT("#") + a);
|
||||||
m_HistoryOn = TRUE;
|
m_HistoryOn = TRUE;
|
||||||
wxYield();
|
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
|
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
|
||||||
Refresh();
|
Refresh();
|
||||||
|
Reference in New Issue
Block a user