Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-21 18:57:20 +00:00
parent a6f4dbbd86
commit 4430ec36d1
4 changed files with 27 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/src/deprecated/resource.cpp
View File

@@ -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) if (!fd)
return false; return false;
bool eof = false; bool eof = false;
@@ -2831,7 +2831,7 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
if (!table) if (!table)
table = wxDefaultResourceTable; table = wxDefaultResourceTable;
FILE *fd = wxFopen(f, wxT("r")); FILE *fd = wxFopen(f.fn_str(), wxT("r"));
if (!fd) if (!fd)
{ {
return false; return false;

4
contrib/src/deprecated/wxexpr.cpp
View File

@@ -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) if (f)
{ {
thewxExprDatabase = this; 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) if (!stream)
return false; return false;

2
contrib/src/ogl/mfutils.cpp
View File

@@ -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; if (!handle) return false;
// Read placeable metafile header, if any // Read placeable metafile header, if any

85
contrib/utils/convertrc/rc2wxr.cpp
View File

@@ -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); wxString tok,prevtok;
m_filesize=m_rc.Length(); while (!m_done)
{
tok=GetToken();
if( (m_wxr = wxFopen( wxrfile, _T("wt") )) == NULL ) if (tok==_T("DIALOG"))
{
ParseDialog(prevtok);
}
{ if (tok==_T("MENU"))
{
return; ParseMenu(prevtok);
}
}
wxString tok,prevtok;
while (!m_done)
{
tok=GetToken();
if (tok==_T("DIALOG"))
{
ParseDialog(prevtok);
}
if (tok==_T("MENU"))
{
ParseMenu(prevtok);
}
prevtok=tok;
}
fclose(m_wxr);
//fclose(m_rc);
m_rc.Close();
prevtok=tok;
}
fclose(m_wxr);
m_rc.Close();
} }