Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now
compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,6 +53,9 @@
|
||||
#include <windows.h> // for GetTempFileName
|
||||
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
|
||||
#include <unistd.h>
|
||||
#elif (defined(__WXSTUBS__))
|
||||
// Have to ifdef this for different environments
|
||||
#include <io.h>
|
||||
#else
|
||||
#error "Please specify the header with file functions declarations."
|
||||
#endif //Win/UNIX
|
||||
@@ -94,6 +97,11 @@
|
||||
#define tell(fd) lseek(fd, 0, SEEK_CUR)
|
||||
#endif //_MSC_VER
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#define W_OK 2
|
||||
#define R_OK 4
|
||||
#endif
|
||||
|
||||
// there is no distinction between text and binary files under Unix
|
||||
#ifdef __UNIX__
|
||||
#define O_BINARY (0)
|
||||
@@ -418,7 +426,7 @@ bool wxTempFile::Open(const wxString& strName)
|
||||
// otherwise rename() in Commit() might not work (if the files are on
|
||||
// different partitions for example). Unfortunately, the only standard
|
||||
// (POSIX) temp file creation function tmpnam() can't do it.
|
||||
#ifdef __UNIX__
|
||||
#if defined(__UNIX__) || defined(__WXSTUBS__)
|
||||
static const char *szMktempSuffix = "XXXXXX";
|
||||
m_strTemp << strName << szMktempSuffix;
|
||||
mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
|
||||
|
Reference in New Issue
Block a user