Swap client data pointers in wxRearrangeList too.

[wxWidgets.git] / src / generic / hyperlinkg.cpp

diff --git a/src/generic/hyperlinkg.cpp b/src/generic/hyperlinkg.cpp
index f368ee3b32231c62b7eded0cbe98c602a53a8e1d..791b15b3576081e94a447308df5c29a86740caa9 100644 (file)
--- a/src/generic/hyperlinkg.cpp
+++ b/src/generic/hyperlinkg.cpp
@@ -79,6 +79,7 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     // colours
     m_normalColour = *wxBLUE;
     m_hoverColour = *wxRED;
     // colours
     m_normalColour = *wxBLUE;
     m_hoverColour = *wxRED;

+    m_visitedColour = wxColour("#551a8b");

     SetForegroundColour(m_normalColour);
 
     // by default the font of an hyperlink control is underlined
     SetForegroundColour(m_normalColour);
 
     // by default the font of an hyperlink control is underlined


@@ -147,7 +148,7 @@ void wxGenericHyperlinkCtrl::SetVisitedColour(const wxColour &colour)
 void wxGenericHyperlinkCtrl::DoContextMenu(const wxPoint &pos)
 {
     wxMenu *menuPopUp = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
 void wxGenericHyperlinkCtrl::DoContextMenu(const wxPoint &pos)
 {
     wxMenu *menuPopUp = new wxMenu(wxEmptyString, wxMENU_TEAROFF);

-    menuPopUp->Append(wxHYPERLINK_POPUP_COPY_ID, wxT("Copy URL"));
+    menuPopUp->Append(wxHYPERLINK_POPUP_COPY_ID, _("&Copy URL"));

     PopupMenu( menuPopUp, pos );
     delete menuPopUp;
 }
     PopupMenu( menuPopUp, pos );
     delete menuPopUp;
 }


@@ -195,7 +196,7 @@ void wxGenericHyperlinkCtrl::OnLeftDown(wxMouseEvent& event)
 void wxGenericHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect
 void wxGenericHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
     // the click must be started and ended in the hyperlink rect

-    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) 
+    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition()))

         return;
 
     SetForegroundColour(m_visitedColour);
         return;
 
     SetForegroundColour(m_visitedColour);