Always include sys/time.h and sys/select.h from selectdispatcher.h.

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index c11de7b2049e64b20a5753467456d5bb1f753fc4..478d45b8beb7e5a5ff23d049909df91b420c4faf 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
@@ -78,7 +78,7 @@ public:
     wxDataInputStream& operator>>(float& f);
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
-    
+
 #if wxUSE_UNICODE
     void SetConv( const wxMBConv &conv );
     wxMBConv *GetConv() const { return m_conv; }
@@ -91,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
@@ -169,7 +169,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);
 };
 
 #endif