xti additions / changes, trying to reduce dependencies

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index aca1dc4d26a1f2760ce0ac0169247746bcf65194..3d6fde63ea9dd6aa45a67038e8c6767362c012fc 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -14,7 +14,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "file.h"
 #endif
 
@@ -58,9 +58,10 @@
     // TODO: what to include?
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
+    #include  <time.h>
     #include  <sys/stat.h>
     #ifdef __GNUWIN32__
-        #include <windows.h>
+        #include "wx/msw/wrapwin.h"
     #endif
 #elif defined(__DOS__)
     #if defined(__WATCOMC__)
@@ -717,7 +718,7 @@ bool wxTempFile::Commit()
         return FALSE;
     }
 
-    if ( wxRenameFile(m_strTemp, m_strName) != 0 ) {
+    if ( !wxRenameFile(m_strTemp, m_strName)  ) {
         wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
         return FALSE;
     }