Remove asserts in wxMSW::wxTLW::SetIcons() and always set some icon.

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 1917c27ba81e9a4c104c1e67f3a12ba9deee2adf..6c3a9e5d40c13b683aa0d48c2e5f87ff9d25fd76 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -744,7 +744,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int fl
                            *wxConvCurrent);
             wxLogError(_("XML parsing error: '%s' at line %d"),
                        error.c_str(),
                            *wxConvCurrent);
             wxLogError(_("XML parsing error: '%s' at line %d"),
                        error.c_str(),

-                       XML_GetCurrentLineNumber(parser));
+                       (int)XML_GetCurrentLineNumber(parser));

             ok = false;
             break;
         }
             ok = false;
             break;
         }


@@ -885,7 +885,7 @@ bool OutputIndentation(wxOutputStream& stream,
                        wxMBConv *convFile)
 {
     wxString str(wxS("\n"));
                        wxMBConv *convFile)
 {
     wxString str(wxS("\n"));

-    str += wxString(2*indent, wxS(' '));
+    str += wxString(indent, wxS(' '));

     return OutputString(stream, str, convMem, convFile);
 }
 
     return OutputString(stream, str, convMem, convFile);
 }