X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f740587c9d406b5c7087853b85dbbb353362cb9a..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/hyperlink.cpp?ds=sidebyside

diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp
index de729770fd..cb8951c936 100644
--- a/src/msw/hyperlink.cpp
+++ b/src/msw/hyperlink.cpp
@@ -25,7 +25,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/stattext.h"
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/msw/private.h"
     #include "wx/msw/missing.h"
@@ -63,8 +62,11 @@ namespace
 
     wxString GetLabelForSysLink(const wxString& text, const wxString& url)
     {
-        return wxString("<A HREF=\"") + wxStaticText::RemoveMarkup(url) + "\">"
-            + wxStaticText::RemoveMarkup(text) + "</A>";
+        // Any "&"s in the text should appear on the screen and not be (mis)
+        // interpreted as mnemonics.
+        return wxString::Format("<A HREF=\"%s\">%s</A>",
+                                url,
+                                wxControl::EscapeMnemonics(text));
     }
 }