]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/datstrm.h
build fixes
[wxWidgets.git] / include / wx / datstrm.h
index f49620a6aef16bf72355c8022dd7e634784cfe68..ef049c9f2afe80a20f7fd8bb41751a3bdc1a2af4 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "wx/stream.h"
 #include "wx/longlong.h"
-#include "wx/strconv.h"
+#include "wx/convauto.h"
 
 #if wxUSE_STREAMS
 
@@ -22,11 +22,11 @@ class WXDLLIMPEXP_BASE wxDataInputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataInputStream(wxInputStream& s, wxMBConv& conv = wxConvUTF8);
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
 #else
     wxDataInputStream(wxInputStream& s);
 #endif
-    ~wxDataInputStream(){}
+    ~wxDataInputStream();
 
     bool IsOk() { return m_input->IsOk(); }
 
@@ -83,7 +83,7 @@ protected:
     wxInputStream *m_input;
     bool m_be_order;
 #if wxUSE_UNICODE
-    wxMBConvm_conv;
+    wxMBConv *m_conv;
 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataInputStream)
@@ -93,11 +93,11 @@ class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataOutputStream(wxOutputStream& s, wxMBConv& conv = wxConvUTF8);
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
-    ~wxDataOutputStream(){}
+    ~wxDataOutputStream();
 
     bool IsOk() { return m_output->IsOk(); }
 
@@ -132,7 +132,6 @@ public:
     void Write8(const wxUint8 *buffer, size_t size);
     void WriteDouble(const double *buffer, size_t size);
 
-    wxDataOutputStream& operator<<(const wxChar *string);
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);
@@ -157,7 +156,7 @@ protected:
     wxOutputStream *m_output;
     bool m_be_order;
 #if wxUSE_UNICODE
-    wxMBConvm_conv;
+    wxMBConv *m_conv;
 #endif
 
     DECLARE_NO_COPY_CLASS(wxDataOutputStream)