X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66a77a748e5c8002f3f9ebd66f5457aca5aabad8..84e4a8257d13231b4a5b225364f2c8722fc4f11e:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index e7b07636cf..ab653caf7b 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -12,7 +12,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" #if wxUSE_HTML @@ -22,7 +22,7 @@ #endif #ifndef WXPRECOMP -#include +#include "wx/wx.h" #endif #include "wx/html/htmlwin.h" @@ -37,7 +37,7 @@ -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(HtmlHistoryArray) @@ -128,7 +128,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxFSFile *f; bool rt_val; - wxBusyCursor b; + + SetCursor(*wxHOURGLASS_CURSOR); + wxYield(); m_tmpCanDraw = FALSE; 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; Refresh(); wxMessageBox(err, "Error"); + + SetCursor(*wxSTANDARD_CURSOR); return FALSE; } @@ -209,6 +213,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); } + SetCursor(*wxSTANDARD_CURSOR); + m_tmpCanDraw = TRUE; Refresh(); return rt_val;