modify signature of new wxStreamBuffer ctors to avoid conflicts with the existing...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/stream.h b/include/wx/stream.h
index c2cb838f922a6ae689cfe900d8fce8bf0fc42edf..9119658421f46abac4b57c6de3087b989ef94eaf 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -421,13 +421,13 @@ public:
         InitWithStream(stream, mode);
     }
 
         InitWithStream(stream, mode);
     }
 

-    wxStreamBuffer(wxInputStream& stream, size_t bufsize)
+    wxStreamBuffer(size_t bufsize, wxInputStream& stream)

     {
         InitWithStream(stream, read);
         SetBufferIO(bufsize);
     }
 
     {
         InitWithStream(stream, read);
         SetBufferIO(bufsize);
     }
 

-    wxStreamBuffer(wxOutputStream& stream, size_t bufsize)
+    wxStreamBuffer(size_t bufsize, wxOutputStream& stream)

     {
         InitWithStream(stream, write);
         SetBufferIO(bufsize);
     {
         InitWithStream(stream, write);
         SetBufferIO(bufsize);

diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index 2cb6d47e6389f462f6cd53cb51627e978a7816b1..7900f3ef0b89db9ad42b517cbf3d165239655c29 100644 (file)
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -172,8 +172,13 @@ public:
         and calling SetBufferIO() but is more convenient.
 
         @since 2.9.0
         and calling SetBufferIO() but is more convenient.
 
         @since 2.9.0

+
+        @param bufsize
+            The size of buffer in bytes.
+        @param stream
+            The associated input stream, the buffer will be used in read mode.

      */
      */

-    wxStreamBuffer(wxInputStream& stream, size_t bufsize);
+    wxStreamBuffer(size_t bufsize, wxInputStream& stream);

 
     /**
         Constructor for an output buffer of the specified size.
 
     /**
         Constructor for an output buffer of the specified size.


@@ -182,8 +187,13 @@ public:
         and calling SetBufferIO() but is more convenient.
 
         @since 2.9.0
         and calling SetBufferIO() but is more convenient.
 
         @since 2.9.0

+
+        @param bufsize
+            The size of buffer in bytes.
+        @param stream
+            The associated output stream, the buffer will be used in write mode.

      */
      */

-    wxStreamBuffer(wxOutputStream& stream, size_t bufsize);
+    wxStreamBuffer(size_t bufsize, wxOutputStream& stream);

 
     /**
         Constructor; creates a new empty stream buffer which won't flush any data
 
     /**
         Constructor; creates a new empty stream buffer which won't flush any data

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index 657e6675d4e7c22358aefd0bb9a792b9925242d0..8d8a42c870ffe4c9b7daf21fc100e05b26aacb1a 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -1214,7 +1214,7 @@ template <typename T>
 wxStreamBuffer *
 CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
 {
 wxStreamBuffer *
 CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
 {

-    return buffer ? buffer : new wxStreamBuffer(stream, bufsize);
+    return buffer ? buffer : new wxStreamBuffer(bufsize, stream);

 }
 
 } // anonymous namespace
 }
 
 } // anonymous namespace