Fix wxGTK compilation.

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9ba4a565c09e8450219c2c3ef516ecc5b4bc3ca5..62dfb206d2a79315c17d284bcd93375d8db48024 100644 (file)
--- 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 688b8a4cdd52d793c056a9f1746e1d2fb5604cb7..f66055242625c8bd543934fd3277220c5f665c78 100644 (file)
--- 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())