__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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index c6f4454aac5b13f4f6ce7fa672ef7c9441da4388..bf8053e4e7860bcd904eee23385feaac856753df 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -44,7 +44,7 @@ public:
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \

-                           defined(__WXWINCE__)     || \
+                           defined(__SMARTPHONE__)  || \

                            defined(__SALFORDC__)    || \
                            !wxUSE_OLE               || \
                            (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
                            defined(__SALFORDC__)    || \
                            !wxUSE_OLE               || \
                            (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 7afa113cd1577a606587058b27a868007fe95b68..69e95031d429652dc029440dc0786b0b2f6173cf 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -129,7 +129,7 @@ enum wxSeekMode
 
 // Wrappers around Win32 api functions like CreateFile, ReadFile and such
 // Implemented in filefnwce.cpp
 
 // Wrappers around Win32 api functions like CreateFile, ReadFile and such
 // Implemented in filefnwce.cpp

-#if defined( __WINCE__)
+#if defined( __WXWINCE__)

     typedef __int64 wxFileOffset;
     #define wxFileOffsetFmtSpec _("I64")
     int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
     typedef __int64 wxFileOffset;
     #define wxFileOffsetFmtSpec _("I64")
     int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));

diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 50eff7a464b4263ebfff55316e3105ce5c421308..33bfc6eab34fe9f0d7f3e4fdcbd1c5d769087b81 100644 (file)
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -128,5 +128,17 @@ extern "C" void *
 bsearch(const void *key, const void *base, size_t num, size_t size,
         int (wxCMPFUNC_CONV *cmp)(const void *, const void *));
 
 bsearch(const void *key, const void *base, size_t num, size_t size,
         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_
 

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index d653fe0b62a65a91de3e82b09235cf6890841bcd..058635fac5ecc7395d2a3acea99048c7aad95641 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -811,7 +811,7 @@
 //
 // Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
 // smaller library.
 //
 // Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
 // smaller library.

-#define wxUSE_HTML          0
+#define wxUSE_HTML          1

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

diff --git a/include/wx/version.h b/include/wx/version.h
index c15ebd33f31e259e75e7ea7134bb10c022e00b74..837c611b9149facae6a65f043fbc857e1c822885 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -21,9 +21,9 @@
 /*      so don't change its format too much or they could break */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5
 /*      so don't change its format too much or they could break */
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      5

-#define wxRELEASE_NUMBER     2
-#define wxSUBRELEASE_NUMBER  9
-#define wxVERSION_STRING   _T("wxWidgets 2.5.2")
+#define wxRELEASE_NUMBER     3
+#define wxSUBRELEASE_NUMBER  0
+#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 */
 /*  ---------------------------------------------------------------------------- */

diff --git a/src/msw/wince/filefnwce.cpp b/src/msw/wince/filefnwce.cpp
index ba56448e41d5f20db452c3f697c82c2ab714e977..a1163cfee99385ce7dc8e45d796e2d8d45fa53e1 100644 (file)
--- a/src/msw/wince/filefnwce.cpp
+++ b/src/msw/wince/filefnwce.cpp
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <fcntl.h>
 
 #include <string.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__