From 75bc2e56125125511a0505718dcb2c3d4150a933 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Tue, 4 Jan 2022 10:50:14 -0500
Subject: add upstream 11.16

---
 wx+/image_tools.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'wx+/image_tools.cpp')

diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp
index b519aac2..b8876dc3 100644
--- a/wx+/image_tools.cpp
+++ b/wx+/image_tools.cpp
@@ -180,10 +180,7 @@ wxImage zen::stackImages(const wxImage& img1, const wxImage& img2, ImageStackLay
 
 wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const wxColor& col, ImageStackAlignment textAlign)
 {
-    //assert(!contains(text, L"&")); //accelerator keys not supported here
-    wxString textFmt = replaceCpy(text, L"&", L"", false);
-
-    const std::vector<std::pair<wxString, wxSize>> lineInfo = getTextExtentInfo(textFmt, font);
+    const std::vector<std::pair<wxString, wxSize>> lineInfo = getTextExtentInfo(text, font);
 
     int maxWidth   = 0;
     int lineHeight = 0;
-- 
cgit