diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-01-04 16:21:19 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-01-04 16:21:19 +0000 |
| commit | 2c8ae2c99308b4f0bf2bb08161829efee43e31ca (patch) | |
| tree | b8252ff8a09d9143ed2dc299d082f9d86535c1a2 /wx+/image_tools.cpp | |
| parent | Merge branch 'b11.15' into 'master' (diff) | |
| parent | add upstream 11.16 (diff) | |
| download | FreeFileSync-2c8ae2c99308b4f0bf2bb08161829efee43e31ca.tar.gz FreeFileSync-2c8ae2c99308b4f0bf2bb08161829efee43e31ca.tar.bz2 FreeFileSync-2c8ae2c99308b4f0bf2bb08161829efee43e31ca.zip | |
Merge branch 'b11.16' into 'master'11.16
add upstream 11.16
See merge request opensource-tracking/FreeFileSync!40
Diffstat (limited to 'wx+/image_tools.cpp')
| -rw-r--r-- | wx+/image_tools.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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; |