X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acd0b94c38adb10461dbd68b04797efb7f868800..07aec89fe1e7bad8010911aa8863efecfa909946:/src/msw/hyperlink.cpp diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp index ff2e8e9ccc..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 ///////////////////////////////////////////////////////////////////////////// @@ -24,7 +23,7 @@ #include "wx/hyperlink.h" #ifndef WX_PRECOMP - #include "wx/stattext.h" + #include "wx/app.h" #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/msw/private.h" #include "wx/msw/missing.h" @@ -62,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)); } }