From 9adf429992d1b47de00b6f641fc865570d1f473c Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Wed, 22 Dec 2004 07:07:24 +0000 Subject: [PATCH] Fix wxGTK compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 6 +++--- src/common/wfstream.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 9ba4a565c0..62dfb206d2 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -951,9 +951,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil FILE *fp2 = NULL; FILE *fp3 = NULL; // Open the inputs and outputs - if ((fp1 = wxFopen ( file1.fn_str(), wxT("rb"))) == NULL || - (fp2 = wxFopen ( file2.fn_str(), wxT("rb"))) == NULL || - (fp3 = wxFopen ( outfile.fn_str(), wxT("wb"))) == NULL) + if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL || + (fp2 = wxFopen ( file2, wxT("rb"))) == NULL || + (fp3 = wxFopen ( outfile, wxT("wb"))) == NULL) { if (fp1) fclose (fp1); diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 688b8a4cdd..f660552426 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -33,7 +33,7 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) : wxInputStream() { - m_file = new wxFile(fileName.fn_str(), wxFile::read); + m_file = new wxFile(fileName, wxFile::read); m_file_destroy = true; } @@ -109,7 +109,7 @@ wxFileOffset wxFileInputStream::OnSysTell() const wxFileOutputStream::wxFileOutputStream(const wxString& fileName) { - m_file = new wxFile(fileName.fn_str(), wxFile::write); + m_file = new wxFile(fileName, wxFile::write); m_file_destroy = true; if (!m_file->IsOpened()) -- 2.45.2