Implement deep copy of wxBitmapRefData

[wxWidgets.git] / include / wx / datstrm.h

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index f49620a6aef16bf72355c8022dd7e634784cfe68..2fb430cbf8edc9a6f003cb9871b3726bcf39a503 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -14,7 +14,7 @@
 
 #include "wx/stream.h"
 #include "wx/longlong.h"
 
 #include "wx/stream.h"
 #include "wx/longlong.h"

-#include "wx/strconv.h"
+#include "wx/convauto.h"

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 


@@ -22,11 +22,11 @@ class WXDLLIMPEXP_BASE wxDataInputStream
 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE

-    wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8);
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());

 #else
     wxDataInputStream(wxInputStream& s);
 #endif
 #else
     wxDataInputStream(wxInputStream& s);
 #endif

-    ~wxDataInputStream(){}
+    ~wxDataInputStream();

 
     bool IsOk() { return m_input->IsOk(); }
 
 
     bool IsOk() { return m_input->IsOk(); }
 


@@ -83,7 +83,7 @@ protected:
     wxInputStream *m_input;
     bool m_be_order;
 #if wxUSE_UNICODE
     wxInputStream *m_input;
     bool m_be_order;
 #if wxUSE_UNICODE

-    wxMBConv& m_conv;
+    wxMBConv *m_conv;

 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataInputStream)


@@ -93,11 +93,11 @@ class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE

-    wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8);
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());

 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif

-    ~wxDataOutputStream(){}
+    ~wxDataOutputStream();

 
     bool IsOk() { return m_output->IsOk(); }
 
 
     bool IsOk() { return m_output->IsOk(); }
 


@@ -157,7 +157,7 @@ protected:
     wxOutputStream *m_output;
     bool m_be_order;
 #if wxUSE_UNICODE
     wxOutputStream *m_output;
     bool m_be_order;
 #if wxUSE_UNICODE

-    wxMBConv& m_conv;
+    wxMBConv *m_conv;

 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataOutputStream)
 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataOutputStream)