explicit scrollbar style flags needed

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index d8f53811f07389999abd68e364602d5d2c0c50ef..cf35fd14864a9783b145cb033537bf240d7c812f 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>


@@ -140,7 +145,7 @@
     #define ACCESS(access)  , (access)
 #endif // Salford C
 
     #define ACCESS(access)  , (access)
 #endif // Salford C
 

-// wxWindows
+// wxWidgets

 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"
 #ifndef WX_PRECOMP
     #include  "wx/string.h"
     #include  "wx/intl.h"


@@ -409,10 +414,10 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __WXWINCE__
     wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
 
 #ifdef __WXWINCE__

-    DWORD bytesRead = 0;
+    DWORD bytesWritten = 0;

     int iRc = 0;
     int iRc = 0;

-    if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL))
-        iRc = bytesRead;
+    if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesWritten, NULL))
+        iRc = bytesWritten;

     else
         iRc = -1;
 #elif defined(__MWERKS__)
     else
         iRc = -1;
 #elif defined(__MWERKS__)


@@ -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