changed wxFFileOutput/InputStream ctor 'mode' argument to wxString

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

diff --git a/docs/latex/wx/ffilestr.tex b/docs/latex/wx/ffilestr.tex
index 197c62e7b1487c763e0c18bd7cb896cb65e0a73d..a323fea6ba58c269c540990a20cb4a8cc564901c 100644 (file)
--- a/docs/latex/wx/ffilestr.tex
+++ b/docs/latex/wx/ffilestr.tex
@@ -31,7 +31,7 @@ can seek beyond the end of the stream (file) and will thus not return
 
 \membersection{wxFFileInputStream::wxFFileInputStream}\label{wxffileinputstreamctor}
 
 
 \membersection{wxFFileInputStream::wxFFileInputStream}\label{wxffileinputstreamctor}
 

-\func{}{wxFFileInputStream}{\param{const wxString\&}{ filename}, \param{const wxChar *}{ mode = "rb"}}
+\func{}{wxFFileInputStream}{\param{const wxString\&}{ filename}, \param{const wxString\&}{ mode = "rb"}}

 
 Opens the specified file using its {\it filename} name using the specified mode.
 
 
 Opens the specified file using its {\it filename} name using the specified mode.
 


@@ -88,7 +88,7 @@ can seek beyond the end of the stream (file) and will thus not return
 
 \membersection{wxFFileOutputStream::wxFFileOutputStream}\label{wxffileoutputstreamctor}
 
 
 \membersection{wxFFileOutputStream::wxFFileOutputStream}\label{wxffileoutputstreamctor}
 

-\func{}{wxFFileOutputStream}{\param{const wxString\&}{ filename}, \param{const wxChar *}{ mode="w+b"}}
+\func{}{wxFFileOutputStream}{\param{const wxString\&}{ filename}, \param{const wxString\&}{ mode="w+b"}}

 
 Opens the file with the given {\it filename} name in the specified mode.
 
 
 Opens the file with the given {\it filename} name in the specified mode.
 

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index b8b954ecca5b449d12c28f47b31ca7973402f754..ae62191d393fbe349af47017a6eecd87822b4258 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -132,7 +132,7 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:

-    wxFFileInputStream(const wxString& fileName, const wxChar *mode = _T("rb"));
+    wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");

     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();


@@ -160,7 +160,7 @@ protected:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:

-    wxFFileOutputStream(const wxString& fileName, const wxChar *mode = _T("w+b"));
+    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "w+b");

     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 25327f1489dde8a578d9431dab54d620652ddf74..5bc7cf1ce22eaa01028b53b259b512111fcc8577 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -234,7 +234,7 @@ wxFileStream::wxFileStream(const wxString& fileName)
 // ----------------------------------------------------------------------------
 
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
 // ----------------------------------------------------------------------------
 
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName,

-                                       const wxChar *mode)
+                                       const wxString& mode)

                   : wxInputStream()
 {
     m_file = new wxFFile(fileName, mode);
                   : wxInputStream()
 {
     m_file = new wxFFile(fileName, mode);


@@ -310,7 +310,7 @@ bool wxFFileInputStream::IsOk() const
 // ----------------------------------------------------------------------------
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
 // ----------------------------------------------------------------------------
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,

-                                         const wxChar *mode)
+                                         const wxString& mode)

 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;
 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;