X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ea105e0ba20c15e4d83f829e1c4faeb0a4952f0..a1665b22b07c572a240f9d83783044e3e4f9cb0e:/src/common/file.cpp

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 9c207aacf2..2cdd6e8e7c 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -20,12 +20,13 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/defs.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+  #pragma hdrstop
 #endif
 
+#if wxUSE_FILE
+
 // standard
 #if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
   #include  <io.h>
@@ -160,7 +161,7 @@ bool wxFile::Exists(const wxChar *name)
 {
     struct stat st;
 #if wxUSE_UNICODE && wxMBFILES
-    wxCharBuffer fname = wxConv_file.cWC2MB(name);
+    wxCharBuffer fname = wxConvFile.cWC2MB(name);
 
     return !access(fname, 0) &&
            !stat(MBSTRINGCAST fname, &st) &&
@@ -205,12 +206,6 @@ wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
     Open(szFileName, mode);
 }
 
-// dtor
-wxFile::~wxFile()
-{
-    Close();
-}
-
 // create the file, fail if it already exists and bOverwrite
 bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
@@ -349,25 +344,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
-    int flag = -1;
+    int origin;
     switch ( mode ) {
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+
         case wxFromStart:
-            flag = SEEK_SET;
+            origin = SEEK_SET;
             break;
 
         case wxFromCurrent:
-            flag = SEEK_CUR;
+            origin = SEEK_CUR;
             break;
 
         case wxFromEnd:
-            flag = SEEK_END;
+            origin = SEEK_END;
             break;
-
-        default:
-            wxFAIL_MSG(_("unknown seek origin"));
     }
 
-    int iRc = lseek(m_fd, ofs, flag);
+    int iRc = lseek(m_fd, ofs, origin);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;
@@ -573,3 +568,6 @@ void wxTempFile::Discard()
     if ( remove(m_strTemp.fn_str()) != 0 )
         wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
 }
+
+#endif
+