X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ecff18117f8cabc0f515ad81aa4ad265e5e17d3..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 698e4cccb4..c437f70709 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -15,25 +15,33 @@ #if wxUSE_HTML && wxUSE_STREAMS -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/list.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/dcclient.h" #include "wx/frame.h" + #include "wx/dcmemory.h" + #include "wx/timer.h" + #include "wx/settings.h" + #include "wx/dataobj.h" #endif #include "wx/html/htmlwin.h" #include "wx/html/htmlproc.h" #include "wx/clipbrd.h" -#include "wx/dataobj.h" -#include "wx/timer.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" #include "wx/arrimpl.cpp" #include "wx/listimpl.cpp" +// HTML events: +IMPLEMENT_DYNAMIC_CLASS(wxHtmlLinkEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellEvent, wxCommandEvent) + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_CLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_CELL_HOVER) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_HTML_LINK_CLICKED) + #if wxUSE_CLIPBOARD // ---------------------------------------------------------------------------- @@ -227,18 +235,36 @@ bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) { - wxCHECK_MSG( cell, false, _T("can't be called with NULL cell") ); + wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_CLICKED, + m_interface->GetHTMLWindow()->GetId(), + cell, wxPoint(x,y), event); + + if (!m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev)) + { + // if the event wasn't handled, do the default processing here: + + wxASSERT_MSG( cell, _T("can't be called with NULL cell") ); - return cell->ProcessMouseClick(m_interface, wxPoint(x, y), event); + cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent()); + } + + // true if a link was clicked, false otherwise + return ev.GetLinkClicked(); } -void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * WXUNUSED(cell), - wxCoord WXUNUSED(x), - wxCoord WXUNUSED(y)) +void wxHtmlWindowMouseHelper::OnCellMouseHover(wxHtmlCell * cell, + wxCoord x, + wxCoord y) { - // do nothing here + wxHtmlCellEvent ev(wxEVT_COMMAND_HTML_CELL_HOVER, + m_interface->GetHTMLWindow()->GetId(), + cell, wxPoint(x,y), wxMouseEvent()); + m_interface->GetHTMLWindow()->GetEventHandler()->ProcessEvent(ev); } + + + //----------------------------------------------------------------------------- // wxHtmlWindow //----------------------------------------------------------------------------- @@ -277,7 +303,6 @@ void wxHtmlWindow::Init() m_HistoryOn = true; m_History = new wxHtmlHistoryArray; m_Processors = NULL; - m_Style = 0; SetBorders(10); m_selection = NULL; m_makingSelection = false; @@ -299,7 +324,6 @@ bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, name)) return false; - m_Style = style; SetPage(wxT("")); return true; } @@ -638,14 +662,14 @@ void wxHtmlWindow::CreateLayout() if (!m_Cell) return; - if (m_Style & wxHW_SCROLLBAR_NEVER) + if ( HasFlag(wxHW_SCROLLBAR_NEVER) ) { - SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell->GetWidth() / wxHTML_SCROLL_STEP, 0); // always off + SetScrollbars(1, 1, 0, 0); // always off GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); } - - else { + else // !wxHW_SCROLLBAR_NEVER + { GetClientSize(&ClientWidth, &ClientHeight); m_Cell->Layout(ClientWidth); if (ClientHeight < m_Cell->GetHeight() + GetCharHeight()) @@ -842,7 +866,7 @@ void wxHtmlWindow::AddFilter(wxHtmlFilter *filter) bool wxHtmlWindow::IsSelectionEnabled() const { #if wxUSE_CLIPBOARD - return !(m_Style & wxHW_NO_SELECTION); + return !HasFlag(wxHW_NO_SELECTION); #else return false; #endif @@ -928,9 +952,15 @@ bool wxHtmlWindow::CopySelection(ClipboardType t) void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { - const wxMouseEvent *e = link.GetEvent(); - if (e == NULL || e->LeftUp()) - LoadPage(link.GetHref()); + wxHtmlLinkEvent event(GetId(), link); + event.SetEventObject(this); + if (!GetEventHandler()->ProcessEvent(event)) + { + // the default behaviour is to load the URL in this window + const wxMouseEvent *e = event.GetLinkInfo().GetEvent(); + if (e == NULL || e->LeftUp()) + LoadPage(event.GetLinkInfo().GetHref()); + } } void wxHtmlWindow::OnEraseBackground(wxEraseEvent& event) @@ -1106,9 +1136,10 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event) CaptureMouse(); } } -#else - wxUnusedVar(event); #endif // wxUSE_CLIPBOARD + + // in any case, let the default handler set focus to this window + event.Skip(); } void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) @@ -1119,9 +1150,13 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) ReleaseMouse(); m_makingSelection = false; - // did the user move the mouse far enough from starting point? - if ( CopySelection(Primary) ) + // if m_selection=NULL, the user didn't move the mouse far enough from + // starting point and the mouse up event is part of a click, the user + // is not selecting text: + if ( m_selection ) { + CopySelection(Primary); + // we don't want mouse up event that ended selecting to be // handled as mouse click and e.g. follow hyperlink: return; @@ -1129,12 +1164,23 @@ void wxHtmlWindow::OnMouseUp(wxMouseEvent& event) } #endif // wxUSE_CLIPBOARD - SetFocus(); - wxPoint pos = CalcUnscrolledPosition(event.GetPosition()); wxHtmlWindowMouseHelper::HandleMouseClick(m_Cell, pos, event); } +#if wxUSE_CLIPBOARD +void wxHtmlWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + if ( !m_makingSelection ) + return; + + // discard the selecting operation + m_makingSelection = false; + wxDELETE(m_selection); + m_tmpSelFromCell = NULL; + Refresh(); +} +#endif // wxUSE_CLIPBOARD void wxHtmlWindow::OnInternalIdle() @@ -1245,7 +1291,8 @@ void wxHtmlWindow::OnInternalIdle() if ( m_tmpSelFromCell->IsBefore(selcell) ) { m_selection->Set(m_tmpSelFromPos, m_tmpSelFromCell, - wxPoint(x,y), selcell); } + wxPoint(x,y), selcell); + } else { m_selection->Set(wxPoint(x,y), selcell, @@ -1351,9 +1398,14 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event) void wxHtmlWindow::OnKeyUp(wxKeyEvent& event) { - if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() ) + if ( IsSelectionEnabled() && + (event.GetKeyCode() == 'C' && event.CmdDown()) ) { - (void) CopySelection(); + wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId()); + + evt.SetEventObject(this); + + GetEventHandler()->ProcessEvent(evt); } } @@ -1362,6 +1414,11 @@ void wxHtmlWindow::OnCopy(wxCommandEvent& WXUNUSED(event)) (void) CopySelection(); } +void wxHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event)) +{ + (void) CopySelection(); +} + void wxHtmlWindow::OnDoubleClick(wxMouseEvent& event) { // select word under cursor: @@ -1499,8 +1556,10 @@ BEGIN_EVENT_TABLE(wxHtmlWindow, wxScrolledWindow) EVT_LEFT_DCLICK(wxHtmlWindow::OnDoubleClick) EVT_ENTER_WINDOW(wxHtmlWindow::OnMouseEnter) EVT_LEAVE_WINDOW(wxHtmlWindow::OnMouseLeave) + EVT_MOUSE_CAPTURE_LOST(wxHtmlWindow::OnMouseCaptureLost) EVT_KEY_UP(wxHtmlWindow::OnKeyUp) EVT_MENU(wxID_COPY, wxHtmlWindow::OnCopy) + EVT_TEXT_COPY(wxID_ANY, wxHtmlWindow::OnClipboardEvent) #endif // wxUSE_CLIPBOARD END_EVENT_TABLE() @@ -1556,6 +1615,8 @@ void wxHtmlWindow::SetHTMLStatusText(const wxString& text) #if wxUSE_STATUSBAR if (m_RelatedStatusBar != -1) m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar); +#else + wxUnusedVar(text); #endif // wxUSE_STATUSBAR }