// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xml.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
while (prop)
{
- if (prop->GetName() == propName) return TRUE;
+ if (prop->GetName() == propName) return true;
prop = prop->GetNext();
}
- return FALSE;
+ return false;
}
bool wxXmlNode::GetPropVal(const wxString& propName, wxString *value) const
if (prop->GetName() == propName)
{
*value = prop->GetValue();
- return TRUE;
+ return true;
}
prop = prop->GetNext();
}
- return FALSE;
+ return false;
}
wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& defaultVal) const
bool wxXmlNode::RemoveChild(wxXmlNode *child)
{
if (m_children == NULL)
- return FALSE;
+ return false;
else if (m_children == child)
{
m_children = child->m_next;
child->m_parent = NULL;
child->m_next = NULL;
- return TRUE;
+ return true;
}
else
{
ch->m_next = child->m_next;
child->m_parent = NULL;
child->m_next = NULL;
- return TRUE;
+ return true;
}
ch = ch->m_next;
}
- return FALSE;
+ return false;
}
}
wxXmlProperty *prop;
if (m_properties == NULL)
- return FALSE;
+ return false;
else if (m_properties->GetName() == name)
{
m_properties = prop->GetNext();
prop->SetNext(NULL);
delete prop;
- return TRUE;
+ return true;
}
else
p->SetNext(prop->GetNext());
prop->SetNext(NULL);
delete prop;
- return TRUE;
+ return true;
}
p = p->GetNext();
}
- return FALSE;
+ return false;
}
}
}
wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)
- : wxObject(), m_root(NULL)
+ :wxObject(), m_root(NULL)
{
if ( !Load(filename, encoding) )
{
}
wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding)
- : wxObject(), m_root(NULL)
+ :wxObject(), m_root(NULL)
{
if ( !Load(stream, encoding) )
{
}
wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)
+ :wxObject()
{
DoCopy(doc);
}
wxString version;
};
+extern "C" {
static void StartElementHnd(void *userData, const char *name, const char **atts)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->node = node;
ctx->lastAsText = NULL;
}
+}
+extern "C" {
static void EndElementHnd(void *userData, const char* WXUNUSED(name))
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->node = ctx->node->GetParent();
ctx->lastAsText = NULL;
}
+}
+extern "C" {
static void TextHnd(void *userData, const char *s, int len)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
}
else
{
- bool whiteOnly = TRUE;
+ bool whiteOnly = true;
for (char *c = buf; *c != '\0'; c++)
if (*c != ' ' && *c != '\t' && *c != '\n' && *c != '\r')
{
- whiteOnly = FALSE;
+ whiteOnly = false;
break;
}
if (!whiteOnly)
delete[] buf;
}
+}
+extern "C" {
static void CommentHnd(void *userData, const char *data)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
}
ctx->lastAsText = NULL;
}
+}
+extern "C" {
static void DefaultHnd(void *userData, const char *s, int len)
{
// XML header:
ctx->version = buf.Mid(pos + 9).BeforeFirst(buf[(size_t)pos+8]);
}
}
+}
+extern "C" {
static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
const XML_Char *name, XML_Encoding *info)
{
// We must build conversion table for expat. The easiest way to do so
// is to let wxCSConv convert as string containing all characters to
// wide character representation:
- wxCSConv conv(wxString(name, wxConvLibc));
+ wxString str(name, wxConvLibc);
+ wxCSConv conv(str);
char mbBuf[2];
wchar_t wcBuf[10];
size_t i;
}
info->map[i+1] = (int)wcBuf[0];
}
-
+
info->data = NULL;
info->convert = NULL;
info->release = NULL;
return 1;
}
+}
bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
{
if (ok)
{
- if (!ctx.version.IsEmpty())
+ if (!ctx.version.empty())
SetVersion(ctx.version);
- if (!ctx.encoding.IsEmpty())
+ if (!ctx.encoding.empty())
SetFileEncoding(ctx.encoding);
SetRoot(ctx.root);
}
// write string to output:
inline static void OutputString(wxOutputStream& stream, const wxString& str,
-#if wxUSE_UNICODE
- wxMBConv * WXUNUSED(convMem),
-#else
- wxMBConv *convMem,
-#endif
- wxMBConv *convFile)
+ wxMBConv *convMem = NULL,
+ wxMBConv *convFile = NULL)
{
- if (str.IsEmpty()) return;
+ if (str.empty())
+ return;
+
#if wxUSE_UNICODE
+ wxUnusedVar(convMem);
+
const wxWX2MBbuf buf(str.mb_str(*(convFile ? convFile : &wxConvUTF8)));
stream.Write((const char*)buf, strlen((const char*)buf));
-#else
- if ( convFile == NULL )
- stream.Write(str.mb_str(), str.Len());
- else
+#else // !wxUSE_UNICODE
+ if ( convFile && convMem )
{
wxString str2(str.wc_str(*convMem), *convFile);
stream.Write(str2.mb_str(), str2.Len());
}
-#endif
+ else // no conversions to do
+ {
+ stream.Write(str.mb_str(), str.Len());
+ }
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
}
+// flags for OutputStringEnt()
+enum
+{
+ XML_ESCAPE_QUOTES = 1
+};
+
// Same as above, but create entities first.
// Translates '<' to "<", '>' to ">" and '&' to "&"
static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
- wxMBConv *convMem, wxMBConv *convFile,
- bool escapeQuotes = false)
+ wxMBConv *convMem = NULL,
+ wxMBConv *convFile = NULL,
+ int flags = 0)
{
wxString buf;
size_t i, last, len;
c = str.GetChar(i);
if (c == wxT('<') || c == wxT('>') ||
(c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;")) ||
- (escapeQuotes && c == wxT('"')))
+ ((flags & XML_ESCAPE_QUOTES) && c == wxT('"')))
{
OutputString(stream, str.Mid(last, i - last), convMem, convFile);
switch (c)
{
case wxT('<'):
- OutputString(stream, wxT("<"), NULL, NULL);
+ OutputString(stream, wxT("<"));
break;
case wxT('>'):
- OutputString(stream, wxT(">"), NULL, NULL);
+ OutputString(stream, wxT(">"));
break;
case wxT('&'):
- OutputString(stream, wxT("&"), NULL, NULL);
+ OutputString(stream, wxT("&"));
break;
case wxT('"'):
- OutputString(stream, wxT("""), NULL, NULL);
+ OutputString(stream, wxT("""));
+ break;
+ default:
break;
- default: break;
}
last = i + 1;
}
wxString str = wxT("\n");
for (int i = 0; i < indent; i++)
str << wxT(' ') << wxT(' ');
- OutputString(stream, str, NULL, NULL);
+ OutputString(stream, str);
}
static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
break;
case wxXML_ELEMENT_NODE:
- OutputString(stream, wxT("<"), NULL, NULL);
- OutputString(stream, node->GetName(), NULL, NULL);
+ OutputString(stream, wxT("<"));
+ OutputString(stream, node->GetName());
prop = node->GetProperties();
while (prop)
{
- OutputString(stream, wxT(" ") + prop->GetName() + wxT("=\""),
- NULL, NULL);
- OutputStringEnt(stream, prop->GetValue(), NULL, NULL,
- true/*escapeQuotes*/);
- OutputString(stream, wxT("\""), NULL, NULL);
+ OutputString(stream, wxT(" ") + prop->GetName() + wxT("=\""));
+ OutputStringEnt(stream, prop->GetValue(), convMem, convFile,
+ XML_ESCAPE_QUOTES);
+ OutputString(stream, wxT("\""));
prop = prop->GetNext();
}
if (node->GetChildren())
{
- OutputString(stream, wxT(">"), NULL, NULL);
+ OutputString(stream, wxT(">"));
prev = NULL;
n = node->GetChildren();
while (n)
}
if (prev && prev->GetType() != wxXML_TEXT_NODE)
OutputIndentation(stream, indent);
- OutputString(stream, wxT("</"), NULL, NULL);
- OutputString(stream, node->GetName(), NULL, NULL);
- OutputString(stream, wxT(">"), NULL, NULL);
+ OutputString(stream, wxT("</"));
+ OutputString(stream, node->GetName());
+ OutputString(stream, wxT(">"));
}
else
- OutputString(stream, wxT("/>"), NULL, NULL);
+ OutputString(stream, wxT("/>"));
break;
case wxXML_COMMENT_NODE:
- OutputString(stream, wxT("<!--"), NULL, NULL);
+ OutputString(stream, wxT("<!--"));
OutputString(stream, node->GetContent(), convMem, convFile);
- OutputString(stream, wxT("-->"), NULL, NULL);
+ OutputString(stream, wxT("-->"));
break;
default:
bool wxXmlDocument::Save(wxOutputStream& stream) const
{
if ( !IsOk() )
- return FALSE;
+ return false;
wxString s;
- wxMBConv *convMem = NULL, *convFile = NULL;
+ wxMBConv *convMem = NULL;
+
#if wxUSE_UNICODE
- convFile = new wxCSConv(GetFileEncoding());
+ wxMBConv *convFile = new wxCSConv(GetFileEncoding());
#else
+ wxMBConv *convFile = NULL;
if ( GetFileEncoding() != GetEncoding() )
{
convFile = new wxCSConv(GetFileEncoding());
s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
GetVersion().c_str(), GetFileEncoding().c_str());
- OutputString(stream, s, NULL, NULL);
+ OutputString(stream, s);
OutputNode(stream, GetRoot(), 0, convMem, convFile);
- OutputString(stream, wxT("\n"), NULL, NULL);
+ OutputString(stream, wxT("\n"));
if ( convFile )
delete convFile;
if ( convMem )
delete convMem;
- return TRUE;
+ return true;
}
#endif // wxUSE_XML
projects / wxWidgets.git / blobdiff