X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/914f51576275c0f5411db2eed52099c71a7489a3..5145a8cfe50812bdf31df33901b13bcc1e17c11b:/src/generic/hyperlink.cpp?ds=sidebyside diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp index 9d96c5e296..ffb3608554 100644 --- a/src/generic/hyperlink.cpp +++ b/src/generic/hyperlink.cpp @@ -53,6 +53,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK) // reserved for internal use only #define wxHYPERLINKCTRL_POPUP_COPY_ID 16384 +const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink"); + // ---------------------------------------------------------------------------- // wxHyperlinkCtrl // ---------------------------------------------------------------------------- @@ -202,13 +204,13 @@ void wxHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) void wxHyperlinkCtrl::OnLeftDown(wxMouseEvent& event) { // the left click must start from the hyperlink rect - m_clicking = GetLabelRect().Inside(event.GetPosition()); + m_clicking = GetLabelRect().Contains(event.GetPosition()); } void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event) { // the click must be started and ended in the hyperlink rect - if (!m_clicking || !GetLabelRect().Inside(event.GetPosition())) + if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) return; SetForegroundColour(m_visitedColour); @@ -225,7 +227,7 @@ void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event) void wxHyperlinkCtrl::OnRightUp(wxMouseEvent& event) { if( GetWindowStyle() & wxHL_CONTEXTMENU ) - if ( GetLabelRect().Inside(event.GetPosition()) ) + if ( GetLabelRect().Contains(event.GetPosition()) ) DoContextMenu(wxPoint(event.m_x, event.m_y)); } @@ -233,7 +235,7 @@ void wxHyperlinkCtrl::OnMotion(wxMouseEvent& event) { wxRect textrc = GetLabelRect(); - if (textrc.Inside(event.GetPosition())) + if (textrc.Contains(event.GetPosition())) { SetCursor(wxCursor(wxCURSOR_HAND)); SetForegroundColour(m_hoverColour);