solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Deprecate "encoding" parameter of wxXmlDocument ctor and Load()

Browse source 
This parameter wasn't used for anything as it specified the encoding of
the data contents in memory and not the encoding of the XML file as
might be believed, so it only created unnecessary confusion.

See #24167.
This commit is contained in:
Vadim Zeitlin 2024-01-01 21:00:50 +01:00
parent 9ee9f4e8dd
commit 20845d85a5
7 changed files with 53 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/xml/xmltest.cpp
View file

@ -223,7 +223,7 @@ void XmlTestCase::LoadSave()
;
wxStringInputStream sisp(xmlTextProlog);
CPPUNIT_ASSERT( doc.Load(sisp, "UTF-8") );
CPPUNIT_ASSERT( doc.Load(sisp) );
wxStringOutputStream sosp;
CPPUNIT_ASSERT( doc.Save(sosp) );

4
tests/xml/xrctest.cpp
View file

@ -45,7 +45,7 @@ static const char *TEST_XRC_FILE = "test.xrc";
void LoadXrcFrom(const wxString& xrcText)
{
wxStringInputStream sis(xrcText);
std::unique_ptr<wxXmlDocument> xmlDoc(new wxXmlDocument(sis, "UTF-8"));
std::unique_ptr<wxXmlDocument> xmlDoc(new wxXmlDocument(sis));
REQUIRE( xmlDoc->IsOk() );
// Load the xrc we've just created
@ -294,7 +294,7 @@ TEST_CASE("XRC::EnvVarInPath", "[xrc]")
"<root><bitmap>$(WX_TEST_ENV_IN_PATH).bmp</bitmap></root>"
#endif
);
wxXmlDocument xmlDoc(sis, "UTF-8");
wxXmlDocument xmlDoc(sis);
REQUIRE( xmlDoc.IsOk() );
class wxTestEnvXmlHandler : public wxXmlResourceHandler