From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Sat, 8 Nov 2003 19:40:29 +0000 (+0000)
Subject: Fixed MSVC warnings from Win32 Unicode Release build.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0e2710a6b96921920560271253c8409da47b8129

Fixed MSVC warnings from Win32 Unicode Release build.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 755f7e5656..fc447594a5 100644
--- 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;
-    else
-        return defaultVal;
+
+    return defaultVal;
 }
 
 void wxXmlNode::AddChild(wxXmlNode *child)
@@ -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,
-                                wxMBConv *convMem, wxMBConv *convFile)
+#if wxUSE_UNICODE
+    wxMBConv * WXUNUSED(convMem),
+#else
+    wxMBConv *convMem,
+#endif
+    wxMBConv *convFile)
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE