Added wxString::FromAscii() wxString::ToAscii().
Removed wxConvFile, made it a define wxConvLocal. Exchanged some wxConvLibc to wxConvLocal calls. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1112,10 +1112,10 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
|
||||
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
|
||||
return FALSE;
|
||||
#else // !Win32
|
||||
wxStructStat fbuf;
|
||||
|
||||
wxStructStat fbuf;
|
||||
// get permissions of file1
|
||||
if ( wxStat( file1, &fbuf) != 0 )
|
||||
if ( wxStat( file1.c_str(), &fbuf) != 0 )
|
||||
{
|
||||
// the file probably doesn't exist or we haven't the rights to read
|
||||
// from it anyhow
|
||||
@@ -1146,6 +1146,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
|
||||
|
||||
// create file2 with the same permissions than file1 and open it for
|
||||
// writing
|
||||
|
||||
wxFile fileOut;
|
||||
if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
|
||||
return FALSE;
|
||||
|
Reference in New Issue
Block a user