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

diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp
index ff2e8e9ccc..cb8951c936 100644
--- a/src/msw/hyperlink.cpp
+++ b/src/msw/hyperlink.cpp
@@ -24,7 +24,7 @@
 #include "wx/hyperlink.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/stattext.h"
+    #include "wx/app.h"
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/msw/private.h"
     #include "wx/msw/missing.h"
@@ -62,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));
     }
 }