More wxFile fixes.

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

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 6ae35ab71984cff8fcdfce41e8ea2a117228c2c6..11eb941376c9844a1ab7e8f08f426a143d3c277f 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -99,7 +99,7 @@ void rc2wxr::Convert(wxString wxrfile, wxString rcfile)
 {
     m_rc.Open(rcfile);
     m_filesize=m_rc.Length();
 {
     m_rc.Open(rcfile);
     m_filesize=m_rc.Length();

-    if( (m_wxr  = wxFopen( wxrfile.fn_str(), _T("wt") )) == NULL )
+    if( (m_wxr  = wxFopen( wxrfile, _T("wt") )) == NULL )

     {
         return;
     }
     {
         return;
     }

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 24dabe56b7596118aabb6da51393155677318e83..1ac305abe921ce5ebbb4f6b06469b1f1f1cf573c 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -748,7 +748,7 @@ int LoadIndex(wxChar *file_name)
 
     wxSprintf(buf, _T("%s.idx"), file_name);
 
 
     wxSprintf(buf, _T("%s.idx"), file_name);
 

-    index_file = wxFopen(wxFNCONV(buf), _T("r"));
+    index_file = wxFopen(buf, _T("r"));

     if (index_file == NULL)
       return 0;
 
     if (index_file == NULL)
       return 0;
 


@@ -823,7 +823,7 @@ bool LoadPoem(wxChar *file_name, long position)
     }
 
     wxSprintf(buf, _T("%s.dat"), file_name);
     }
 
     wxSprintf(buf, _T("%s.dat"), file_name);

-    data_file = wxFopen(wxFNCONV(buf), _T("r"));
+    data_file = wxFopen(buf, _T("r"));

 
     if (data_file == NULL)
     {
 
     if (data_file == NULL)
     {


@@ -897,7 +897,7 @@ long MainWindow::DoSearch(void)
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 

-    file = wxFopen(wxFNCONV(buf), _T("r"));
+    file = wxFopen(buf, _T("r"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);


@@ -979,7 +979,7 @@ bool Compile(void)
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 
     if (data_filename)
       wxSprintf(buf, _T("%s.dat"), data_filename);
 

-    file = wxFopen(wxFNCONV(buf), _T("r"));
+    file = wxFopen(buf, _T("r"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry data file %s not found\n"), buf);


@@ -1011,7 +1011,7 @@ bool Compile(void)
     if (index_filename)
       wxSprintf(buf, _T("%s.idx"), index_filename);
 
     if (index_filename)
       wxSprintf(buf, _T("%s.idx"), index_filename);
 

-    file = wxFopen(wxFNCONV(buf), _T("w"));
+    file = wxFopen(buf, _T("w"));

     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry index file %s cannot be created\n"), buf);
     if (! (data_filename && file))
     {
       wxSprintf(error_buf, _T("Poetry index file %s cannot be created\n"), buf);

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 2cc7b686dd500d38db1164d302c075c8a2c15109..95485de92ddabfef8f91076774101d1cd4f3f44b 100644 (file)
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -77,7 +77,7 @@ static GLfloat yrot;
 
 static void read_surface( const wxChar *filename )
 {
 
 static void read_surface( const wxChar *filename )
 {

-    FILE *f = wxFopen(wxFNCONV(filename),_T("r"));
+    FILE *f = wxFopen(filename,_T("r"));

     if (!f)
     {
         wxString msg = _T("Couldn't read ");
     if (!f)
     {
         wxString msg = _T("Couldn't read ");