wxHtmlWindow::LoadPage does not use wxBusyCursor anymore. Instead it displays local hourglass cursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9779893b90
commit
169ee06c44
@ -128,7 +128,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
{
|
{
|
||||||
wxFSFile *f;
|
wxFSFile *f;
|
||||||
bool rt_val;
|
bool rt_val;
|
||||||
wxBusyCursor b;
|
|
||||||
|
SetCursor(*wxHOURGLASS_CURSOR);
|
||||||
|
wxYield();
|
||||||
|
|
||||||
m_tmpCanDraw = FALSE;
|
m_tmpCanDraw = FALSE;
|
||||||
if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
|
if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
|
||||||
@ -158,6 +160,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
m_tmpCanDraw = TRUE;
|
m_tmpCanDraw = TRUE;
|
||||||
Refresh();
|
Refresh();
|
||||||
wxMessageBox(err, "Error");
|
wxMessageBox(err, "Error");
|
||||||
|
|
||||||
|
SetCursor(*wxSTANDARD_CURSOR);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -209,6 +213,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
|
m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetCursor(*wxSTANDARD_CURSOR);
|
||||||
|
|
||||||
m_tmpCanDraw = TRUE;
|
m_tmpCanDraw = TRUE;
|
||||||
Refresh();
|
Refresh();
|
||||||
return rt_val;
|
return rt_val;
|
||||||
|
Loading…
Reference in New Issue
Block a user