Patch from "Viktor Voroshylo" <viktor@voroshylo.com>

src/.cvsignore : changes to ignore temorary project files
src/regex/.cvsignore : changes to ignore temorary project files for CE compiler
src/regex/regguts.h : assert will be ignored under WinCE
src/msw/button.cpp : BS_FLAT is not available under winCE
src/msw/clipbrd.cpp : changed CLIPFORMAT to wxDataFormat::NativeFormat so it will compile when ole is not included (under winCE)
src/msw/menu.cpp : GetMenuItemCount is not available under winCE. Using wxMenu::GetMenuCount in this case
src/common/regex.cpp : regex will be included under wince
include/wx/msw/wince/setup.h : wxUSE_THREADS & wxUSE_REGEX is enabled by default (as in standard windows configuration)
src/msw/wince/wxWindowsCE.vcp: fixed problem with all configurations (except emu once) do not have procompiled headers setup correctly. Changes for compiling with regex.
src/msw/wince/wxWindowsCE.vcw : added regex in workspace file


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

include/wx/msw/wince/setup.h

@@ -246,7 +246,7 @@
 // Default is 1
 //
 // Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 0
+#define wxUSE_THREADS 1
 
 // If enabled (1), compiles wxWindows streams classes
 #define wxUSE_STREAMS       1
@@ -439,7 +439,7 @@
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       0
+#define wxUSE_REGEX       1
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1

src/.cvsignore

@@ -13,3 +13,6 @@ wxwindowsM*Data
 wxwindowsM5.mcp
 build
 .DS_Store
+*.ncb
+*.opt
+*.plg

src/common/memory.cpp

@@ -1075,16 +1075,5 @@ void wxTraceLevel(int, const wxChar * ...)
 #endif
 }
 
-#else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)
-// Already defined in memory.h
-#if 0
-void wxTrace(const char *WXUNUSED(fmt) ...)
-{
-}
-
-void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt) ...)
-{
-}
-#endif
 #endif
 

src/common/regex.cpp

@@ -46,10 +46,7 @@
 #   include <sys/types.h>
 #endif
 
-#ifndef __WXWINCE__
 #include <regex.h>
-#endif
-
 #include "wx/regex.h"
 
 // ----------------------------------------------------------------------------

src/msw/button.cpp

@@ -183,9 +183,11 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
         msStyle |= BS_TOP;
     if ( style & wxBU_BOTTOM )
         msStyle |= BS_BOTTOM;
+#ifndef __WXWINCE__
     // flat 2d buttons
     if ( style & wxNO_BORDER )
         msStyle |= BS_FLAT;
+#endif // __WXWINCE__
 #endif // __WIN32__
 
     return msStyle;

src/msw/clipbrd.cpp

@@ -146,7 +146,7 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-    CLIPFORMAT cf = dataFormat.GetFormatId();
+   wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
 
     if ( ::IsClipboardFormatAvailable(cf) )
     {

src/msw/menu.cpp

@@ -832,7 +832,13 @@ int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
     wxASSERT(menu);
     wxASSERT(menu->GetHMenu());
     wxASSERT(m_hMenu);
+
+#if defined(__WXWINCE__)
+    int totalMSWItems = GetMenuCount();
+#else
     int totalMSWItems = GetMenuItemCount((HMENU)m_hMenu);
+#endif
+
     int i; // For old C++ compatibility
     for(i=wxpos; i<totalMSWItems; i++)
     {

src/msw/wince/wxWindowsCE.vcp

@@ -65,7 +65,7 @@ CFG=wxWindowsCE - Win32 (WCE x86) Debug Unicode
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_x86ud" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_x86ud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86ud.lib"
@@ -92,8 +92,8 @@ BSC32=bscmake.exe
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
 CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Oxs /I "..\..\..\include" /I "..\..\..\lib\wince_x86u" /D "NDEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /GF /c
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /Oxs /GF /c
+# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_x86u" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gs8192 /Oxs /GF /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86u.lib"
@@ -119,15 +119,15 @@ BSC32=bscmake.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_armud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armud.lib"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_armud" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
@@ -147,15 +147,15 @@ CPP=clarm.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_armu" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_armu.lib"
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_armu" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
@@ -177,15 +177,15 @@ CPP=clarm.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_x86emud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gz /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emud.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_x86emud" /D "DEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Gz /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
@@ -207,15 +207,15 @@ CPP=cl.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_x86emu" /I "..\..\..\include" /I "..\..\regex" /D "NDEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_x86emu.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_x86emu" /D "NDEBUG" /D "i486" /D "_X86_" /D "x86" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
@@ -237,15 +237,15 @@ CPP=cl.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_mipsud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsud.lib"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_mipsud" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
@@ -267,15 +267,15 @@ CPP=clmips.exe
 # PROP Sec_AlwaysSign 0
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
+CPP=clmips.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_mipsu" /I "..\..\..\include" /I "..\..\regex" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_mipsu.lib"
-CPP=clmips.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "..\..\..\include" /I "..\..\..\lib\wince_mipsu" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
@@ -299,7 +299,7 @@ CPP=clmips.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\include" /I "..\..\..\lib\wince_sh3ud" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "..\..\..\lib\wince_sh3ud" /I "..\..\..\include" /I "..\..\regex" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMTDebug) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_armd.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_sh3ud.lib"
@@ -328,8 +328,8 @@ BSC32=bscmake.exe
 # PROP Sec_ConfigureDevice 0
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /I "..\..\..\include" /I "..\..\..\lib\wince_sh3u" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "..\..\..\lib\wince_sh3u" /I "..\..\..\include" /I "..\..\regex" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "__WXWINCE__" /D "_LIB" /Yu"wx/wxprec.h" /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\..\lib\wxmswce_arm.lib"
 # ADD LIB32 /nologo /out:"..\..\..\lib\wxmswce_sh3u.lib"
@@ -729,16 +729,28 @@ SOURCE=..\..\common\extended.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -751,24 +763,12 @@ SOURCE=..\..\common\extended.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1302,16 +1302,28 @@ SOURCE=..\..\common\unzip.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -1324,24 +1336,12 @@ SOURCE=..\..\common\unzip.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1803,16 +1803,28 @@ SOURCE=..\dummy.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# ADD CPP /Yc"wx/wxprec.h"
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # ADD BASE CPP /Yc"wx/wxprec.h"
@@ -1825,24 +1837,12 @@ SOURCE=..\dummy.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-
 !ENDIF 
 
 # End Source File
@@ -1920,16 +1920,28 @@ SOURCE=..\gsocket.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -1942,24 +1954,12 @@ SOURCE=..\gsocket.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -1977,16 +1977,28 @@ SOURCE=..\gsockmsw.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -1999,24 +2011,12 @@ SOURCE=..\gsockmsw.c
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2408,16 +2408,28 @@ SOURCE=.\net.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+# SUBTRACT CPP /YX /Yc /Yu
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -2430,24 +2442,12 @@ SOURCE=.\net.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File
@@ -2471,16 +2471,22 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Debug Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARM) Release Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Debug Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE x86em) Release Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Debug Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE MIPS) Release Unicode"
 
+
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE SH3) Debug Unicode"
 
 # SUBTRACT BASE CPP /YX /Yc /Yu
@@ -2493,24 +2499,12 @@ SOURCE=.\time.cpp
 
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE emulator) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Debug Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ELSEIF  "$(CFG)" == "wxWindowsCE - Win32 (WCE ARMV4) Release Unicode"
 
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
 !ENDIF 
 
 # End Source File

src/msw/wince/wxWindowsCE.vcw

@@ -3,6 +3,18 @@ Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
 
 ###############################################################################
 
+Project: "regexCE"=..\..\regex\regexCE.vcp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "wxWindowsCE"=.\wxWindowsCE.vcp - Package Owner=<4>
 
 Package=<5>
@@ -11,6 +23,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name regexCE
+    End Project Dependency
 }}}
 
 ###############################################################################

src/regex/.cvsignore

@@ -1,2 +1,3 @@
 Debug
 Release
+*.vcl

src/regex/regguts.h

@@ -46,6 +46,7 @@
  */
 
 /* assertions */
+#ifndef __WXWINCE__
 #ifndef assert
 #ifndef REG_DEBUG
 #	ifndef NDEBUG
@@ -54,6 +55,10 @@
 #endif
 #include <assert.h>
 #endif
+#else
+// To do: assertion on WinCE
+#define assert(x)
+#endif
 
 /* voids */
 #ifndef DISCARD