Move SetDefaultTimeout to wxProtocol and set it to 60 seconds for both wxHTTP and...

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

diff --git a/interface/wx/datstrm.h b/interface/wx/datstrm.h
index 6972b882b7d623ce784fa8b26fef89f1aa0d6f89..8c7c72cdc629aba1517cf4b562b0cc63cf209af8 100644 (file)
--- a/interface/wx/datstrm.h
+++ b/interface/wx/datstrm.h
@@ -31,16 +31,7 @@ public:
         Constructs a datastream object from an output stream.
         Only write methods will be available.
 
         Constructs a datastream object from an output stream.
         Only write methods will be available.
 

-        @param stream
-            The output stream.
-    */
-    wxDataOutputStream(wxOutputStream& stream,
-                       const wxMBConv& conv = wxConvAuto());
-
-    /**
-        Constructs a datastream object from an output stream. Only write
-        methods will be available. This constructor is only available in
-        Unicode builds of wxWidgets.
+        Note that the @a conv parameter is only available in Unicode builds of wxWidgets.

 
         @param stream
             The output stream.
 
         @param stream
             The output stream.


@@ -52,7 +43,7 @@ public:
             instance! It is recommended to use the default value (UTF-8).
     */
     wxDataOutputStream(wxOutputStream& stream,
             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.
 
     /**
         Destroys the wxDataOutputStream object.


@@ -66,7 +57,18 @@ public:
         order.
     */
     void BigEndianOrdered(bool be_order);
         order.
     */
     void BigEndianOrdered(bool be_order);

+    
+    /**
+       Returns the current text conversion class used for
+       writing strings.
+    */
+    wxMBConv *GetConv() const;

 
 

+    /** 
+       Sets the text conversion class used for writing strings.
+    */
+    void SetConv( const wxMBConv &conv );
+    

     /**
         Writes the single byte @a i8 to the stream.
     */
     /**
         Writes the single byte @a i8 to the stream.
     */


@@ -177,16 +179,7 @@ public:
         Constructs a datastream object from an input stream.
         Only read methods will be available.
 
         Constructs a datastream object from an input stream.
         Only read methods will be available.
 

-        @param stream
-            The input stream.
-    */
-    wxDataInputStream(wxInputStream& stream,
-                      const wxMBConv& conv = wxConvAuto());
-
-    /**
-        Constructs a datastream object from an input stream. Only read methods
-        will be available. This constructor is only available in Unicode builds
-        of wxWidgets.
+        Note that the @a conv parameter is only available in Unicode builds of wxWidgets.

 
         @param stream
             The input stream.
 
         @param stream
             The input stream.


@@ -197,7 +190,7 @@ public:
             instance!
     */
     wxDataInputStream(wxInputStream& stream,
             instance!
     */
     wxDataInputStream(wxInputStream& stream,

-                      const wxMBConv& conv = wxConvAuto());
+                      const wxMBConv& conv = wxConvUTF8 );

 
     /**
         Destroys the wxDataInputStream object.
 
     /**
         Destroys the wxDataInputStream object.


@@ -211,6 +204,13 @@ public:
     */
     void BigEndianOrdered(bool be_order);
 
     */
     void BigEndianOrdered(bool be_order);
 

+    
+    /**
+       Returns the current text conversion class used for
+       reading strings.
+    */
+    wxMBConv *GetConv() const;
+    

     /**
         Reads a single byte from the stream.
     */
     /**
         Reads a single byte from the stream.
     */


@@ -278,5 +278,10 @@ public:
         @see wxDataOutputStream::WriteString()
     */
     wxString ReadString();
         @see wxDataOutputStream::WriteString()
     */
     wxString ReadString();

+
+    /** 
+       Sets the text conversion class used for reading strings.
+    */
+    void SetConv( const wxMBConv &conv );

 };
 
 };