fopen -> wxFopen and such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -112,7 +112,7 @@
|
|||||||
|
|
||||||
#define _MAXPATHLEN 500
|
#define _MAXPATHLEN 500
|
||||||
|
|
||||||
extern char *wxBuffer;
|
extern wxChar *wxBuffer;
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
|
|
||||||
@@ -978,9 +978,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
|
|||||||
(fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL ||
|
(fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL ||
|
||||||
(fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL)
|
(fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL)
|
||||||
#else
|
#else
|
||||||
if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
|
if ((fp1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL ||
|
||||||
(fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
|
(fp2 = wxFopen (WXSTRINGCAST file2, wxT("rb"))) == NULL ||
|
||||||
(fp3 = fopen (outfile, "wb")) == NULL)
|
(fp3 = wxFopen (outfile, wxT("wb"))) == NULL)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if (fp1)
|
if (fp1)
|
||||||
@@ -1020,9 +1020,9 @@ wxCopyFile (const wxString& file1, const wxString& file2)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL)
|
if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL)
|
||||||
#else
|
#else
|
||||||
if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
|
if ((fd1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
|
if ((fd2 = wxFopen (WXSTRINGCAST file2, wxT("wb"))) == NULL)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
fclose (fd1);
|
fclose (fd1);
|
||||||
|
Reference in New Issue
Block a user