AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GetTempFileName used in wxTempFile now instead of tmpnam

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-07-14 21:59:27 +00:00
parent 0ce2baa5e6
commit 30a5be975d
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/file.cpp
View File

@ -29,6 +29,28 @@
// standard // standard
#if defined(__WXMSW__) && !defined(__GNUWIN32__) #if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <io.h> #include <io.h>
#define WIN32_LEAN_AND_MEAN
#define NOSERVICE
#define NOIME
#define NOATOM
#define NOGDI
#define NOGDICAPMASKS
#define NOMETAFILE
#define NOMINMAX
#define NOMSG
#define NOOPENFILE
#define NORASTEROPS
#define NOSCROLL
#define NOSOUND
#define NOSYSMETRICS
#define NOTEXTMETRIC
#define NOWH
#define NOCOMM
#define NOKANJI
#define NOCRYPT
#define NOMCX
#include <windows.h> // for GetTempFileName
#elif (defined(__UNIX__) || defined(__GNUWIN32__)) #elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h> #include <unistd.h>
#else #else
@ -376,10 +398,15 @@ bool wxTempFile::Open(const wxString& strName)
#ifdef __UNIX__ #ifdef __UNIX__
static const char *szMktempSuffix = "XXXXXX"; static const char *szMktempSuffix = "XXXXXX";
m_strTemp << strName << szMktempSuffix; m_strTemp << strName << szMktempSuffix;
mktemp((char *)m_strTemp.c_str()); // @@@ even if the length doesn't change mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
//m_strTemp.UngetWriteBuf();
#else // Windows #else // Windows
m_strTemp = tmpnam(NULL); wxString strPath;
wxSplitPath(strName, &strPath, NULL, NULL);
if ( strPath.IsEmpty() )
strPath = '.'; // GetTempFileName will fail if we give it empty string
if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
wxLogLastError("GetTempFileName");
m_strTemp.UngetWriteBuf();
#endif // Windows/Unix #endif // Windows/Unix
return m_file.Open(m_strTemp, wxFile::write); return m_file.Open(m_strTemp, wxFile::write);