X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/583f6c5cb5aba1b8a79ec83532ee247396aded97..0b7e6e7da208b6a95fb23cb50286a09dc90d96d2:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index ac2e1d135a..e8f244474f 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -27,10 +27,8 @@ #include "wx/html/htmlwin.h" #include "wx/html/forcelnk.h" +#include "wx/log.h" -#ifdef __WXMSW__ -#include -#endif //----------------------------------------------------------------------------- // wxHtmlWindow @@ -129,9 +127,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxFSFile *f; bool rt_val; - + bool needs_refresh = FALSE; + SetCursor(*wxHOURGLASS_CURSOR); - wxYield(); + wxYield(); Refresh(FALSE); m_tmpCanDrawLocks++; if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item @@ -140,27 +139,41 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_History[m_HistoryPos].SetPos(y); } - if (location[0] == '#') { // local anchor + if (location[0] == wxT('#')) { // local anchor wxString anch = location.Mid(1) /*1 to end*/; m_tmpCanDrawLocks--; rt_val = ScrollToAnchor(anch); + m_tmpCanDrawLocks++; + } + else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage) { + wxString anch = location.AfterFirst(wxT('#')); + m_tmpCanDrawLocks--; + rt_val = ScrollToAnchor(anch); + m_tmpCanDrawLocks++; + } + else if (location.Find(wxT('#')) != wxNOT_FOUND && + (m_FS -> GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage) { + wxString anch = location.AfterFirst(wxT('#')); + m_tmpCanDrawLocks--; + rt_val = ScrollToAnchor(anch); + m_tmpCanDrawLocks++; } else { + needs_refresh = TRUE; // load&display it: if (m_RelatedStatusBar != -1) { m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar); - Refresh(); + Refresh(FALSE); } f = m_FS -> OpenFile(location); + if (f == NULL) { wxString err; - err.Printf(_("Unable to open requested location :\n\n%s"), WXSTRINGCAST location); + wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str()); m_tmpCanDrawLocks--; - Refresh(); - wxMessageBox(err, "Error"); SetCursor(*wxSTANDARD_CURSOR); return FALSE; @@ -173,7 +186,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) if (m_RelatedStatusBar != -1) { wxString msg = _("Loading : ") + location; m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar); - Refresh(); + Refresh(FALSE); } node = m_Filters.GetFirst(); @@ -194,9 +207,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location) rt_val = SetPage(src); m_OpenedPage = f -> GetLocation(); if (f -> GetAnchor() != wxEmptyString) { -// m_tmpCanDrawLocks--; + wxYield(); ScrollToAnchor(f -> GetAnchor()); -// m_tmpCanDrawLocks++; } delete f; @@ -214,11 +226,18 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor)); } + if (m_OpenedPageTitle == wxEmptyString) + OnSetTitle(wxFileNameFromPath(m_OpenedPage)); SetCursor(*wxSTANDARD_CURSOR); - wxYield(); - m_tmpCanDrawLocks--; - Refresh(); + if (needs_refresh) { + wxYield(); + m_tmpCanDrawLocks--; + Refresh(); + } + else + m_tmpCanDrawLocks--; + return rt_val; } @@ -227,7 +246,11 @@ bool wxHtmlWindow::LoadPage(const wxString& location) bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor) { const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor); - if (!c) return FALSE; + if (!c) + { + wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str()); + return FALSE; + } else { int y; @@ -267,11 +290,6 @@ void wxHtmlWindow::CreateLayout() else { GetClientSize(&ClientWidth, &ClientHeight); -#ifndef __WXMSW__ - // VS : this looks extremely ugly under windoze, better fix needed! - SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, ClientHeight * 2); // always on -#endif - GetClientSize(&ClientWidth, &ClientHeight); m_Cell -> Layout(ClientWidth); if (ClientHeight < m_Cell -> GetHeight() + GetCharHeight()) { SetScrollbars( @@ -354,7 +372,7 @@ bool wxHtmlWindow::HistoryBack() m_HistoryOn = FALSE; m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); - else LoadPage(l + "#" + a); + else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; wxYield(); m_tmpCanDrawLocks--; @@ -380,7 +398,7 @@ bool wxHtmlWindow::HistoryForward() m_HistoryOn = FALSE; m_tmpCanDrawLocks++; if (a == wxEmptyString) LoadPage(l); - else LoadPage(l + "#" + a); + else LoadPage(l + wxT("#") + a); m_HistoryOn = TRUE; wxYield(); m_tmpCanDrawLocks--; @@ -401,6 +419,8 @@ void wxHtmlWindow::HistoryClear() wxList wxHtmlWindow::m_Filters; wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL; +wxCursor *wxHtmlWindow::s_cur_hand = NULL; +wxCursor *wxHtmlWindow::s_cur_arrow = NULL; void wxHtmlWindow::CleanUpStatics() { @@ -408,7 +428,8 @@ void wxHtmlWindow::CleanUpStatics() m_DefaultFilter = NULL; m_Filters.DeleteContents(TRUE); m_Filters.Clear(); - + if (s_cur_hand) delete s_cur_hand; + if (s_cur_arrow) delete s_cur_arrow; } @@ -435,9 +456,14 @@ void wxHtmlWindow::OnDraw(wxDC& dc) int v_y, v_h; if (m_tmpCanDrawLocks > 0) return; + dc.SetMapMode(wxMM_TEXT); +#if 0 +/* VS - I don't think this is neccessary any longer + MSC_VER 1200 means MSVC 6.0 and it works fine */ #if defined(_MSC_VER) && (_MSC_VER == 1200) ::SetMapMode((HDC)dc.GetHDC(), MM_TEXT); +#endif #endif dc.SetBackgroundMode(wxTRANSPARENT); ViewStart(&x, &y); @@ -460,42 +486,6 @@ void wxHtmlWindow::OnSize(wxSizeEvent& event) } - -void wxHtmlWindow::OnKeyDown(wxKeyEvent& event) -{ - int dummy; - int sty, szy, cliy; - - ViewStart(&dummy, &sty); - GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP; - GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP; - - switch (event.KeyCode()) { - case WXK_PAGEUP : - case WXK_PRIOR : - Scroll(-1, sty - (2 * cliy / 3)); - break; - case WXK_PAGEDOWN : - case WXK_NEXT : - Scroll(-1, sty + (2 * cliy / 3)); - break; - case WXK_HOME : - Scroll(-1, 0); - break; - case WXK_END : - Scroll(-1, szy - cliy); - break; - case WXK_UP : - Scroll(-1, sty - 1); - break; - case WXK_DOWN : - Scroll(-1, sty + 1); - break; - } -} - - - void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) { m_tmpMouseMoved = TRUE; @@ -517,7 +507,11 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) void wxHtmlWindow::OnIdle(wxIdleEvent& event) { - static wxCursor cur_hand(wxCURSOR_HAND), cur_arrow(wxCURSOR_ARROW); + if (s_cur_hand == NULL) + { + s_cur_hand = new wxCursor(wxCURSOR_HAND); + s_cur_arrow = new wxCursor(wxCURSOR_ARROW); + } if (m_tmpMouseMoved && (m_Cell != NULL)) { int sx, sy; @@ -531,11 +525,11 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event) if (lnk != m_tmpLastLink) { if (lnk == NULL) { - SetCursor(cur_arrow); + SetCursor(*s_cur_arrow); if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar); } else { - SetCursor(cur_hand); + SetCursor(*s_cur_hand); if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar); } @@ -555,7 +549,6 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent) EVT_MOTION(wxHtmlWindow::OnMouseEvent) EVT_IDLE(wxHtmlWindow::OnIdle) - EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown) END_EVENT_TABLE()