X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..4aaef122cbbd5bbe0e70b824e320458e2329dd13:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 0f5fc11366..5166612f44 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -72,8 +72,7 @@ WX_DEFINE_LIST(wxHtmlProcessorList); //----------------------------------------------------------------------------- -wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name) +void wxHtmlWindow::Init() { m_tmpMouseMoved = FALSE; m_tmpLastLink = NULL; @@ -87,17 +86,28 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, m_Cell = NULL; m_Parser = new wxHtmlWinParser(this); m_Parser->SetFS(m_FS); - SetBorders(10); m_HistoryPos = -1; m_HistoryOn = TRUE; m_History = new wxHtmlHistoryArray; m_Processors = NULL; + m_Style = 0; + SetBorders(10); +} + +bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + long style, const wxString& name) +{ + if (!wxScrolledWindow::Create(parent, id, pos, size, + style | wxVSCROLL | wxHSCROLL, name)) + return FALSE; + m_Style = style; SetPage(wxT("")); + return TRUE; } - wxHtmlWindow::~wxHtmlWindow() { HistoryClear(); @@ -204,13 +214,12 @@ bool wxHtmlWindow::AppendToPage(const wxString& source) bool wxHtmlWindow::LoadPage(const wxString& location) { + wxBusyCursor busyCursor; + wxFSFile *f; bool rt_val; bool needs_refresh = FALSE; - SetCursor(*wxHOURGLASS_CURSOR); - wxYield(); Refresh(FALSE); - m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) { @@ -260,8 +269,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; - - SetCursor(*wxSTANDARD_CURSOR); return FALSE; } @@ -326,7 +333,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (m_OpenedPageTitle == wxEmptyString) OnSetTitle(wxFileNameFromPath(m_OpenedPage)); - SetCursor(*wxSTANDARD_CURSOR); if (needs_refresh) { @@ -632,23 +638,18 @@ void wxHtmlWindow::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), void wxHtmlWindow::OnDraw(wxDC& dc) { - int x, y; - wxRegionIterator upd(GetUpdateRegion()); // get the update rect list - int v_y, v_h; + if (m_tmpCanDrawLocks > 0 || m_Cell == NULL) return; - if (m_tmpCanDrawLocks > 0) return; + int x, y; + wxRect rect = GetUpdateRegion().GetBox(); dc.SetMapMode(wxMM_TEXT); dc.SetBackgroundMode(wxTRANSPARENT); GetViewStart(&x, &y); - while (upd) - { - v_y = upd.GetY(); - v_h = upd.GetH(); - if (m_Cell) m_Cell->Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y); - upd++; - } + m_Cell->Draw(dc, 0, 0, + y * wxHTML_SCROLL_STEP + rect.GetTop(), + y * wxHTML_SCROLL_STEP + rect.GetBottom()); } @@ -785,4 +786,4 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule) #include "wx/html/forcelnk.h" FORCE_WXHTML_MODULES() -#endif \ No newline at end of file +#endif