#include "wx/defs.h"
#if wxUSE_HTML && wxUSE_STREAMS
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
#pragma hdrstop
#endif
#endif
#include "wx/html/htmlwin.h"
-#include "wx/html/forcelnk.h"
#include "wx/html/htmlproc.h"
#include "wx/list.h"
//-----------------------------------------------------------------------------
// item of history list
-class WXDLLEXPORT wxHtmlHistoryItem : public wxObject
+class WXDLLEXPORT wxHtmlHistoryItem
{
public:
wxHtmlHistoryItem(const wxString& p, const wxString& a) {m_Page = p, m_Anchor = a, m_Pos = 0;}
//-----------------------------------------------------------------------------
-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;
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("<html><body></body></html>"));
+ return TRUE;
}
-
wxHtmlWindow::~wxHtmlWindow()
{
HistoryClear();
return TRUE;
}
+bool wxHtmlWindow::AppendToPage(const wxString& source)
+{
+ return SetPage(*(GetParser()->GetSource()) + 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))
{
Refresh(FALSE);
}
- f = m_FS->OpenFile(location);
+ f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
+
+ // try to interpret 'location' as filename instead of URL:
+ if (f == NULL)
+ {
+ wxFileName fn(location);
+ wxString location2 = wxFileSystem::FileNameToURL(fn);
+ f = m_Parser->OpenURL(wxHTML_URL_PAGE, location2);
+ }
if (f == NULL)
{
wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
m_tmpCanDrawLocks--;
-
- SetCursor(*wxSTANDARD_CURSOR);
return FALSE;
}
m_OpenedPage = f->GetLocation();
if (f->GetAnchor() != wxEmptyString)
{
- wxYield();
ScrollToAnchor(f->GetAnchor());
}
if (m_OpenedPageTitle == wxEmptyString)
OnSetTitle(wxFileNameFromPath(m_OpenedPage));
- SetCursor(*wxSTANDARD_CURSOR);
if (needs_refresh)
{
- wxYield();
m_tmpCanDrawLocks--;
Refresh();
}
}
+bool wxHtmlWindow::LoadFile(const wxFileName& filename)
+{
+ wxString url = wxFileSystem::FileNameToURL(filename);
+ return LoadPage(url);
+}
+
bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
{
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
m_HistoryOn = TRUE;
- wxYield();
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
if (a == wxEmptyString) LoadPage(l);
else LoadPage(l + wxT("#") + a);
m_HistoryOn = TRUE;
- wxYield();
m_tmpCanDrawLocks--;
Scroll(0, (*m_History)[m_HistoryPos].GetPos());
Refresh();
void wxHtmlWindow::CleanUpStatics()
{
- delete m_DefaultFilter;
- m_DefaultFilter = NULL;
+ wxDELETE(m_DefaultFilter);
m_Filters.DeleteContents(TRUE);
m_Filters.Clear();
- delete m_GlobalProcessors;
- m_GlobalProcessors = NULL;
- delete s_cur_hand;
- delete s_cur_arrow;
+ wxDELETE(m_GlobalProcessors);
+ wxDELETE(s_cur_hand);
+ wxDELETE(s_cur_arrow);
}
}
+bool wxHtmlWindow::IsSelectionEnabled() const
+{
+#if wxUSE_CLIPBOARD
+ return !(m_Style & wxHW_NO_SELECTION);
+#else
+ return false;
+#endif
+}
void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
- LoadPage(link.GetHref());
+ const wxMouseEvent *e = link.GetEvent();
+ if (e == NULL || e->LeftUp())
+ LoadPage(link.GetHref());
}
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);
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);
-#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);
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++;
- }
+ wxHtmlRenderingState rstate(NULL);
+ m_Cell->Draw(dc, 0, 0,
+ y * wxHTML_SCROLL_STEP + rect.GetTop(),
+ y * wxHTML_SCROLL_STEP + rect.GetBottom(),
+ rstate);
}
}
-void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
+void wxHtmlWindow::OnMouseMove(wxMouseEvent& event)
{
- m_tmpMouseMoved = TRUE;
+ m_tmpMouseMoved = true;
+}
- if (event.ButtonDown())
+void wxHtmlWindow::OnMouseButton(wxMouseEvent& event)
+{
+ SetFocus();
+ if ( m_Cell )
{
- if ( m_Cell )
- {
- int sx, sy;
- GetViewStart(&sx, &sy);
- sx *= wxHTML_SCROLL_STEP;
- sy *= wxHTML_SCROLL_STEP;
+ int sx, sy;
+ GetViewStart(&sx, &sy);
+ sx *= wxHTML_SCROLL_STEP;
+ sy *= wxHTML_SCROLL_STEP;
- wxPoint pos = event.GetPosition();
- pos.x += sx;
- pos.y += sy;
+ wxPoint pos = event.GetPosition();
+ pos.x += sx;
+ pos.y += sy;
- wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
- // VZ: is it possible that we don't find anything at all?
- if ( cell )
- OnCellClicked(cell, pos.x, pos.y, event);
- }
+ // VZ: is it possible that we don't find anything at all?
+ // VS: yes. FindCellByPos returns terminal cell and
+ // containers may have empty borders
+ if ( cell )
+ OnCellClicked(cell, pos.x, pos.y, event);
}
}
BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
EVT_SIZE(wxHtmlWindow::OnSize)
- EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
- EVT_RIGHT_DOWN(wxHtmlWindow::OnMouseEvent)
- EVT_MOTION(wxHtmlWindow::OnMouseEvent)
+ EVT_LEFT_UP(wxHtmlWindow::OnMouseButton)
+ EVT_RIGHT_UP(wxHtmlWindow::OnMouseButton)
+ EVT_MOTION(wxHtmlWindow::OnMouseMove)
EVT_IDLE(wxHtmlWindow::OnIdle)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
-
-
-///// default mod handlers are forced there:
-
-FORCE_LINK(m_layout)
-FORCE_LINK(m_fonts)
-FORCE_LINK(m_image)
-FORCE_LINK(m_list)
-FORCE_LINK(m_dflist)
-FORCE_LINK(m_pre)
-FORCE_LINK(m_hline)
-FORCE_LINK(m_links)
-FORCE_LINK(m_tables)
-FORCE_LINK(m_meta)
-
+// This hack forces the linker to always link in m_* files
+// (wxHTML doesn't work without handlers from these files)
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()
#endif
projects / wxWidgets.git / blobdiff