file dialog with wxMULTIPLE style still doesn't allow to select multiple files but...

[wxWidgets.git] / src / xml / xml.cpp

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index f55ad6f7a1ead4267637837e5c6d404e57556588..6d7f33c7fffcace79f183733f206f0e0c6c9bf4a 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -287,7 +287,7 @@ wxXmlDocument::wxXmlDocument()
 }
 
 wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)
 }
 
 wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)

-                          : wxObject(), m_root(NULL)
+              :wxObject(), m_root(NULL)

 {
     if ( !Load(filename, encoding) )
     {
 {
     if ( !Load(filename, encoding) )
     {


@@ -296,7 +296,7 @@ wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)
 }
 
 wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding)
 }
 
 wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding)

-                          : wxObject(), m_root(NULL)
+              :wxObject(), m_root(NULL)

 {
     if ( !Load(stream, encoding) )
     {
 {
     if ( !Load(stream, encoding) )
     {


@@ -305,6 +305,7 @@ wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding)
 }
 
 wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)
 }
 
 wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)

+              :wxObject()

 {
     DoCopy(doc);
 }
 {
     DoCopy(doc);
 }


@@ -384,6 +385,7 @@ struct wxXmlParsingContext
     wxString   version;
 };
 
     wxString   version;
 };
 

+extern "C" {

 static void StartElementHnd(void *userData, const char *name, const char **atts)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 static void StartElementHnd(void *userData, const char *name, const char **atts)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;


@@ -401,7 +403,9 @@ static void StartElementHnd(void *userData, const char *name, const char **atts)
     ctx->node = node;
     ctx->lastAsText = NULL;
 }
     ctx->node = node;
     ctx->lastAsText = NULL;
 }

+}

 
 

+extern "C" {

 static void EndElementHnd(void *userData, const char* WXUNUSED(name))
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 static void EndElementHnd(void *userData, const char* WXUNUSED(name))
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;


@@ -409,7 +413,9 @@ static void EndElementHnd(void *userData, const char* WXUNUSED(name))
     ctx->node = ctx->node->GetParent();
     ctx->lastAsText = NULL;
 }
     ctx->node = ctx->node->GetParent();
     ctx->lastAsText = NULL;
 }

+}

 
 

+extern "C" {

 static void TextHnd(void *userData, const char *s, int len)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 static void TextHnd(void *userData, const char *s, int len)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;


@@ -442,7 +448,9 @@ static void TextHnd(void *userData, const char *s, int len)
 
     delete[] buf;
 }
 
     delete[] buf;
 }

+}

 
 

+extern "C" {

 static void CommentHnd(void *userData, const char *data)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
 static void CommentHnd(void *userData, const char *data)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;


@@ -457,7 +465,9 @@ static void CommentHnd(void *userData, const char *data)
     }
     ctx->lastAsText = NULL;
 }
     }
     ctx->lastAsText = NULL;
 }

+}

 
 

+extern "C" {

 static void DefaultHnd(void *userData, const char *s, int len)
 {
     // XML header:
 static void DefaultHnd(void *userData, const char *s, int len)
 {
     // XML header:


@@ -475,7 +485,9 @@ static void DefaultHnd(void *userData, const char *s, int len)
             ctx->version = buf.Mid(pos + 9).BeforeFirst(buf[(size_t)pos+8]);
     }
 }
             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)
 {
 static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
                               const XML_Char *name, XML_Encoding *info)
 {


@@ -507,6 +519,7 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
 
     return 1;
 }
 
     return 1;
 }

+}

 
 bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
 {
 
 bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
 {