From dc65c743e5f60970e26b26c4ffee2baca5a42585 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 19 Jun 2007 11:57:48 +0000 Subject: [PATCH] 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 --- docs/latex/wx/ffilestr.tex | 4 ++-- include/wx/wfstream.h | 4 ++-- src/common/wfstream.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/ffilestr.tex b/docs/latex/wx/ffilestr.tex index 197c62e7b1..a323fea6ba 100644 --- 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} -\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. @@ -88,7 +88,7 @@ can seek beyond the end of the stream (file) and will thus not return \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. diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h index b8b954ecca..ae62191d39 100644 --- a/include/wx/wfstream.h +++ b/include/wx/wfstream.h @@ -132,7 +132,7 @@ private: 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(); @@ -160,7 +160,7 @@ protected: 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(); diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 25327f1489..5bc7cf1ce2 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -234,7 +234,7 @@ wxFileStream::wxFileStream(const wxString& fileName) // ---------------------------------------------------------------------------- wxFFileInputStream::wxFFileInputStream(const wxString& fileName, - const wxChar *mode) + const wxString& mode) : wxInputStream() { m_file = new wxFFile(fileName, mode); @@ -310,7 +310,7 @@ bool wxFFileInputStream::IsOk() const // ---------------------------------------------------------------------------- wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName, - const wxChar *mode) + const wxString& mode) { m_file = new wxFFile(fileName, mode); m_file_destroy = true; -- 2.45.2