#include "wx/wxprec.h"
#include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
#ifdef __BORDLANDC__
#pragma hdrstop
#include "wx/html/htmlwin.h"
#include "wx/html/forcelnk.h"
-
+#include "wx/log.h"
//-----------------------------------------------------------------------------
wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL | wxHSCROLL, name)
+ long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)
{
m_tmpMouseMoved = FALSE;
m_tmpLastLink = NULL;
{
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
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.c_str());
m_tmpCanDrawLocks--;
- Refresh();
- wxMessageBox(err, "Error");
SetCursor(*wxSTANDARD_CURSOR);
return FALSE;
if (m_RelatedStatusBar != -1) {
wxString msg = _("Loading : ") + location;
m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar);
- Refresh();
+ Refresh(FALSE);
}
node = m_Filters.GetFirst();
rt_val = SetPage(src);
m_OpenedPage = f -> GetLocation();
if (f -> GetAnchor() != wxEmptyString) {
-// m_tmpCanDrawLocks--;
+ wxYield();
ScrollToAnchor(f -> GetAnchor());
-// m_tmpCanDrawLocks++;
}
delete f;
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;
}
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.c_str());
+ return FALSE;
+ }
else {
int y;
if (!m_Cell) return;
- if (m_Style == wxHW_SCROLLBAR_NEVER) {
+ if (m_Style & wxHW_SCROLLBAR_NEVER) {
SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth);
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(
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--;
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--;
wxList wxHtmlWindow::m_Filters;
wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
+wxCursor *wxHtmlWindow::s_cur_hand = NULL;
+wxCursor *wxHtmlWindow::s_cur_arrow = NULL;
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;
}
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);
{
wxScrolledWindow::OnSize(event);
CreateLayout();
+ Refresh();
}
-
-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;
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;
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);
}
EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
EVT_MOTION(wxHtmlWindow::OnMouseEvent)
EVT_IDLE(wxHtmlWindow::OnIdle)
- EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown)
END_EVENT_TABLE()
projects / wxWidgets.git / blobdiff