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

Quick and dirty fix for building with COMPATIBILITY_2_4 off.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-02 17:11:19 +00:00
parent c04b9739f6
commit f526f7526b
6 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/filefn.cpp
View File

@@ -215,6 +215,18 @@ WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
static inline wxChar* MYcopystring(const wxString& s)
{
wxChar* copy = new wxChar[s.length() + 1];
return wxStrcpy(copy, s.c_str());
}
static inline wxChar* MYcopystring(const wxChar* s)
{
wxChar* copy = new wxChar[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
void wxPathList::Add (const wxString& path)
{
wxStringList::Add (WXSTRINGCAST path);
@@ -239,7 +251,7 @@ void wxPathList::AddEnvList (const wxString& envVariable)
wxChar *val = wxGetenv (WXSTRINGCAST envVariable);
if (val && *val)
{
wxChar *s = copystring (val);
wxChar *s = MYcopystring (val);
wxChar *save_ptr, *token = wxStrtok (s, PATH_TOKS, &save_ptr);
if (token)
@@ -502,9 +514,9 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
wxStrcat(buf, wxT("/"));
#endif
wxStrcat(buf, wxFileFunctionsBuffer);
return copystring( wxRealPath(buf) );
return MYcopystring( wxRealPath(buf) );
}
return copystring( wxFileFunctionsBuffer );
return MYcopystring( wxFileFunctionsBuffer );
}
/*-
@@ -553,7 +565,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
buf[0] = wxT('\0');
if (name == NULL || *name == wxT('\0'))
return buf;
nm = copystring(name); // Make a scratch copy
nm = MYcopystring(name); // Make a scratch copy
wxChar *nm_tmp = nm;
/* Skip leading whitespace and cr */
@@ -1385,7 +1397,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
if ( buf )
wxStrcpy(buf, filename);
else
buf = copystring(filename);
buf = MYcopystring(filename);
return buf;
}