fixes for several fatal problems when using wxComboCtrl as popup (patch 1539124)

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

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 28b83e829b4afc33432ce7d17f0b2b756ef9d4b7..990d6aa81fb2e44650c88fd3c1824a7ea48d2223 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/wfstream.h"


@@ -32,7 +33,6 @@
 #include "expat.h" // from Expat
 
 // DLL options compatibility check:
 #include "expat.h" // from Expat
 
 // DLL options compatibility check:

-#include "wx/app.h"

 WX_CHECK_BUILD_OPTIONS("wxXML")
 
 
 WX_CHECK_BUILD_OPTIONS("wxXML")
 
 


@@ -348,12 +348,16 @@ void wxXmlDocument::DoCopy(const wxXmlDocument& doc)
 bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding)
 {
     wxFileInputStream stream(filename);
 bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding)
 {
     wxFileInputStream stream(filename);

+    if (!stream.Ok())
+        return false;

     return Load(stream, encoding);
 }
 
 bool wxXmlDocument::Save(const wxString& filename) const
 {
     wxFileOutputStream stream(filename);
     return Load(stream, encoding);
 }
 
 bool wxXmlDocument::Save(const wxString& filename) const
 {
     wxFileOutputStream stream(filename);

+    if (!stream.Ok())
+        return false;

     return Save(stream);
 }
 
     return Save(stream);
 }
 


@@ -385,7 +389,7 @@ static wxString CharToString(wxMBConv *conv,
         const wxWCharBuffer wbuf(
             wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
 
         const wxWCharBuffer wbuf(
             wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
 

-        return wxString(wbuf, conv);
+        return wxString(wbuf, *conv);

     }
     else // already in UTF-8, no conversion needed
     {
     }
     else // already in UTF-8, no conversion needed
     {