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

wxMkdir/Rmdir clash fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-04-06 12:59:20 +00:00
parent 7295717d1d
commit f30f5bd933
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/filefn.h
View File

@@ -81,16 +81,16 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
#define wxOpen _wopen #define wxOpen _wopen
#define wxAccess _waccess #define wxAccess _waccess
#define wxMkdir _wmkdir #define wxMkDir _wmkdir
#define wxRmdir _wrmdir #define wxRmDir _wrmdir
#define wxStat _wstat #define wxStat _wstat
#else // !wxUSE_UNICODE #else // !wxUSE_UNICODE
#define wxOpen _open #define wxOpen _open
#define wxAccess _access #define wxAccess _access
#define wxMkdir _mkdir #define wxMkDir _mkdir
#define wxRmdir _rmdir #define wxRmDir _rmdir
#define wxStat _stat #define wxStat _stat
#endif #endif

4
src/common/filefn.cpp
View File

@@ -1083,7 +1083,7 @@ bool wxMkdir(const wxString& dir, int perm)
#elif defined(__WXPM__) #elif defined(__WXPM__)
if (::DosCreateDir((PSZ)dir, NULL)) != 0) // enhance for EAB's?? if (::DosCreateDir((PSZ)dir, NULL)) != 0) // enhance for EAB's??
#else // !MSW and !OS/2 VAC++ #else // !MSW and !OS/2 VAC++
if ( wxMkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
#endif // !MSW/MSW #endif // !MSW/MSW
{ {
wxLogSysError(_("Directory '%s' couldn't be created"), dirname); wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
@@ -1108,7 +1108,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
#ifdef __SALFORDC__ #ifdef __SALFORDC__
return FALSE; // What to do? return FALSE; // What to do?
#else #else
return (wxRmdir(wxFNSTRINGCAST dir.fn_str()) == 0); return (wxRmDir(wxFNSTRINGCAST dir.fn_str()) == 0);
#endif #endif
#endif #endif