Add support for HTML 5 charset attribute in wxHtmlParser
ABI check / ABI check (push) Has been cancelled
Unix builds / Ubuntu 24.04 wxGTK with ASAN (push) Has been cancelled
Unix builds / Ubuntu 22.04 wxGTK ANSI (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK UTF-8 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxMotif (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxQt (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxX11 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 2 (push) Has been cancelled
Unix builds / Ubuntu 20.04 wxGTK 3 with clang (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 3 static with gcc 4.8 (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxGTK 3 STL (push) Has been cancelled
Unix builds / Ubuntu 18.04 wxDFB (push) Has been cancelled
CMake builds / macOS 14 wxOSX (push) Has been cancelled
CMake builds / Windows MSVC (push) Has been cancelled
CMake builds / macOS 14 wxIOS (push) Has been cancelled
CMake builds / Ubuntu 22.04 wxGTK 3 (push) Has been cancelled
MSW builds / wxMSW vs2022 DLL Debug x64 (push) Has been cancelled
MSW builds / wxMSW vs2022 DLL Release x64 (push) Has been cancelled
MSW builds / wxMSW vs2022 Debug Win32 (push) Has been cancelled
MSW cross-builds / wxMSW 32 bits (push) Has been cancelled
MSW cross-builds / wxMSW 64 bits (push) Has been cancelled
Code Checks / Check Spelling (push) Has been cancelled
Code Checks / Check Whitespace (push) Has been cancelled
Code Checks / Check Mixed EOL (push) Has been cancelled
Code Checks / Check C++ Style (push) Has been cancelled
Update Documentation / Update Online Documentation (push) Has been cancelled

See #25546.

(cherry picked from commit 59ed646ae3)
This commit is contained in:
Kees-van-der-Oord-Nikon
2025-11-25 18:14:29 +01:00
committed by Vadim Zeitlin
parent d921cac94f
commit bfdd0df6da
2 changed files with 9 additions and 0 deletions
+1
View File
@@ -268,6 +268,7 @@ All (GUI):
- Fix selecting columns in wxGrid with mouse (Dietmar Schwertberger, #25884).
- Improve wxActivityIndicator dots colour contrast with background (#25405).
- Update wxGenericTreeCtrl item height after changing its font (#16428).
- Respect HTML5 charset attribute in wxHTML (Kees van der Oord, #25546).
wxGTK:
+8
View File
@@ -906,6 +906,14 @@ bool wxMetaTagHandler::HandleTag(const wxHtmlTag& tag)
return false;
}
// HTML 5 charset
if (tag.GetParamAsString(wxT("charset"), m_retval))
{
m_Parser->StopParsing();
return false;
}
// HTML 4 charset
wxString httpEquiv,
content;
if (tag.GetParamAsString(wxT("HTTP-EQUIV"), &httpEquiv) &&