X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f740587c9d406b5c7087853b85dbbb353362cb9a..534f87c6c442aa2710a44352bd26d215fec1714b:/src/msw/hyperlink.cpp?ds=sidebyside diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp index de729770fd..f39d94ae17 100644 --- a/src/msw/hyperlink.cpp +++ b/src/msw/hyperlink.cpp @@ -3,7 +3,6 @@ // Purpose: Hyperlink control // Author: Rickard Westerlund // Created: 2010-08-03 -// RCS-ID: $Id$ // Copyright: (c) 2010 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,7 +24,6 @@ #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/stattext.h" #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/msw/private.h" #include "wx/msw/missing.h" @@ -63,8 +61,11 @@ namespace wxString GetLabelForSysLink(const wxString& text, const wxString& url) { - return wxString("" - + wxStaticText::RemoveMarkup(text) + ""; + // Any "&"s in the text should appear on the screen and not be (mis) + // interpreted as mnemonics. + return wxString::Format("%s", + url, + wxControl::EscapeMnemonics(text)); } }