Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -283,7 +283,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
|
|||||||
wxStrcpy(buf, wxFileFunctionsBuffer);
|
wxStrcpy(buf, wxFileFunctionsBuffer);
|
||||||
|
|
||||||
wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
|
wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
|
||||||
filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
|
filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
|
||||||
|
|
||||||
for (wxNode * node = First (); node; node = node->Next ())
|
for (wxNode * node = First (); node; node = node->Next ())
|
||||||
{
|
{
|
||||||
@@ -464,7 +464,7 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
|
|||||||
if (filename == wxT(""))
|
if (filename == wxT(""))
|
||||||
return (wxChar *) NULL;
|
return (wxChar *) NULL;
|
||||||
|
|
||||||
if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
|
if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) {
|
||||||
wxChar buf[_MAXPATHLEN];
|
wxChar buf[_MAXPATHLEN];
|
||||||
buf[0] = wxT('\0');
|
buf[0] = wxT('\0');
|
||||||
wxGetWorkingDirectory(buf, WXSIZEOF(buf));
|
wxGetWorkingDirectory(buf, WXSIZEOF(buf));
|
||||||
@@ -1626,7 +1626,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
|
|||||||
strFile += wxFILE_SEP_PATH;
|
strFile += wxFILE_SEP_PATH;
|
||||||
strFile += pszFile;
|
strFile += pszFile;
|
||||||
|
|
||||||
if ( FileExists(strFile) ) {
|
if ( wxFileExists(strFile) ) {
|
||||||
*pStr = strFile;
|
*pStr = strFile;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user