use wxBusyCursor in wxHtmlWindow instead of SetCursor (the next step is figuring out if removing wxYield from LoadPage will break anything)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -214,13 +214,12 @@ bool wxHtmlWindow::AppendToPage(const wxString& source)
|
|||||||
|
|
||||||
bool wxHtmlWindow::LoadPage(const wxString& location)
|
bool wxHtmlWindow::LoadPage(const wxString& location)
|
||||||
{
|
{
|
||||||
|
wxBusyCursor busyCursor;
|
||||||
|
|
||||||
wxFSFile *f;
|
wxFSFile *f;
|
||||||
bool rt_val;
|
bool rt_val;
|
||||||
bool needs_refresh = FALSE;
|
bool needs_refresh = FALSE;
|
||||||
|
|
||||||
SetCursor(*wxHOURGLASS_CURSOR);
|
|
||||||
wxYield(); Refresh(FALSE);
|
|
||||||
|
|
||||||
m_tmpCanDrawLocks++;
|
m_tmpCanDrawLocks++;
|
||||||
if (m_HistoryOn && (m_HistoryPos != -1))
|
if (m_HistoryOn && (m_HistoryPos != -1))
|
||||||
{
|
{
|
||||||
@@ -270,8 +269,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
{
|
{
|
||||||
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
|
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
|
||||||
m_tmpCanDrawLocks--;
|
m_tmpCanDrawLocks--;
|
||||||
|
|
||||||
SetCursor(*wxSTANDARD_CURSOR);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,7 +333,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
|
|||||||
|
|
||||||
if (m_OpenedPageTitle == wxEmptyString)
|
if (m_OpenedPageTitle == wxEmptyString)
|
||||||
OnSetTitle(wxFileNameFromPath(m_OpenedPage));
|
OnSetTitle(wxFileNameFromPath(m_OpenedPage));
|
||||||
SetCursor(*wxSTANDARD_CURSOR);
|
|
||||||
|
|
||||||
if (needs_refresh)
|
if (needs_refresh)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user