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