X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ed0d735d588f42485461ea526596436c4c6ad4b..5f5183d34bbf704e3426673a080d19cf280d5a96:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index da27b425d1..283d91002f 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -10,11 +10,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* + TODO: remove all the WinCE ugliness from here, implement the wxOpen(), + wxSeek(), ... functions in a separate file for WinCE instead!!! + */ + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "file.h" #endif @@ -56,8 +61,11 @@ #elif defined(__WXMSW__) && defined(__WXWINCE__) // TODO: what to include? +#elif (defined(__OS2__)) + #include #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include + #include #include #ifdef __GNUWIN32__ #include "wx/msw/wrapwin.h" @@ -72,8 +80,6 @@ #else #error "Please specify the header with file functions declarations." #endif -#elif (defined(__WXPM__)) - #include #elif (defined(__WXSTUBS__)) // Have to ifdef this for different environments #include @@ -139,7 +145,7 @@ #define ACCESS(access) , (access) #endif // Salford C -// wxWindows +// wxWidgets #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/intl.h" @@ -691,7 +697,9 @@ bool wxTempFile::Open(const wxString& strName) if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 ) { +#ifndef __OS2__ wxLogSysError(_("Failed to set temporary file permissions")); +#endif } #endif // Unix