long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
{
m_tmpMouseMoved = FALSE;
- m_tmpLastLink = wxEmptyString;
+ m_tmpLastLink = NULL;
m_tmpCanDrawLocks = 0;
m_FS = new wxFileSystem();
m_RelatedStatusBar = -1;
if (m_Cell) delete m_Cell;
- wxList *parser_data = m_Parser -> GetTempData();
- if (parser_data) delete parser_data;
-
delete m_Parser;
delete m_FS;
}
-void wxHtmlWindow::OnLinkClicked(const wxString& link)
+void wxHtmlWindow::OnLinkClicked(wxHtmlLinkInfo *link)
{
- LoadPage(link);
+ LoadPage(link -> GetHref());
}
if (m_tmpMouseMoved && (m_Cell != NULL)) {
int sx, sy;
int x, y;
- wxString lnk;
+ wxHtmlLinkInfo *lnk;
ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
wxGetMousePosition(&x, &y);
lnk = m_Cell -> GetLink(sx + x, sy + y);
if (lnk != m_tmpLastLink) {
- if (lnk == wxEmptyString) {
+ if (lnk == NULL) {
SetCursor(cur_arrow);
if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
}
else {
SetCursor(cur_hand);
- if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk, m_RelatedStatusBar);
+ if (m_RelatedStatusBar != -1)
+ m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);
}
m_tmpLastLink = lnk;
}