wxString and wxChar* access for file functions. Source cleaning.

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 4c7f8a67c3b4045bb3cc4d7526167051a463e2d5..0475a8d8253cf3be8b7c9cdb379c925500f5eafd 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -251,7 +251,7 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
     wxExprDatabase db;
 
 {
     wxExprDatabase db;
 

-    FILE *fd = wxFopen(filename, wxT("r"));
+    FILE *fd = wxFopen(filename.fn_str(), wxT("r"));

     if (!fd)
         return false;
     bool eof = false;
     if (!fd)
         return false;
     bool eof = false;


@@ -2831,7 +2831,7 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
     if (!table)
         table = wxDefaultResourceTable;
 
     if (!table)
         table = wxDefaultResourceTable;
 

-    FILE *fd = wxFopen(f, wxT("r"));
+    FILE *fd = wxFopen(f.fn_str(), wxT("r"));

     if (!fd)
     {
         return false;
     if (!fd)
     {
         return false;

diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
index 457a60aab6db3a8e912194402a62a12187dbd566..3f30116607095e571e25ee9f875062345d5d6319 100644 (file)
--- a/contrib/src/deprecated/wxexpr.cpp
+++ b/contrib/src/deprecated/wxexpr.cpp
@@ -1072,7 +1072,7 @@ bool wxExprDatabase::Read(const wxString& filename)
 {
   noErrors = 0;
 
 {
   noErrors = 0;
 

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

   if (f)
   {
     thewxExprDatabase = this;
   if (f)
   {
     thewxExprDatabase = this;


@@ -1104,7 +1104,7 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
 
 bool wxExprDatabase::Write(const wxString& fileName)
 {
 
 bool wxExprDatabase::Write(const wxString& fileName)
 {

-  FILE *stream = wxFopen( fileName, _T("w+"));
+  FILE *stream = wxFopen( fileName.fn_str(), _T("w+"));

 
   if (!stream)
     return false;
 
   if (!stream)
     return false;

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index 229895912ba653c2e864aecb31d0795be17cec08..046a2164fd70af8356f81ed7aa1acbc450e514e2 100644 (file)
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@@ -158,7 +158,7 @@ bool wxXMetaFile::ReadFile(const wxChar *file)
 {
   HandleTableSize = 0;
 
 {
   HandleTableSize = 0;
 

-  FILE *handle = wxFopen(file, wxT("rb"));
+  FILE *handle = wxFopen(wxFNCONV(file), wxT("rb"));

   if (!handle) return false;
 
   // Read placeable metafile header, if any
   if (!handle) return false;
 
   // Read placeable metafile header, if any

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index d31c59a49e587426bcaf347b2cdfb214aa450adf..6ae35ab71984cff8fcdfce41e8ea2a117228c2c6 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -96,77 +96,36 @@ rc2wxr::~rc2wxr()
 
 
 void rc2wxr::Convert(wxString wxrfile, wxString rcfile)
 
 
 void rc2wxr::Convert(wxString wxrfile, wxString rcfile)

-

 {
 {

+    m_rc.Open(rcfile);
+    m_filesize=m_rc.Length();
+    if( (m_wxr  = wxFopen( wxrfile.fn_str(), _T("wt") )) == NULL )
+    {
+        return;
+    }

 
 

-m_rc.Open(rcfile);
-
-m_filesize=m_rc.Length();
-
-if( (m_wxr  = wxFopen( wxrfile, _T("wt") )) == NULL )
-
-{
-
-  return;
-
-}
-
-
-
-
-
-wxString tok,prevtok;
-
-
-
-
-
-while (!m_done)
-
-{
-
-
-
-tok=GetToken();
-
-
-
-if (tok==_T("DIALOG"))
-
-{
-
-ParseDialog(prevtok);
-
-}
-
-
-
-
-
-if (tok==_T("MENU"))
-
-{
-
-ParseMenu(prevtok);
-
-}
-
-
-
-prevtok=tok;
-
-}
-
-
+    wxString tok,prevtok;

 
 

-fclose(m_wxr);
+    while (!m_done)
+    {
+        tok=GetToken();

 
 

-//fclose(m_rc);
+        if (tok==_T("DIALOG"))
+        {
+            ParseDialog(prevtok);
+        }

 
 

-m_rc.Close();
+        if (tok==_T("MENU"))
+        {
+            ParseMenu(prevtok);
+        }

 
 

+        prevtok=tok;
+    }

 
 

+    fclose(m_wxr);

 
 

+    m_rc.Close();

 }
 
 
 }