moving XRC to the core

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 755f7e56567f7b7ade2905b61eefcda783eadce0..80c76829fceb212a123e9cbd1aeffd425d8a457b 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -156,8 +156,8 @@ wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& default
     wxString tmp;
     if (GetPropVal(propName, &tmp))
         return tmp;
     wxString tmp;
     if (GetPropVal(propName, &tmp))
         return tmp;

-    else
-        return defaultVal;
+
+    return defaultVal;

 }
 
 void wxXmlNode::AddChild(wxXmlNode *child)
 }
 
 void wxXmlNode::AddChild(wxXmlNode *child)


@@ -370,7 +370,7 @@ inline static wxString CharToString(wxMBConv *conv,
         return str;
     }
     else
         return str;
     }
     else

-        return wxString(s, len);
+        return wxString(s, len != wxSTRING_MAXLEN ? len : strlen(s));

 #endif
 }
 
 #endif
 }
 


@@ -584,7 +584,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
 
 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,
 
 // write string to output:
 inline static void OutputString(wxOutputStream& stream, const wxString& str,

-                                wxMBConv *convMem, wxMBConv *convFile)
+#if wxUSE_UNICODE
+    wxMBConv * WXUNUSED(convMem),
+#else
+    wxMBConv *convMem,
+#endif
+    wxMBConv *convFile)

 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE