initialize m_initialized to false to avoid spurious asserts

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index d8f53811f07389999abd68e364602d5d2c0c50ef..3eacce8a6a241b785cd79a97a8de660bda50b709 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -10,11 +10,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+    TODO: remove all the WinCE ugliness from here, implement the wxOpen(),
+          wxSeek(), ... functions in a separate file for WinCE instead!!!
+ */
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "file.h"
 #endif
 
     #pragma implementation "file.h"
 #endif
 


@@ -56,6 +61,8 @@
 
 #elif defined(__WXMSW__) && defined(__WXWINCE__)
     // TODO: what to include?
 
 #elif defined(__WXMSW__) && defined(__WXWINCE__)
     // TODO: what to include?

+#elif (defined(__OS2__))
+    #include <io.h>

 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
     #include  <time.h>
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
     #include  <time.h>


@@ -73,8 +80,6 @@
     #else
         #error  "Please specify the header with file functions declarations."
     #endif
     #else
         #error  "Please specify the header with file functions declarations."
     #endif

-#elif (defined(__WXPM__))
-    #include <io.h>

 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>
 #elif (defined(__WXSTUBS__))
     // Have to ifdef this for different environments
     #include <io.h>


@@ -692,7 +697,9 @@ bool wxTempFile::Open(const wxString& strName)
 
     if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {
 
     if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
     {

+#ifndef __OS2__

         wxLogSysError(_("Failed to set temporary file permissions"));
         wxLogSysError(_("Failed to set temporary file permissions"));

+#endif

     }
 #endif // Unix
 
     }
 #endif // Unix