Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes
to take out nested classes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -57,7 +57,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ )
|
||||
#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
|
||||
#include <direct.h>
|
||||
#include <dos.h>
|
||||
#endif
|
||||
@@ -74,6 +74,11 @@
|
||||
#include <dir.h>
|
||||
#endif
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
#include <dir.h>
|
||||
#include <unix.h>
|
||||
#endif
|
||||
|
||||
#include "wx/setup.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
@@ -240,7 +245,12 @@ wxFileExists (const wxString& filename)
|
||||
return TRUE;
|
||||
return FALSE ;
|
||||
#else
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
struct _stat stbuf;
|
||||
#else
|
||||
struct stat stbuf;
|
||||
#endif
|
||||
|
||||
if ((filename != "") && stat ((char *)(const char *)filename, &stbuf) == 0)
|
||||
return TRUE;
|
||||
@@ -992,8 +1002,14 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
|
||||
wxUnix2MacFilename( gwxMacFileName ) ;
|
||||
return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
|
||||
#else
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
return FALSE; // What to do?
|
||||
#else
|
||||
return (rmdir(WXSTRINGCAST dir) == 0);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
#if 0
|
||||
@@ -1051,8 +1067,13 @@ bool wxPathExists(const char *pszPathName)
|
||||
if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != '\0' )
|
||||
strPath.Last() = '\0';
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
struct _stat st;
|
||||
#else
|
||||
struct stat st;
|
||||
return stat(strPath, &st) == 0 && (st.st_mode & S_IFDIR);
|
||||
#endif
|
||||
|
||||
return stat((char*) (const char*) strPath, &st) == 0 && (st.st_mode & S_IFDIR);
|
||||
}
|
||||
|
||||
// Get a temporary filename, opening and closing the file.
|
||||
|
Reference in New Issue
Block a user