Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed MSVC warnings from Win32 Unicode Release build.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2003-11-08 19:40:29 +00:00
parent 20c8441047
commit 0e2710a6b9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xml/xml.cpp
View File

@@ -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