Added GSocket_Select() and fixed some things

[wxWidgets.git] / src / common / file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 6b65c35e828f9bd977c3d460b134b04e96e78d65..459e3d3709904090134de7713f01b6be7f9e4056 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -500,7 +500,7 @@ bool wxTempFile::Open(const wxString& strName)
     if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
 #else
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
     if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
 #else
         // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?

-        if ( !GetTempFileName((BYTE) (const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+        if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )

 #endif
             wxLogLastError(_T("GetTempFileName"));
     m_strTemp.UngetWriteBuf();
 #endif
             wxLogLastError(_T("GetTempFileName"));
     m_strTemp.UngetWriteBuf();