From 6626de903e54f907fed5737b61344e31f86262eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 4 May 2007 20:57:53 +0000 Subject: [PATCH] use wxString instead of const wxChar* in wxFFile public API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/ffile.tex | 4 ++-- include/wx/ffile.h | 4 ++-- src/common/ffile.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/latex/wx/ffile.tex b/docs/latex/wx/ffile.tex index fafe340746..e4b09dbb03 100644 --- a/docs/latex/wx/ffile.tex +++ b/docs/latex/wx/ffile.tex @@ -41,7 +41,7 @@ None. Default constructor. -\func{}{wxFFile}{\param{const char*}{ filename}, \param{const char*}{ mode = "r"}} +\func{}{wxFFile}{\param{const wxString\&}{ filename}, \param{const wxString\&}{ mode = "r"}} Opens a file with the given mode. As there is no way to return whether the operation was successful or not from the constructor you should test the @@ -180,7 +180,7 @@ Returns the length of the file. \membersection{wxFFile::Open}\label{wxffileopen} -\func{bool}{Open}{\param{const char*}{ filename}, \param{const char*}{ mode = "r"}} +\func{bool}{Open}{\param{const wxString\&}{ filename}, \param{const wxString\&}{ mode = "r"}} Opens the file, returning \true if successful. diff --git a/include/wx/ffile.h b/include/wx/ffile.h index 15984f7b11..fff114e2a4 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -37,13 +37,13 @@ public: // def ctor wxFFile() { m_fp = NULL; } // open specified file (may fail, use IsOpened()) - wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); + wxFFile(const wxString& filename, const wxString& mode = _T("r")); // attach to (already opened) file wxFFile(FILE *lfp) { m_fp = lfp; } // open/close // open a file (existing or not - the mode controls what happens) - bool Open(const wxChar *filename, const wxChar *mode = _T("r")); + bool Open(const wxString& filename, const wxString& mode = _T("r")); // closes the opened file (this is a NOP if not opened) bool Close(); diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp index c60271dbd5..05c29faa6d 100644 --- a/src/common/ffile.cpp +++ b/src/common/ffile.cpp @@ -57,14 +57,14 @@ // opening the file // ---------------------------------------------------------------------------- -wxFFile::wxFFile(const wxChar *filename, const wxChar *mode) +wxFFile::wxFFile(const wxString& filename, const wxString& mode) { Detach(); (void)Open(filename, mode); } -bool wxFFile::Open(const wxChar *filename, const wxChar *mode) +bool wxFFile::Open(const wxString& filename, const wxString& mode) { wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") ); -- 2.45.2