X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3e9a6f3bfcc5e2f017eaa90dd0e45ea87dd459d..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/datstrm.h?ds=sidebyside

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index ef049c9f2a..478d45b8be 100644
--- 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
@@ -79,6 +79,11 @@ public:
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 
+#if wxUSE_UNICODE
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
+#endif
+
 protected:
     wxInputStream *m_input;
     bool m_be_order;
@@ -86,14 +91,14 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxDataInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataInputStream);
 };
 
 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
@@ -152,6 +157,11 @@ public:
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 
+#if wxUSE_UNICODE
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
+#endif
+
 protected:
     wxOutputStream *m_output;
     bool m_be_order;
@@ -159,7 +169,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);
 };
 
 #endif