__WINCE__ -> __WXWINCE__
Added missing O_... symbols Incremented the version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,7 +44,7 @@ public:
|
|||||||
|
|
||||||
// Universal and non-port related switches with need for generic implementation
|
// Universal and non-port related switches with need for generic implementation
|
||||||
#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
|
#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
|
||||||
defined(__WXWINCE__) || \
|
defined(__SMARTPHONE__) || \
|
||||||
defined(__SALFORDC__) || \
|
defined(__SALFORDC__) || \
|
||||||
!wxUSE_OLE || \
|
!wxUSE_OLE || \
|
||||||
(defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
|
(defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
|
||||||
|
@@ -129,7 +129,7 @@ enum wxSeekMode
|
|||||||
|
|
||||||
// Wrappers around Win32 api functions like CreateFile, ReadFile and such
|
// Wrappers around Win32 api functions like CreateFile, ReadFile and such
|
||||||
// Implemented in filefnwce.cpp
|
// Implemented in filefnwce.cpp
|
||||||
#if defined( __WINCE__)
|
#if defined( __WXWINCE__)
|
||||||
typedef __int64 wxFileOffset;
|
typedef __int64 wxFileOffset;
|
||||||
#define wxFileOffsetFmtSpec _("I64")
|
#define wxFileOffsetFmtSpec _("I64")
|
||||||
int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
|
int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
|
||||||
|
@@ -128,5 +128,17 @@ extern "C" void *
|
|||||||
bsearch(const void *key, const void *base, size_t num, size_t size,
|
bsearch(const void *key, const void *base, size_t num, size_t size,
|
||||||
int (wxCMPFUNC_CONV *cmp)(const void *, const void *));
|
int (wxCMPFUNC_CONV *cmp)(const void *, const void *));
|
||||||
|
|
||||||
|
#define O_RDONLY 0x0000 /* open for reading only */
|
||||||
|
#define O_WRONLY 0x0001 /* open for writing only */
|
||||||
|
#define O_RDWR 0x0002 /* open for reading and writing */
|
||||||
|
#define O_APPEND 0x0008 /* writes done at eof */
|
||||||
|
|
||||||
|
#define O_CREAT 0x0100 /* create and open file */
|
||||||
|
#define O_TRUNC 0x0200 /* open and truncate */
|
||||||
|
#define O_EXCL 0x0400 /* open only if file doesn't already exist */
|
||||||
|
|
||||||
|
#define O_TEXT 0x4000 /* file mode is text (translated) */
|
||||||
|
#define O_BINARY 0x8000 /* file mode is binary (untranslated) */
|
||||||
|
|
||||||
#endif // _WX_CE_MISSING_H_
|
#endif // _WX_CE_MISSING_H_
|
||||||
|
|
||||||
|
@@ -811,7 +811,7 @@
|
|||||||
//
|
//
|
||||||
// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
|
// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
|
||||||
// smaller library.
|
// smaller library.
|
||||||
#define wxUSE_HTML 0
|
#define wxUSE_HTML 1
|
||||||
|
|
||||||
// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
|
// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
|
||||||
// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
|
// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
|
||||||
|
@@ -21,9 +21,9 @@
|
|||||||
/* so don't change its format too much or they could break */
|
/* so don't change its format too much or they could break */
|
||||||
#define wxMAJOR_VERSION 2
|
#define wxMAJOR_VERSION 2
|
||||||
#define wxMINOR_VERSION 5
|
#define wxMINOR_VERSION 5
|
||||||
#define wxRELEASE_NUMBER 2
|
#define wxRELEASE_NUMBER 3
|
||||||
#define wxSUBRELEASE_NUMBER 9
|
#define wxSUBRELEASE_NUMBER 0
|
||||||
#define wxVERSION_STRING _T("wxWidgets 2.5.2")
|
#define wxVERSION_STRING _T("wxWidgets 2.5.3")
|
||||||
|
|
||||||
/* nothing to update below this line when updating the version */
|
/* nothing to update below this line when updating the version */
|
||||||
/* ---------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------- */
|
||||||
|
@@ -36,7 +36,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#ifdef __WINCE__
|
#ifdef __WXWINCE__
|
||||||
|
|
||||||
int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode))
|
int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode))
|
||||||
{
|
{
|
||||||
@@ -211,4 +211,4 @@ int wxFsync(int WXUNUSED(fd))
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //__WINCE__
|
#endif //__WXWINCE__
|
||||||
|
Reference in New Issue
Block a user