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
This commit is contained in:
@@ -156,8 +156,8 @@ wxString wxXmlNode::GetPropVal(const wxString& propName, const wxString& default
|
|||||||
wxString tmp;
|
wxString tmp;
|
||||||
if (GetPropVal(propName, &tmp))
|
if (GetPropVal(propName, &tmp))
|
||||||
return tmp;
|
return tmp;
|
||||||
else
|
|
||||||
return defaultVal;
|
return defaultVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxXmlNode::AddChild(wxXmlNode *child)
|
void wxXmlNode::AddChild(wxXmlNode *child)
|
||||||
@@ -584,7 +584,12 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
|
|||||||
|
|
||||||
// write string to output:
|
// write string to output:
|
||||||
inline static void OutputString(wxOutputStream& stream, const wxString& str,
|
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 (str.IsEmpty()) return;
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
|
Reference in New Issue
Block a user