Compile with EVC 3.0 2002

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 28838451e1d306d0e4035426df5b8604f824aa8b..b092c66a516a718c9999729f5651cdae805a188b 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -16,10 +16,11 @@
 
 #include "wx/msw/wrapwin.h"
 
-
 #if defined (__WXWINCE__)
     #include <wingdi.h>     // RGB, COLORREF
+    #define ERRFALSE(x)
     #include <winuser.h>    // Global Namespaces ::GetKeyState, ::GetWindowRect
+    #include "wx/msw/winundef.h"
 #endif
 
 
@@ -555,6 +556,7 @@ WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
 #ifdef __WXWINCE__
 #include <winbase.h>
 
+#if _WIN32_WCE <= 211
 #define GlobalAlloc LocalAlloc
 #define GlobalFree LocalFree
 #define GlobalLock(mem) mem
@@ -564,6 +566,7 @@ WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
 #define GHND LPTR
 #define GMEM_MOVEABLE 0
 #define GMEM_SHARE 0
+#endif
 
 #if 0
 

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 77c091660e24dd8d43a3d208ab44815a4ea95a21..d28de5227bd69184d1244b0542eb1982aa8da449 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -244,7 +244,7 @@
 // Default is 1
 //
 // Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
+#define wxUSE_THREADS 0
 
 // If enabled (1), compiles wxWindows streams classes
 #define wxUSE_STREAMS       1

diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h
index 6c0b049f299472acc38d775d7017f90cc226fb08..41181e982a1c3382dbc841398d4831a45044c0c6 100644 (file)
--- a/include/wx/msw/winundef.h
+++ b/include/wx/msw/winundef.h
@@ -317,7 +317,11 @@
     #undef IsMaximized
     inline BOOL IsMaximized(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return FALSE;
+#else
         return IsZoomed(hwnd);
+#endif
     }
 #endif
 
@@ -327,7 +331,11 @@
     #undef GetFirstChild
     inline HWND GetFirstChild(HWND hwnd)
     {
+#ifdef __WXWINCE__
+        return 0;
+#else
         return GetTopWindow(hwnd);
+#endif
     }
 #endif
 

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 9a30e286fae62db60165731fb6e01e19050d8bf0..1809db0dc5c924200b38a842076fc56c427e0c96 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -931,9 +931,12 @@ WXDLLIMPEXP_BASE int      wxSystem(const wxChar *psz);
 #ifdef __WXWINCE__
 WXDLLIMPEXP_BASE char* strdup(const char* s);
 WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
+
+#if _WIN32_WCE <= 211
 WXDLLIMPEXP_BASE int isspace(int c);
 WXDLLIMPEXP_BASE int isascii( int c );
 #endif
+#endif
 
 // ----------------------------------------------------------------------------
 // multibyte to wide char conversion functions and macros

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 02643c08e5b858f87805e03429db60009fccf2cd..ad464891f6c2027bb39286950cd772e3ac2cdc43 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -236,8 +236,9 @@ bool wxAppBase::ProcessIdle()
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {
     bool needMore = FALSE;
-    
+
     win->OnInternalIdle();
+
     if (wxIdleEvent::CanSend(win))
     {
         event.SetEventObject(win);
@@ -246,7 +247,6 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
         if (event.MoreRequested())
             needMore = TRUE;
     }
-
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index e26ea1f3cb51d995fb7b51f3120c979e2f9dde74..8353277d164c2cdb136d1a9175302cf53de0448d 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -1403,7 +1403,8 @@ char *strdup(const char *s)
 }
 #endif
 
-#if (defined(__MWERKS__) && !defined(__MACH__)) || defined(__WXWINCE__)
+#if (defined(__MWERKS__) && !defined(__MACH__)) || (defined(__WXWINCE__) && _WIN32_WCE <= 211)
+
 int isascii( int c )
 {
     return ( c >= 0 && c < 128 );
@@ -1418,8 +1419,11 @@ void *calloc( size_t num, size_t size )
     return ptr;
 }
 
+#if (_WIN32_WCE <= 211)
 int isspace(int c)
 {
     return (c == ' ');
 }
 #endif
+
+#endif

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 7d596522decef19bf1fa4e34cad2d355c2d63c50..f4e01a72a17d7287521fafcbbd2d806f5d83051b 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -40,6 +40,8 @@
     #include "wx/icon.h"
 #endif
 
+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
 #include "wx/module.h"
@@ -52,8 +54,6 @@
 #include <string.h>
 #include <math.h>
 
-#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
-
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
 #endif