#endif
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/log.h"
+ #include "wx/intl.h"
+ #include "wx/dcclient.h"
+ #include "wx/frame.h"
#endif
#include "wx/html/htmlwin.h"
-#include "wx/html/forcelnk.h"
#include "wx/html/htmlproc.h"
-#include "wx/log.h"
-#include "wx/arrimpl.cpp"
#include "wx/list.h"
+
+#include "wx/arrimpl.cpp"
#include "wx/listimpl.cpp"
//-----------------------------------------------------------------------------
{
m_tmpMouseMoved = FALSE;
m_tmpLastLink = NULL;
+ m_tmpLastCell = NULL;
m_tmpCanDrawLocks = 0;
m_FS = new wxFileSystem();
m_RelatedStatusBar = -1;
return TRUE;
}
+bool wxHtmlWindow::AppendToPage(const wxString& source)
+{
+ return SetPage(*(GetParser()->GetSource()) + source);
+}
bool wxHtmlWindow::LoadPage(const wxString& location)
{
{
int c = m_History->GetCount() - (m_HistoryPos + 1);
- if (m_HistoryPos < 0 ||
+ if (m_HistoryPos < 0 ||
(*m_History)[m_HistoryPos].GetPage() != m_OpenedPage ||
(*m_History)[m_HistoryPos].GetAnchor() != m_OpenedAnchor)
{
m_HistoryPos++;
for (int i = 0; i < c; i++)
- m_History->Remove(m_HistoryPos);
+ m_History->RemoveAt(m_HistoryPos);
m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
}
}
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::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell),
+ wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+{
+ // do nothing here
+}
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++;
- }
+ m_Cell->Draw(dc, 0, 0,
+ y * wxHTML_SCROLL_STEP + rect.GetTop(),
+ y * wxHTML_SCROLL_STEP + rect.GetBottom());
}
if (event.ButtonDown())
{
- int sx, sy;
- wxPoint pos;
- wxString lnk;
-
- GetViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
- pos = event.GetPosition();
-
- if (m_Cell)
- m_Cell->OnMouseClick(this, sx + pos.x, sy + pos.y, event);
+ if ( m_Cell )
+ {
+ int sx, sy;
+ GetViewStart(&sx, &sy);
+ sx *= wxHTML_SCROLL_STEP;
+ sy *= wxHTML_SCROLL_STEP;
+
+ wxPoint pos = event.GetPosition();
+ pos.x += sx;
+ pos.y += sy;
+
+ wxHtmlCell *cell = m_Cell->FindCellByPos(pos.x, pos.y);
+
+ // 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);
+ }
}
}
if (m_tmpMouseMoved && (m_Cell != NULL))
{
int sx, sy;
- int x, y;
- wxHtmlLinkInfo *lnk;
+ GetViewStart(&sx, &sy);
+ sx *= wxHTML_SCROLL_STEP;
+ sy *= wxHTML_SCROLL_STEP;
- GetViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
+ int x, y;
wxGetMousePosition(&x, &y);
ScreenToClient(&x, &y);
- lnk = m_Cell->GetLink(sx + x, sy + y);
+ x += sx;
+ y += sy;
- if (lnk != m_tmpLastLink)
+ wxHtmlCell *cell = m_Cell->FindCellByPos(x, y);
+ if ( cell != m_tmpLastCell )
{
- if (lnk == NULL)
- {
- SetCursor(*s_cur_arrow);
- if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar);
- }
- else
+ wxHtmlLinkInfo *lnk = cell ? cell->GetLink(x, y) : NULL;
+
+ if (lnk != m_tmpLastLink)
{
- SetCursor(*s_cur_hand);
- if (m_RelatedStatusBar != -1)
- m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar);
+ if (lnk == NULL)
+ {
+ SetCursor(*s_cur_arrow);
+ if (m_RelatedStatusBar != -1)
+ m_RelatedFrame->SetStatusText(wxEmptyString, m_RelatedStatusBar);
+ }
+ else
+ {
+ SetCursor(*s_cur_hand);
+ if (m_RelatedStatusBar != -1)
+ m_RelatedFrame->SetStatusText(lnk->GetHref(), m_RelatedStatusBar);
+ }
+ m_tmpLastLink = lnk;
}
- m_tmpLastLink = lnk;
+
+ m_tmpLastCell = cell;
}
+ else // mouse moved but stayed in the same cell
+ {
+ if ( cell )
+ OnCellMouseHover(cell, x, y);
+ }
+
m_tmpMouseMoved = FALSE;
}
}
BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow)
EVT_SIZE(wxHtmlWindow::OnSize)
EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
+ EVT_RIGHT_DOWN(wxHtmlWindow::OnMouseEvent)
EVT_MOTION(wxHtmlWindow::OnMouseEvent)
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