X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39029898248ba8089ce87a1978f1d92af3f6550b..91c536df157aa500e832ff9e8541839d2e07f6b4:/src/html/htmlwin.cpp?ds=sidebyside diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index ada2a4d19e..212d556d99 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)) { @@ -253,15 +262,13 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } - - f = m_FS->OpenFile(location); + + f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); if (f == NULL) { wxLogError(_("Unable to open requested HTML document: %s"), location.c_str()); m_tmpCanDrawLocks--; - - SetCursor(*wxSTANDARD_CURSOR); return FALSE; } @@ -299,7 +306,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_OpenedPage = f->GetLocation(); if (f->GetAnchor() != wxEmptyString) { - wxYield(); ScrollToAnchor(f->GetAnchor()); } @@ -326,11 +332,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (m_OpenedPageTitle == wxEmptyString) OnSetTitle(wxFileNameFromPath(m_OpenedPage)); - SetCursor(*wxSTANDARD_CURSOR); if (needs_refresh) { - wxYield(); m_tmpCanDrawLocks--; Refresh(); } @@ -488,7 +492,6 @@ bool wxHtmlWindow::HistoryBack() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); @@ -519,7 +522,6 @@ bool wxHtmlWindow::HistoryForward() if (a == wxEmptyString) LoadPage(l); else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; - wxYield(); m_tmpCanDrawLocks--; Scroll(0, (*m_History)[m_HistoryPos].GetPos()); Refresh(); @@ -618,7 +620,7 @@ void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) void wxHtmlWindow::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) -{ +{ wxCHECK_RET( cell, _T("can't be called with NULL cell") ); cell->OnMouseClick(this, x, y, event); @@ -632,23 +634,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()); }