Default to wxConvUTF8 (not wxConvAuto) in wxDataInputStream and wxDataOutputStream...

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index c11de7b2049e64b20a5753467456d5bb1f753fc4..d83aa66993c19aacabf5cb1f819a54c808a2f461 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_BASE wxDataInputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8 );
 #else
     wxDataInputStream(wxInputStream& s);
 #endif
@@ -98,7 +98,7 @@ class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8 );
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif

diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h
index 387cb43467d4ad02d9497a2d581689059cb36cb3..8c7c72cdc629aba1517cf4b562b0cc63cf209af8 100644 (file)
--- a/interface/wx/datstrm.h
+++ b/interface/wx/datstrm.h
@@ -43,7 +43,7 @@ public:
             instance! It is recommended to use the default value (UTF-8).
     */
     wxDataOutputStream(wxOutputStream& stream,
-                       const wxMBConv& conv = wxConvAuto());
+                       const wxMBConv& conv = wxConvUTF8);
 
     /**
         Destroys the wxDataOutputStream object.
@@ -190,7 +190,7 @@ public:
             instance!
     */
     wxDataInputStream(wxInputStream& stream,
-                      const wxMBConv& conv = wxConvAuto());
+                      const wxMBConv& conv = wxConvUTF8 );
 
     /**
         Destroys the wxDataInputStream object.