Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. added encodings handling to XRC, so that it is possible

Browse Source 
to load resources that don't use English+wxLocale for i18n
2. expat interface can now read non-utf-8 encodings as well


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-24 21:14:42 +00:00
parent cc30b233fb
commit 480505bc6d
12 changed files with 252 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/xrc/xml.cpp
View File

@@ -300,10 +300,11 @@ wxList *wxXmlDocument::sm_handlers = NULL;
wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type)
wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type,
const wxString& encoding)
: wxObject(), m_root(NULL)
{
if (!Load(filename, io_type))
if (!Load(filename, io_type, encoding))
{
wxDELETE(m_root);
}
@@ -311,10 +312,11 @@ wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type)
wxXmlDocument::wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type)
wxXmlDocument::wxXmlDocument(wxInputStream& stream, wxXmlIOType io_type,
const wxString& encoding)
: wxObject(), m_root(NULL)
{
if (!Load(stream, io_type))
if (!Load(stream, io_type, encoding))
{
wxDELETE(m_root);
}
@@ -341,22 +343,33 @@ wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc)
void wxXmlDocument::DoCopy(const wxXmlDocument& doc)
{
m_version = doc.m_version;
#if !wxUSE_UNICODE
m_encoding = doc.m_encoding;
#endif
m_fileEncoding = doc.m_fileEncoding;
m_root = new wxXmlNode(*doc.m_root);
}
bool wxXmlDocument::Load(const wxString& filename, wxXmlIOType io_type)
bool wxXmlDocument::Load(const wxString& filename, wxXmlIOType io_type,
const wxString& encoding)
{
wxFileInputStream stream(filename);
return Load(stream, io_type);
return Load(stream, io_type, encoding);
}
bool wxXmlDocument::Load(wxInputStream& stream, wxXmlIOType io_type)
bool wxXmlDocument::Load(wxInputStream& stream, wxXmlIOType io_type,
const wxString& encoding)
{
#if wxUSE_UNICODE
(void)encoding;
#else
m_encoding = encoding;
#endif
wxNode *n = sm_handlers->GetFirst();
while (n)
{
@@ -365,7 +378,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, wxXmlIOType io_type)
if ((io_type == wxXML_IO_AUTO || io_type == h->GetType()) &&
h->CanLoad(stream))
{
return h->Load(stream, *this);
return h->Load(stream, *this, encoding);
}
n = n->GetNext();
}