Fix wxGTK compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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);
|
||||
|
@@ -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())
|
||||
|
Reference in New Issue
Block a user