Fixed source for WinCE compatibility

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

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index a636dc1ceaa0e1ac42361b37fb70da9d3b041a27..1ed0730ba38a29eecb962314c382bab80066cc1d 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -2,7 +2,7 @@
 
 # Make a distribution of an application on MSW.
 # Example:
 
 # Make a distribution of an application on MSW.
 # Example:

-# ../distrib/msw/makesetup.sh --wxmsw --verbose 2>&1 | cat > log
+# ../distrib/msw/makesetup.sh --wxmsw --verbose &> | cat > log

 
 # If your zip accepts Cygwin-style paths, then
 # use cygpath, else substitute echo
 
 # If your zip accepts Cygwin-style paths, then
 # use cygpath, else substitute echo


@@ -347,7 +347,7 @@ dospinsetup()
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
     rm -f -r contrib/docs/latex/ogl
     rm -f src/mingegcs.bat
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
     rm -f -r contrib/docs/latex/ogl
     rm -f src/mingegcs.bat

-    rm -f distrib
+    rm -f -r distrib

     rm -f *.spec
     rm -f -r contrib/utils/wxrcedit
 
     rm -f *.spec
     rm -f -r contrib/utils/wxrcedit
 

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 8c85b7e8657fdade14a23606d171ed73414225e3..5a1f00b5c2609c4a92c0bea16f32b32121bd2023 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -7,6 +7,8 @@ src/wxUniv.dsp
 src/wxUniv.dsw
 src/wxBase.dsp
 src/wxBase.dsw
 src/wxUniv.dsw
 src/wxBase.dsp
 src/wxBase.dsw

+src/msw/wince/wxWindowsCE.vcp
+src/msw/wince/wxWindowsCE.vcw

 
 src/jpeg/jpeg.dsp
 src/jpeg/jpeg.dsw
 
 src/jpeg/jpeg.dsp
 src/jpeg/jpeg.dsw


@@ -61,6 +63,8 @@ samples/dialogs/dialogs.dsp
 samples/dialogs/dialogs.dsw
 samples/dialogs/dialogsUniv.dsp
 samples/dialogs/dialogsUniv.dsw
 samples/dialogs/dialogs.dsw
 samples/dialogs/dialogsUniv.dsp
 samples/dialogs/dialogsUniv.dsw

+samples/dialogs/dialogsCE.vcp
+samples/dialogs/dialogsCE.vcw

 
 samples/dialup/dialup.dsp
 samples/dialup/dialup.dsw
 
 samples/dialup/dialup.dsp
 samples/dialup/dialup.dsw


@@ -165,6 +169,8 @@ samples/mfc/mfc.dsw
 samples/minimal/minimal.dsp
 samples/minimal/minimal.dsw
 samples/minimal/minimalUniv.dsp
 samples/minimal/minimal.dsp
 samples/minimal/minimal.dsw
 samples/minimal/minimalUniv.dsp

+samples/minimal/minimalCE.vcp
+samples/minimal/minimalCE.vcw

 
 samples/minifram/minifram.dsp
 samples/minifram/minifram.dsw
 
 samples/minifram/minifram.dsp
 samples/minifram/minifram.dsw


@@ -264,6 +270,8 @@ samples/wxtest/wxtest.dsw
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
 samples/widgets/widgetsUniv.dsp
 samples/widgets/widgets.dsp
 samples/widgets/widgets.dsw
 samples/widgets/widgetsUniv.dsp

+samples/widgets/widgetsCE.vcp
+samples/widgets/widgetsCE.vcw

 
 samples/opengl/cube/cube.dsp
 samples/opengl/cube/cube.dsw
 
 samples/opengl/cube/cube.dsp
 samples/opengl/cube/cube.dsw


@@ -274,6 +282,8 @@ samples/opengl/penguin/penguin.dsw
 
 demos/bombs/bombs.dsp
 demos/bombs/bombs.dsw
 
 demos/bombs/bombs.dsp
 demos/bombs/bombs.dsw

+demos/bombs/bombsCE.vcp
+demos/bombs/bombsCE.vcw

 
 demos/dbbrowse/dbbrowse.dsp
 demos/dbbrowse/dbbrowse.dsw
 
 demos/dbbrowse/dbbrowse.dsp
 demos/dbbrowse/dbbrowse.dsw


@@ -286,9 +296,13 @@ demos/fractal/fractal.dsw
 
 demos/life/life.dsp
 demos/life/life.dsw
 
 demos/life/life.dsp
 demos/life/life.dsw

+demos/life/lifeCE.vcp
+demos/life/lifeCE.vcw

 
 demos/poem/poem.dsp
 demos/poem/poem.dsw
 
 demos/poem/poem.dsp
 demos/poem/poem.dsw

+demos/poem/poemCE.vcp
+demos/poem/poemCE.vcw

 
 utils/tex2rtf/src/Tex2RTFVC.dsp
 utils/tex2rtf/src/Tex2RTFVC.dsw
 
 utils/tex2rtf/src/Tex2RTFVC.dsp
 utils/tex2rtf/src/Tex2RTFVC.dsw

diff --git a/docs/changes.txt b/docs/changes.txt
index b17d156e664693227fc14f9008d6350c70408308..88939dce52ac4ecab8d4ac5649459d66b5fd72af 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -161,7 +161,7 @@ wxMSW:
 - fixed wxListCtrl::GetItemText/BackgroundColour()
 - Esc can now be used to close menus in the dialogs (Hartmut Honisch)
 - Added msw.remap system option so colourful toolbar buttons
 - fixed wxListCtrl::GetItemText/BackgroundColour()
 - Esc can now be used to close menus in the dialogs (Hartmut Honisch)
 - Added msw.remap system option so colourful toolbar buttons

-  aren't mangled if you set it to 0
+  aren't mangled if you set it to 0. The default is 1

 - Toolbar buttons are now centred if the bitmap size is smaller
   than the specified default size
 
 - Toolbar buttons are now centred if the bitmap size is smaller
   than the specified default size
 

diff --git a/docs/html/faq.htm b/docs/html/faq.htm
index 3bf0ff6ade3d677895f1837a99e2502e7717f06c..90ac45bb7713c4f2d2721b4b48060e9d659ce229 100644 (file)
--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -1,4 +1,3 @@
-

 <html>
 
 <head>
 <html>
 
 <head>


@@ -26,8 +25,9 @@ Welcome to the wxWindows FAQ. Please select a category:<p>
 <ul>
 <li><a href="faqgen.htm">General questions</a>
 <li><a href="faqcmn.htm">Questions common to all platforms</a>
 <ul>
 <li><a href="faqgen.htm">General questions</a>
 <li><a href="faqcmn.htm">Questions common to all platforms</a>

-<li><a href="faqgtk.htm">GTK+ questions</a>

 <li><a href="faqmsw.htm">MS Windows questions</a>
 <li><a href="faqmsw.htm">MS Windows questions</a>

+<li><a href="faqunx.htm">Questions common to all Unix (GTK+/X11/Motif) ports</a>
+<li><a href="faqgtk.htm">GTK+ questions</a>

 <li><a href="faqmot.htm">Motif questions</a>
 <li><a href="faqx11.htm">X11 questions</a>
 <li><a href="faqmac.htm">Mac questions</a>
 <li><a href="faqmot.htm">Motif questions</a>
 <li><a href="faqx11.htm">X11 questions</a>
 <li><a href="faqmac.htm">Mac questions</a>

diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm
index a7f7985a41a28c636ba54155938c391a74beca34..320dbebde8d58cbca5af47d0bd38ecfeaf31438e 100644 (file)
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -1,4 +1,3 @@
-

 <HTML>
 
 <HEAD>
 <HTML>
 
 <HEAD>


@@ -21,7 +20,8 @@
 
 <P>
 
 
 <P>
 

-See also <a href="faq.htm">top-level FAQ page</a>.
+See also <a href="faq.htm">top-level FAQ page</a>
+and <a href="faqunx.htm">Unix FAQ page</a>.

 <hr>
 <h3>List of questions in this category</h3>
 
 <hr>
 <h3>List of questions in this category</h3>
 

diff --git a/docs/html/faqmot.htm b/docs/html/faqmot.htm
index 8920cbe82dfefeba3e7eba11ca6252600d39d485..609f6b70cccb9de70fe9499330c194eb884825bc 100644 (file)
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -1,4 +1,3 @@
-

 <HTML>
 
 <HEAD>
 <HTML>
 
 <HEAD>


@@ -21,7 +20,8 @@
 
 <P>
 
 
 <P>
 

-See also <a href="faq.htm">top-level FAQ page</a>.
+See also <a href="faq.htm">top-level FAQ page</a>
+and <a href="faqunx.htm">Unix FAQ page</a>.

 <hr>
 <h3>List of questions in this category</a></h3>
 <ul>
 <hr>
 <h3>List of questions in this category</a></h3>
 <ul>

diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm
index cfe6e89be30268e877ce24850f43acf987c61f75..79b0ce996f6d0451a0808f610b1eca958646b586 100644 (file)
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -1,4 +1,3 @@
-

 <HTML>
 
 <HEAD>
 <HTML>
 
 <HEAD>


@@ -45,6 +44,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
 <li><a href="#regconfig">Why can I not write to the HKLM part of the registry with wxRegConfig?</a></li>
 <li><a href="#access">Is MS Active Accessibility supported?</a></li>
 <li><a href="#shortcutproblem">Why are menu hotkeys or shortcuts not working in my application?</a></li>
 <li><a href="#regconfig">Why can I not write to the HKLM part of the registry with wxRegConfig?</a></li>
 <li><a href="#access">Is MS Active Accessibility supported?</a></li>

+<li><a href="#dspfmt">Why does Visual C++ complain about corrupted project files??</a></li>

 </ul>
 <hr>
 
 </ul>
 <hr>
 


@@ -75,13 +75,7 @@ without ever needing a copy of Microsoft Windows. See the Technical Note on the
 
 <h3><a name="wince">What about Windows CE?</a></h3>
 
 
 <h3><a name="wince">What about Windows CE?</a></h3>
 

-This is under consideration, though we need to get wxWindows Unicode-aware first.
-There are other interesting issues, such as how to combine the menubar and toolbar APIs
-as Windows CE requires. But there&#39;s no doubt that it will be possible, albeit
-by mostly cutting down wxWindows 2 API functionality, and adding a few classes here
-and there. Since wxWindows for 2 produces small binaries (less than 300K for
-the statically-linked &#39;minimal&#39; sample), shoehorning wxWindows 2 into a Windows CE device&#39;s limited
-storage should not be a problem.<P>
+This port is largely complete. For further information, see the <a href="http://www.wxwindows.org/embedded.htm#wxwince">wxEmbedded</a> page.<P>

 
 <h3><a name="winxp">What do I need to do for Windows XP?</a></h3>
 
 
 <h3><a name="winxp">What do I need to do for Windows XP?</a></h3>
 


@@ -137,18 +131,17 @@ Please see the wxWindows 2 for Windows install.txt file for up-to-date informati
 currently the following are known to work:<P>
 
 <ul>
 currently the following are known to work:<P>
 
 <ul>

-<li>Visual C++ 1.5, 4.0, 5.0, 6.0
-<li>Borland C++ 4.5, 5.0
-<li>Borland C++Builder 1.0, 3.0
-<li>Watcom C++ 10.6 (WIN32)
-<li>Cygwin b20
+<li>Visual C++ 1.5, 4.0, 5.0, 6.0, 7.0, 7.1
+<li>Borland C++ 4.5, 5.0, 5.5
+<li>Borland C++Builder 1.0, 3.0, X
+<li>Watcom C++ 10.6 (Win32), OpenWatcom 1.0
+<li>Cygwin (using configure)

 <li>Mingw32
 <li>Mingw32

-<li>MetroWerks CodeWarrior 4
+<li>MetroWerks CodeWarrior (many versions)
+<li>Digital Mars 8.34+

 </ul>
 <P>
 
 </ul>
 <P>
 

-There is a linking problem with Symantec C++ which I hope someone can help solve.
-<P>

 
 <h3><a name="bestcompiler">Which is the best compiler to use with wxWindows 2?</a></h3>
 
 
 <h3><a name="bestcompiler">Which is the best compiler to use with wxWindows 2?</a></h3>
 


@@ -178,24 +171,20 @@ wxWindows.
 
 <h3><a name="unicode">Is Unicode supported?</a></h3>
 
 
 <h3><a name="unicode">Is Unicode supported?</a></h3>
 

-Yes, Unicode is fully supported under Windows NT/2000 (Windows 9x don&#39;t
-have Unicode support anyhow).
+Yes, Unicode is fully supported under Windows NT/2000 and there is limited
+support for it under Windows 9x using <a
+href="http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx">MSLU</a>.
+<p>

 
 <h3><a name="doublebyte">Does wxWindows support double byte fonts (Chinese/Japanese/Korean etc.)?</a></h3>
 
 
 <h3><a name="doublebyte">Does wxWindows support double byte fonts (Chinese/Japanese/Korean etc.)?</a></h3>
 

-An answer from <a href="mailto:goedde@logosoft.de">Klaus Goedde</a>:<p>
-
-"For Japanese under Win2000, it seems that wxWindows has no problems to work with double byte char sets
-(I mean DBCS, that&#39;s not Unicode). First you have to install Japanese support on your Win2K system
-and choose for ANSI translation 
-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932 (default is 1252 for Western).
-Then you can see all the funny Japanese letters under wxWindows too.<P>
-
-In a wxTextCtrl control you have to set the window style "wxTE_RICH", otherwise this control shows the wrong 
-letters.
-
-I don&#39;t now whether it works on non W2K systems, because I&#39;m just starting using wxWindows."
-<P>
+For Japanese under Win2000, it seems that wxWindows has no problems to work
+with double byte char sets (meaning DBCS, not Unicode). First you have to
+install Japanese support on your Win2K system and choose for ANSI translation
+<tt>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932</tt>
+(default is 1252 for Western). Then you can see all the Japanese letters in
+wxWindows applications.
+<p>

 
 <h3><a name="dll">Can you compile wxWindows 2 as a DLL?</a></h3>
 
 
 <h3><a name="dll">Can you compile wxWindows 2 as a DLL?</a></h3>
 


@@ -247,7 +236,7 @@ functionality using MFC.<P>
 
 When you build the wxWindows library, setup.h is copied
 from include/wx/msw/setup.h to e.g. lib/mswd/wx/setup.h (the path
 
 When you build the wxWindows library, setup.h is copied
 from include/wx/msw/setup.h to e.g. lib/mswd/wx/setup.h (the path

-depends on the configuration you're building). So you need to add
+depends on the configuration you&#39;re building). So you need to add

 this include path if building using the static Debug library:<P>
 
 lib/mswd<P>
 this include path if building using the static Debug library:<P>
 
 lib/mswd<P>


@@ -345,7 +334,7 @@ example) and regenerate the makefile using tmake.<P>
 
 tmake can be found at
 <a href="http://www.troll.no/freebies/tmake.html" target=_new>www.troll.no/freebies/tmake.html</a>.
 
 tmake can be found at
 <a href="http://www.troll.no/freebies/tmake.html" target=_new>www.troll.no/freebies/tmake.html</a>.

-It&#39;s a Perl5 program and so it needs Perl (doh). There is a binary for 
+It&#39;s a Perl5 program and so it needs Perl (doh). There is a binary for

 Windows (available from the same page), but I haven&#39;t used it, so
 I don&#39;t know if it works as flawlessly as "perl tmake" does (note
 for people knowing Perl: don&#39;t try to run tmake with -w, it won&#39;t
 Windows (available from the same page), but I haven&#39;t used it, so
 I don&#39;t know if it works as flawlessly as "perl tmake" does (note
 for people knowing Perl: don&#39;t try to run tmake with -w, it won&#39;t


@@ -354,7 +343,7 @@ just go to distrib/msw/tmake and type<P>
 
 <pre>tmake -t b32 wxwin.pro -o ../../src/msw/makefile.b32</pre><P>
 
 
 <pre>tmake -t b32 wxwin.pro -o ../../src/msw/makefile.b32</pre><P>
 

-The makefiles are untested - I don&#39;t have any of Borland, Watcom  or
+The makefiles are untested - I don&#39;t have any of Borland, Watcom or

 Symantec and I don&#39;t have enough diskspace to recompile even with
 VC6 using makefiles. The new makefiles are as close as possible to the
 old ones, but not closer: in fact, there has been many strange things
 Symantec and I don&#39;t have enough diskspace to recompile even with
 VC6 using makefiles. The new makefiles are as close as possible to the
 old ones, but not closer: in fact, there has been many strange things


@@ -461,7 +450,7 @@ First, you can use wxRegKey directly, for example:
     regKey.SetName(idName);
 
     {
     regKey.SetName(idName);
 
     {

-        wxLogNull dummy; 
+        wxLogNull dummy;

         if (!regKey.Create())
         {
             idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\");
         if (!regKey.Create())
         {
             idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\");


@@ -506,6 +495,20 @@ for the current status.
 
 <P>
 
 
 <P>
 

+
+<h3><a name="#dspfmt">Why does Visual C++ complain about corrupted project files??</a></h3>
+
+If you have downloaded the wxWindows sources from the cvs using a Unix cvs
+client or downloaded a daily snapshot in <tt>.tar.gz</tt> format, it is likely
+that the project files have Unix line endings (LF) instead of the DOS ones (CR
+LF). However all versions of Visual C++ up to and including 7.1 can only open
+the files with the DOS line endings, so you must transform the files to this
+format using any of the thousands ways to do it.
+<p>
+Of course, another possibility is to always use only the Windows cvs client
+and to avoid this problem completely.
+<p>
+

 </font>
 
 </BODY>
 </font>
 
 </BODY>

diff --git a/docs/html/faqx11.htm b/docs/html/faqx11.htm
index ad2af5839f176ebaa6a86924698f39e45ec1f9fe..ddcd399d6512abbeebe6a5b4f97666af95c169a8 100644 (file)
--- a/docs/html/faqx11.htm
+++ b/docs/html/faqx11.htm
@@ -1,4 +1,3 @@
-

 <HTML>
 
 <HEAD>
 <HTML>
 
 <HEAD>


@@ -21,7 +20,8 @@
 
 <P>
 
 
 <P>
 

-See also <a href="faq.htm">top-level FAQ page</a>.
+See also <a href="faq.htm">top-level FAQ page</a>
+and <a href="faqunx.htm">Unix FAQ page</a>.

 <hr>
 <h3>List of questions in this category</a></h3>
 <ul>
 <hr>
 <h3>List of questions in this category</a></h3>
 <ul>

diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm
index d0468baa37c303f2b386282a5f0504879424877e..c9d065dc67afd861902009d124c8090523c7929c 100644 (file)
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -1,6 +1,6 @@
 <html>
 <head>
 <html>
 <head>

-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta http-equiv="Content-Type" content="text/html; charset=utf8">

    <meta name="Author" content="Vadim Zeitlin">
    <title>List of translators for wxWindows</title>
 </head>
    <meta name="Author" content="Vadim Zeitlin">
    <title>List of translators for wxWindows</title>
 </head>


@@ -50,6 +50,10 @@ The columns of this table have the obvious meaning: in each row you will see
 the language, the official translator (if any) for it and the status of the
 translations as of wxWindows 2.3.
 
 the language, the official translator (if any) for it and the status of the
 translations as of wxWindows 2.3.
 

+<p>
+Please note that email addresses in the table below are intentionally invalid
+to foil spam robots, remove one <tt>@</tt> from them.
+

 <p>
 <table width=100% border=4 cellpadding=5 cellspacing=0>
 
 <p>
 <table width=100% border=4 cellpadding=5 cellspacing=0>
 


@@ -63,31 +67,38 @@ translations as of wxWindows 2.3.
 <td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Translator(s) </font> </td>
 </tr>
 
 <td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Translator(s) </font> </td>
 </tr>
 

+<tr>
+    <td valign=center>Afrikaans</td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:rkwjpj@@puk.ac.za">Petri Jooste</A>
+                                   </td>
+</tr>
+

 <tr>
     <td valign=center>Catalan</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
 <tr>
     <td valign=center>Catalan</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:paubcrespo@hotmail.com">Pau Bosch i Crespo</A>
+    <td align=center valign=center><A HREF="mailto:paubcrespo@@hotmail.com">Pau Bosch i Crespo</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Chinese (simplified)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Chinese (simplified)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:mrfx@fm365.com">mrfx</A>
+    <td align=center valign=center><A HREF="mailto:mrfx@@fm365.com">mrfx</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Chinese (traditional)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Chinese (traditional)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:pal.tw@yahoo.com.tw">pal.tw</A>
+    <td align=center valign=center><A HREF="mailto:pal.tw@@yahoo.com.tw">pal.tw</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Czech</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Czech</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:v.slavik@volny.cz">Vaclav Slavik</A>
+    <td align=center valign=center><A HREF="mailto:v.slavik@@volny.cz">Vaclav Slavik</A>

                                    </td>
 </tr>
 
                                    </td>
 </tr>
 


@@ -95,15 +106,15 @@ translations as of wxWindows 2.3.
     <td valign=center>Danish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>
     <td valign=center>Danish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>

-        <A HREF="mailto:leif@danmos.dk">Leif Jensen</A>,
-        <A HREF="mailto:Henrik@fangorn.dk">Henrik Ræder Clausen</A>
+        <A HREF="mailto:leif@@danmos.dk">Leif Jensen</A>,
+        <A HREF="mailto:Henrik@@fangorn.dk">Henrik Ræder Clausen</A>

     </td>
 </tr>
 
 <tr>
     <td valign=center>Dutch</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     </td>
 </tr>
 
 <tr>
     <td valign=center>Dutch</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:phubers@solve-i-t.com">Patrick Hubers</A></td>
+    <td align=center valign=center><A HREF="mailto:phubers@@solve-i-t.com">Patrick Hubers</A></td>

 </tr>
 
 <tr>
 </tr>
 
 <tr>


@@ -115,25 +126,25 @@ translations as of wxWindows 2.3.
 <tr>
     <td valign=center>Finnish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
 <tr>
     <td valign=center>Finnish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:kgb@compart.fi">Kaj G Backas</A></td>
+    <td align=center valign=center><A HREF="mailto:kgb@@compart.fi">Kaj G Backas</A></td>

 </tr>
 
 <tr>
     <td valign=center>French (standard)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
 </tr>
 
 <tr>
     <td valign=center>French (standard)</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
-                                   <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>,
-                                   <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
+    <td align=center valign=center><A HREF="mailto:Stephane.Junique@@optics.kth.se">Stephane Junique</A>,
+                                   <A HREF="mailto:lionel.allorge@@lunerouge.com">Lionel Allorge</A>,
+                                   <A HREF="mailto:Gilles.Guyot@@Krypton.be">Gilles Guyot</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>German</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>German</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:DanR@gmx.de">Daniel Reith</A>,
-                                   <A HREF="mailto:sparhawk@aon.at">Gerhard Gruber</A>,
-                                   <A HREF="mailto:stefan@hedemann.de">Stefan Hedemann</A>,
-                                   <A HREF="mailto:D.Reymann@geisenheim.mnd.fh-wiesbaden.de">Dr. Detlev Reymann</A>,
+    <td align=center valign=center><A HREF="mailto:DanR@@gmx.de">Daniel Reith</A>,
+                                   <A HREF="mailto:sparhawk@@aon.at">Gerhard Gruber</A>,
+                                   <A HREF="mailto:stefan@@hedemann.de">Stefan Hedemann</A>,
+                                   <A HREF="mailto:D.Reymann@@geisenheim.mnd.fh-wiesbaden.de">Dr. Detlev Reymann</A>,

                                    <A HREF="mailto:">Mark Johnson</A>
                                    </td>
 </tr>
                                    <A HREF="mailto:">Mark Johnson</A>
                                    </td>
 </tr>


@@ -141,15 +152,15 @@ translations as of wxWindows 2.3.
 <tr>
     <td valign=center>Greek</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Done"></td>
 <tr>
     <td valign=center>Greek</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:tsolako1@otenet.gr">Tsolakos Stavros</A>,
-                                   <A HREF="mailto:nassosy@compulink.gr">Nassos Yiannopoulos</A>
+    <td align=center valign=center><A HREF="mailto:tsolako1@@otenet.gr">Tsolakos Stavros</A>,
+                                   <A HREF="mailto:nassosy@@compulink.gr">Nassos Yiannopoulos</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Hungarian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Hungarian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:Janos_Vegh@users.sourceforge.net">Végh János Dr.</A>
+    <td align=center valign=center><A HREF="mailto:Janos_Vegh@@users.sourceforge.net">Végh János Dr.</A>

                                    </td>
 </tr>
 
                                    </td>
 </tr>
 


@@ -157,7 +168,7 @@ translations as of wxWindows 2.3.
     <td valign=center>Indonesian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>
     <td valign=center>Indonesian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>

-        <a href="mailto:bambang@3wsi.com">Bambang Purnomosidi D. P.</a>
+        <a href="mailto:bambang@@3wsi.com">Bambang Purnomosidi D. P.</a>

     </td>
 </tr>
 
     </td>
 </tr>
 


@@ -165,62 +176,80 @@ translations as of wxWindows 2.3.
     <td valign=center>Italian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>
     <td valign=center>Italian</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
     <td align=center valign=center>

-        <A HREF="mailto:m.cavallini@koansoftware.com">Marco Cavallini</A>
+        <A HREF="mailto:m.cavallini@@koansoftware.com">Marco Cavallini</A>

         (<a href="http://www.koansoftware.com" target=_new>Koan Software</a>)
     </td>
 </tr>
 
         (<a href="http://www.koansoftware.com" target=_new>Koan Software</a>)
     </td>
 </tr>
 

+<tr>
+    <td valign=center>Japanese</td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center>
+        <A HREF="mailto:james.bishop1@@tiscali.co.uk">James Bishop</A>,
+        <A HREF="mailto:saito@@inetrt.skcapi.co.jp">Hiroshi Saito</A>
+    </td>
+</tr>
+
+<tr>
+    <td valign=center>Latvian</td>
+    <td align=center valign=center><IMG SRC="images/somewhat.gif" ALT="In progress"></td>
+    <td align=center valign=center>
+        <A HREF="mailto:lauris@@nix.lv">Lauris Buk&#353;is</A>
+    </td>
+</tr>
+

 <tr>
     <td valign=center>Polish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
 <tr>
     <td valign=center>Polish</td>
     <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>

-    <td align=center valign=center><A HREF="mailto:matiso@hoga.pl">Piotr Mackowiak</A>,
-                                   <a href="mailto:jpiw@go2.pl">Janusz Piwowarski</a></td>
+    <td align=center valign=center><A HREF="mailto:matiso@@hoga.pl">Piotr Mackowiak</A>,
+                                   <a href="mailto:jpiw@@go2.pl">Janusz Piwowarski</a></td>

 </tr>
 
 <tr>
     <td valign=center>Portuguese</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
 </tr>
 
 <tr>
     <td valign=center>Portuguese</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>

-    <td align=center valign=center><A HREF="mailto:bernardosw@terra.com.br">Bernardo Santos Wernesback</A></td>
+    <td align=center valign=center><A HREF="mailto:bernardosw@@terra.com.br">Bernardo Santos Wernesback</A></td>

 </tr>
 
 <tr>
     <td valign=center>Russian</td>
 </tr>
 
 <tr>
     <td valign=center>Russian</td>

-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
-    <td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>,
-                                   <A HREF="mailto:vadim@wxwindows.org">Vadim Zeitlin</A>
-                                   <A HREF="mailto:kai@cmail.ru">Andrew V. Samoilov</A>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:rolinsky@@mema.ucl.ac.be">Roman Rolinsky</A>,
+                                   <A HREF="mailto:vadim@@wxwindows.org">Vadim Zeitlin</A>
+                                   <A HREF="mailto:kai@@cmail.ru">Andrew V. Samoilov</A>

                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Serbian</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
                                    </td>
 </tr>
 
 <tr>
     <td valign=center>Serbian</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>

-    <td align=center valign=center><A HREF="mailto:zlatkor@eunet.yu">Zlatko Rosandic</A></td>
+    <td align=center valign=center><A HREF="mailto:zlatkor@@eunet.yu">Zlatko Rosandic</A></td>

 </tr>
 
 <tr>
     <td valign=center>Spanish</td>
 </tr>
 
 <tr>
     <td valign=center>Spanish</td>

-    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></td>
-    <td align=center valign=center><A HREF="mailto:guille@iies.es">Guillermo Rodriguez Garcia</A></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:guille@@iies.es">Guillermo Rodriguez Garcia</A>,
+                                   <a href="mailto:jsj666@@hotmail.com">JSJ</a></td>

 </tr>
 
 <tr>
     <td valign=center>Swedish</td>
 </tr>
 
 <tr>
     <td valign=center>Swedish</td>

-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
-    <td align=center valign=center><A HREF="mailto:jor@mindless.com">Jonas Rydberg</A>,
-                                   <A HREF="mailto:kgb@compart.fi">Kaj G Backas</A></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:jor@@mindless.com">Jonas Rydberg</A>,
+                                   <A HREF="mailto:kgb@@compart.fi">Kaj G Backas</A></td>

 </tr>
 
 <tr>
     <td valign=center>Turkish</td>
 </tr>
 
 <tr>
     <td valign=center>Turkish</td>

-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
-    <td align=center valign=center><A HREF="mailto:dogusanh@dynaset.org">Hakki Dogusan</A></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:dogusanh@@dynaset.org">Hakki Dogusan</A></td>

 </tr>
 
 <tr>
     <td valign=center>Ukrainian</td>
 </tr>
 
 <tr>
     <td valign=center>Ukrainian</td>

-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
-    <td align=center valign=center><A HREF="mailto:manko@salingshot.co.nz">Eugene Manko></td>
+    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><A HREF="mailto:manko@@salingshot.co.nz">Eugene Manko</td>

 </tr>
 
 
 </tr>
 
 

diff --git a/docs/latex/wx/radiobox.tex b/docs/latex/wx/radiobox.tex
index 8412c68033fc26a27d74573e55f9f6d23db86ae0..655d26c818ad621dbde275a999f098d0d51013d6 100644 (file)
--- a/docs/latex/wx/radiobox.tex
+++ b/docs/latex/wx/radiobox.tex
@@ -207,6 +207,16 @@ Returns the zero-based position of the selected button.
 
 Returns the selected string.
 
 
 Returns the selected string.
 

+\membersection{wxRadioBox::GetString}\label{wxradioboxgetstring}
+
+\constfunc{wxString}{GetString}{\param{int}{ n}}
+
+Returns the label for the button at the given position.
+
+\wxheading{Parameters}
+
+\docparam{n}{The zero-based button position.}
+

 \membersection{wxRadioBox::Number}\label{wxradioboxnumber}
 
 \constfunc{int}{Number}{\void}
 \membersection{wxRadioBox::Number}\label{wxradioboxnumber}
 
 \constfunc{int}{Number}{\void}


@@ -289,14 +299,3 @@ implements the following methods:\par
 \end{twocollist}}
 }
 
 \end{twocollist}}
 }
 

-\membersection{wxRadioBox::GetString}\label{wxradioboxgetstring}
-
-\constfunc{wxString}{GetString}{\param{int}{ n}}
-
-Returns the label for the button at the given position.
-
-\wxheading{Parameters}
-
-\docparam{n}{The zero-based button position.}
-
-

diff --git a/docs/readme.txt b/docs/readme.txt
index dcff679c43a10ee255997567f36d9522264adbaa..e0b8fccba2766a4989bbe1b9433273815a4ae49f 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -210,5 +210,5 @@ web site.
 
 Have fun!
 
 
 Have fun!
 

-The wxWindows Team, September 2003
+The wxWindows Team, February 2004

 
 

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 76a3e7a0abeec4be322fe8a054cb4c305194c77e..e4ca8641b59657603395eb3f4147b6eaf8571f20 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -580,5 +580,10 @@ typedef struct {
     #define WC_NO_BEST_FIT_CHARS 0x400
 #endif
 
     #define WC_NO_BEST_FIT_CHARS 0x400
 #endif
 

+// Not in WinCE
+#ifndef HGDI_ERROR
+#define HGDI_ERROR ((HANDLE)(0xFFFFFFFFL))
+#endif
+

 #endif
     // _WX_MISSING_H_
 #endif
     // _WX_MISSING_H_

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index f723f1bf994b918db69ef31a707846b91db183dd..b88fde9331956159c7689b279dbf6a747eefabdf 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -28,7 +28,7 @@
 // this is ugly but what else can we do? even testing for compiler version
 // wouldn't help as you can perfectly well be using an older compiler (VC6)
 // with newer SDK headers
 // this is ugly but what else can we do? even testing for compiler version
 // wouldn't help as you can perfectly well be using an older compiler (VC6)
 // with newer SDK headers

-#ifndef __WIN64__
+#if !defined(__WIN64__) && !defined(__WXWINCE__)

     #define UINT_PTR unsigned int
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
     #define UINT_PTR unsigned int
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long

diff --git a/include/wx/wave.h b/include/wx/wave.h
index 4a225db21ae10417850e54db05330253558fff0b..13c16f7670ec030a46a435610e7f27b20af85594 100644 (file)
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -17,8 +17,10 @@
 #if wxUSE_SOUND
 
 #if WXWIN_COMPATIBILITY_2_4
 #if wxUSE_SOUND
 
 #if WXWIN_COMPATIBILITY_2_4

-#ifdef __DMC__
+#if defined(__DMC__) || defined(__BORLANDC__)

     #pragma message "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
     #pragma message "wx/wave.h header is deprecated, use wx/sound.h and wxSound"

+#elif defined(__WATCOMC__)
+    #pragma message ("wx/wave.h header is deprecated, use wx/sound.h and wxSound")

 #else
     #warning "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
 #endif
 #else
     #warning "wx/wave.h header is deprecated, use wx/sound.h and wxSound"
 #endif

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 50c34424f455e2a52dc58a2dc072051342ca09a6..2441a6090455f2228a76d80142c5763a25fbb535 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -140,7 +140,7 @@ bool MyApp::OnInit()
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

-
+  

   file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
   file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW

diff --git a/samples/minimal/minimal.rc b/samples/minimal/minimal.rc
index 7655c62a4c3f71bc6ddb1499a59ec06d57cf29e2..b862bd2de880d12944d743077ff01cd31ccef810 100644 (file)
--- a/samples/minimal/minimal.rc
+++ b/samples/minimal/minimal.rc
@@ -1,3 +1,3 @@
-mondrian ICON "mondrian.ico"
+mondrian ICON "sample.ico"

 #include "wx/msw/wx.rc"
 
 #include "wx/msw/wx.rc"
 

diff --git a/samples/minimal/minimalCE.vcp b/samples/minimal/minimalCE.vcp
index c0d320b88bce60f43c124405e681ecd4a96af39a..3ec038a7fe6c0f98c38e751db38ab4399b372db7 100644 (file)
--- a/samples/minimal/minimalCE.vcp
+++ b/samples/minimal/minimalCE.vcp
@@ -52,21 +52,21 @@ CFG=minimalCE - Win32 (WCE ARM) Debug
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""

-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../include" /I "../../lib/wince_arm" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Oxs /M$(CECrtMT) /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo

 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # ADD LINK32 wxmswce_armu.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 LINK32=link.exe
 # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 # ADD LINK32 wxmswce_armu.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM

+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../include" /I "../../lib/wince_arm" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Oxs /M$(CECrtMT) /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Debug"
 
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Debug"
 


@@ -85,22 +85,22 @@ LINK32=link.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""

-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 wxmswce_armud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
 # ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../lib/wince_armd" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
 # ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../lib/wince_armd" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX

-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 wxmswce_armud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release"
 
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release"
 


@@ -292,8 +292,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 # ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 # ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /GX- /Zi /Od /I "../../lib/wince_emud" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "DEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /YX /Gs8192 /GF /c
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../lib/wince_emud" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "DEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /YX /Gs8192 /GF /c

 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32


@@ -327,20 +327,16 @@ SOURCE=.\minimal.cpp
 
 !IF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Release"
 
 
 !IF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Release"
 

-DEP_CPP_MINIM=\
-       ".\mondrian.xpm"\
-       

 NODEP_CPP_MINIM=\
 NODEP_CPP_MINIM=\

+       ".\mondrian.xpm"\

        ".\wx\wx.h"\
        ".\wx\wxprec.h"\
        
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Debug"
 
        ".\wx\wx.h"\
        ".\wx\wxprec.h"\
        
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE ARM) Debug"
 

-DEP_CPP_MINIM=\
-       ".\mondrian.xpm"\
-       

 NODEP_CPP_MINIM=\
 NODEP_CPP_MINIM=\

+       ".\mondrian.xpm"\

        ".\wx\wx.h"\
        ".\wx\wxprec.h"\
        
        ".\wx\wx.h"\
        ".\wx\wxprec.h"\
        


@@ -846,7 +842,6 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\

-       ".\mondrian.xpm"\

        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\generic\wx\setup.h"\
        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\generic\wx\setup.h"\


@@ -858,6 +853,7 @@ NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\generic\access.h"\
        "..\..\include\wx\wx\setup.h"\
        "..\..\include\wx\wx\tbarsmpl.h"\
        "..\..\include\wx\wx\generic\access.h"\
        "..\..\include\wx\wx\setup.h"\
        "..\..\include\wx\wx\tbarsmpl.h"\

+       ".\mondrian.xpm"\

        
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug"
        
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug"


@@ -906,6 +902,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\

+       "..\..\include\wx\cocoa\log.h"\

        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\
        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\


@@ -972,6 +969,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\

+       "..\..\include\wx\generic\numdlgg.h"\

        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\
        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\


@@ -1222,6 +1220,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\

+       "..\..\include\wx\numdlg.h"\

        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\
        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\


@@ -1362,7 +1361,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\
        "..\..\lib\wince_x86ud\wx\setup.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\
        "..\..\lib\wince_x86ud\wx\setup.h"\

-       ".\mondrian.xpm"\
+       "..\sample.xpm"\

        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\generic\access.h"\
        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\generic\access.h"\


@@ -1371,26 +1370,6 @@ NODEP_CPP_MINIM=\
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Release"
 
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Release"
 

-DEP_CPP_MINIM=\
-       ".\mondrian.xpm"\
-       
-NODEP_CPP_MINIM=\
-       ".\wx\wx.h"\
-       ".\wx\wxprec.h"\
-       
-
-!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug eVC4"
-
-DEP_CPP_MINIM=\
-       ".\mondrian.xpm"\
-       
-NODEP_CPP_MINIM=\
-       ".\wx\wx.h"\
-       ".\wx\wxprec.h"\
-       
-
-!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release eVC4"
-

 DEP_CPP_MINIM=\
        "..\..\include\wx\accel.h"\
        "..\..\include\wx\access.h"\
 DEP_CPP_MINIM=\
        "..\..\include\wx\accel.h"\
        "..\..\include\wx\access.h"\


@@ -1435,6 +1414,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\

+       "..\..\include\wx\cocoa\log.h"\

        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\
        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\


@@ -1501,6 +1481,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\

+       "..\..\include\wx\generic\numdlgg.h"\

        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\
        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\


@@ -1751,6 +1732,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\

+       "..\..\include\wx\numdlg.h"\

        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\
        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\


@@ -1890,7 +1872,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\

-       ".\mondrian.xpm"\
+       "..\sample.xpm"\

        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\generic\wx\setup.h"\
        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\generic\wx\setup.h"\


@@ -1904,7 +1886,7 @@ NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\tbarsmpl.h"\
        
 
        "..\..\include\wx\wx\tbarsmpl.h"\
        
 

-!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug eVC4"

 
 DEP_CPP_MINIM=\
        "..\..\include\wx\accel.h"\
 
 DEP_CPP_MINIM=\
        "..\..\include\wx\accel.h"\


@@ -1950,6 +1932,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\
        "..\..\include\wx\cocoa\gdiobj.h"\
        "..\..\include\wx\cocoa\icon.h"\
        "..\..\include\wx\cocoa\listbox.h"\

+       "..\..\include\wx\cocoa\log.h"\

        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\
        "..\..\include\wx\cocoa\mdi.h"\
        "..\..\include\wx\cocoa\menu.h"\
        "..\..\include\wx\cocoa\menuitem.h"\


@@ -2016,6 +1999,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\
        "..\..\include\wx\generic\mdig.h"\
        "..\..\include\wx\generic\msgdlgg.h"\
        "..\..\include\wx\generic\notebook.h"\

+       "..\..\include\wx\generic\numdlgg.h"\

        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\
        "..\..\include\wx\generic\paletteg.h"\
        "..\..\include\wx\generic\panelg.h"\
        "..\..\include\wx\generic\scrolwin.h"\


@@ -2266,6 +2250,7 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\
        "..\..\include\wx\msw\winundef.h"\
        "..\..\include\wx\msw\wrapwin.h"\
        "..\..\include\wx\notebook.h"\

+       "..\..\include\wx\numdlg.h"\

        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\
        "..\..\include\wx\object.h"\
        "..\..\include\wx\os2\accel.h"\
        "..\..\include\wx\os2\app.h"\


@@ -2405,14 +2390,1038 @@ DEP_CPP_MINIM=\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\
        "..\..\include\wx\x11\toplevel.h"\
        "..\..\include\wx\x11\window.h"\
        "..\..\include\wx\xti.h"\

-       "..\..\lib\wince_emud\wx\setup.h"\
-       ".\mondrian.xpm"\
+       "..\..\lib\wince_x86ud\wx\setup.h"\
+       "..\sample.xpm"\

        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\generic\access.h"\
        "..\..\include\wx\wx\tbarsmpl.h"\
        
 
        
 NODEP_CPP_MINIM=\
        "..\..\include\wx\wx\generic\access.h"\
        "..\..\include\wx\wx\tbarsmpl.h"\
        
 

+!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release eVC4"
+
+DEP_CPP_MINIM=\
+       "..\..\include\wx\accel.h"\
+       "..\..\include\wx\access.h"\
+       "..\..\include\wx\afterstd.h"\
+       "..\..\include\wx\app.h"\
+       "..\..\include\wx\arrstr.h"\
+       "..\..\include\wx\beforestd.h"\
+       "..\..\include\wx\bitmap.h"\
+       "..\..\include\wx\bmpbuttn.h"\
+       "..\..\include\wx\bookctrl.h"\
+       "..\..\include\wx\brush.h"\
+       "..\..\include\wx\buffer.h"\
+       "..\..\include\wx\build.h"\
+       "..\..\include\wx\button.h"\
+       "..\..\include\wx\checkbox.h"\
+       "..\..\include\wx\checklst.h"\
+       "..\..\include\wx\chkconf.h"\
+       "..\..\include\wx\choicdlg.h"\
+       "..\..\include\wx\choice.h"\
+       "..\..\include\wx\clntdata.h"\
+       "..\..\include\wx\cmndata.h"\
+       "..\..\include\wx\cocoa\app.h"\
+       "..\..\include\wx\cocoa\bitmap.h"\
+       "..\..\include\wx\cocoa\bmpbuttn.h"\
+       "..\..\include\wx\cocoa\brush.h"\
+       "..\..\include\wx\cocoa\button.h"\
+       "..\..\include\wx\cocoa\checkbox.h"\
+       "..\..\include\wx\cocoa\checklst.h"\
+       "..\..\include\wx\cocoa\choice.h"\
+       "..\..\include\wx\cocoa\colour.h"\
+       "..\..\include\wx\cocoa\combobox.h"\
+       "..\..\include\wx\cocoa\control.h"\
+       "..\..\include\wx\cocoa\cursor.h"\
+       "..\..\include\wx\cocoa\dc.h"\
+       "..\..\include\wx\cocoa\dcclient.h"\
+       "..\..\include\wx\cocoa\dcmemory.h"\
+       "..\..\include\wx\cocoa\dcscreen.h"\
+       "..\..\include\wx\cocoa\dialog.h"\
+       "..\..\include\wx\cocoa\font.h"\
+       "..\..\include\wx\cocoa\frame.h"\
+       "..\..\include\wx\cocoa\gauge.h"\
+       "..\..\include\wx\cocoa\gdiobj.h"\
+       "..\..\include\wx\cocoa\icon.h"\
+       "..\..\include\wx\cocoa\listbox.h"\
+       "..\..\include\wx\cocoa\mdi.h"\
+       "..\..\include\wx\cocoa\menu.h"\
+       "..\..\include\wx\cocoa\menuitem.h"\
+       "..\..\include\wx\cocoa\NSBox.h"\
+       "..\..\include\wx\cocoa\NSButton.h"\
+       "..\..\include\wx\cocoa\NSControl.h"\
+       "..\..\include\wx\cocoa\NSMenu.h"\
+       "..\..\include\wx\cocoa\NSPanel.h"\
+       "..\..\include\wx\cocoa\NSTableView.h"\
+       "..\..\include\wx\cocoa\NSTextField.h"\
+       "..\..\include\wx\cocoa\NSView.h"\
+       "..\..\include\wx\cocoa\NSWindow.h"\
+       "..\..\include\wx\cocoa\ObjcAssociate.h"\
+       "..\..\include\wx\cocoa\pen.h"\
+       "..\..\include\wx\cocoa\radiobox.h"\
+       "..\..\include\wx\cocoa\radiobut.h"\
+       "..\..\include\wx\cocoa\region.h"\
+       "..\..\include\wx\cocoa\slider.h"\
+       "..\..\include\wx\cocoa\statbmp.h"\
+       "..\..\include\wx\cocoa\statbox.h"\
+       "..\..\include\wx\cocoa\stattext.h"\
+       "..\..\include\wx\cocoa\textctrl.h"\
+       "..\..\include\wx\cocoa\toolbar.h"\
+       "..\..\include\wx\cocoa\toplevel.h"\
+       "..\..\include\wx\cocoa\window.h"\
+       "..\..\include\wx\colour.h"\
+       "..\..\include\wx\combobox.h"\
+       "..\..\include\wx\containr.h"\
+       "..\..\include\wx\control.h"\
+       "..\..\include\wx\ctrlsub.h"\
+       "..\..\include\wx\cursor.h"\
+       "..\..\include\wx\datetime.h"\
+       "..\..\include\wx\db.h"\
+       "..\..\include\wx\dc.h"\
+       "..\..\include\wx\dcclient.h"\
+       "..\..\include\wx\dcmemory.h"\
+       "..\..\include\wx\dcprint.h"\
+       "..\..\include\wx\dcscreen.h"\
+       "..\..\include\wx\debug.h"\
+       "..\..\include\wx\defs.h"\
+       "..\..\include\wx\dialog.h"\
+       "..\..\include\wx\dirdlg.h"\
+       "..\..\include\wx\dlimpexp.h"\
+       "..\..\include\wx\dynarray.h"\
+       "..\..\include\wx\encinfo.h"\
+       "..\..\include\wx\event.h"\
+       "..\..\include\wx\features.h"\
+       "..\..\include\wx\filedlg.h"\
+       "..\..\include\wx\filefn.h"\
+       "..\..\include\wx\flags.h"\
+       "..\..\include\wx\font.h"\
+       "..\..\include\wx\fontenc.h"\
+       "..\..\include\wx\frame.h"\
+       "..\..\include\wx\gauge.h"\
+       "..\..\include\wx\gdicmn.h"\
+       "..\..\include\wx\gdiobj.h"\
+       "..\..\include\wx\generic\accel.h"\
+       "..\..\include\wx\generic\choicdgg.h"\
+       "..\..\include\wx\generic\dirdlgg.h"\
+       "..\..\include\wx\generic\filedlgg.h"\
+       "..\..\include\wx\generic\imaglist.h"\
+       "..\..\include\wx\generic\listctrl.h"\
+       "..\..\include\wx\generic\logg.h"\
+       "..\..\include\wx\generic\mdig.h"\
+       "..\..\include\wx\generic\msgdlgg.h"\
+       "..\..\include\wx\generic\notebook.h"\
+       "..\..\include\wx\generic\paletteg.h"\
+       "..\..\include\wx\generic\panelg.h"\
+       "..\..\include\wx\generic\scrolwin.h"\
+       "..\..\include\wx\generic\statusbr.h"\
+       "..\..\include\wx\generic\textdlgg.h"\
+       "..\..\include\wx\generic\timer.h"\
+       "..\..\include\wx\gtk\accel.h"\
+       "..\..\include\wx\gtk\app.h"\
+       "..\..\include\wx\gtk\bitmap.h"\
+       "..\..\include\wx\gtk\bmpbuttn.h"\
+       "..\..\include\wx\gtk\brush.h"\
+       "..\..\include\wx\gtk\button.h"\
+       "..\..\include\wx\gtk\checkbox.h"\
+       "..\..\include\wx\gtk\checklst.h"\
+       "..\..\include\wx\gtk\choice.h"\
+       "..\..\include\wx\gtk\colour.h"\
+       "..\..\include\wx\gtk\combobox.h"\
+       "..\..\include\wx\gtk\control.h"\
+       "..\..\include\wx\gtk\cursor.h"\
+       "..\..\include\wx\gtk\dc.h"\
+       "..\..\include\wx\gtk\dcclient.h"\
+       "..\..\include\wx\gtk\dcmemory.h"\
+       "..\..\include\wx\gtk\dcscreen.h"\
+       "..\..\include\wx\gtk\dialog.h"\
+       "..\..\include\wx\gtk\font.h"\
+       "..\..\include\wx\gtk\frame.h"\
+       "..\..\include\wx\gtk\gauge.h"\
+       "..\..\include\wx\gtk\gdiobj.h"\
+       "..\..\include\wx\gtk\icon.h"\
+       "..\..\include\wx\gtk\listbox.h"\
+       "..\..\include\wx\gtk\mdi.h"\
+       "..\..\include\wx\gtk\menu.h"\
+       "..\..\include\wx\gtk\menuitem.h"\
+       "..\..\include\wx\gtk\msgdlg.h"\
+       "..\..\include\wx\gtk\notebook.h"\
+       "..\..\include\wx\gtk\pen.h"\
+       "..\..\include\wx\gtk\radiobox.h"\
+       "..\..\include\wx\gtk\radiobut.h"\
+       "..\..\include\wx\gtk\region.h"\
+       "..\..\include\wx\gtk\scrolbar.h"\
+       "..\..\include\wx\gtk\scrolwin.h"\
+       "..\..\include\wx\gtk\slider.h"\
+       "..\..\include\wx\gtk\statbmp.h"\
+       "..\..\include\wx\gtk\statbox.h"\
+       "..\..\include\wx\gtk\stattext.h"\
+       "..\..\include\wx\gtk\tbargtk.h"\
+       "..\..\include\wx\gtk\textctrl.h"\
+       "..\..\include\wx\gtk\timer.h"\
+       "..\..\include\wx\gtk\toplevel.h"\
+       "..\..\include\wx\gtk\window.h"\
+       "..\..\include\wx\hash.h"\
+       "..\..\include\wx\hashmap.h"\
+       "..\..\include\wx\icon.h"\
+       "..\..\include\wx\iconbndl.h"\
+       "..\..\include\wx\iconloc.h"\
+       "..\..\include\wx\imagbmp.h"\
+       "..\..\include\wx\image.h"\
+       "..\..\include\wx\imaggif.h"\
+       "..\..\include\wx\imagiff.h"\
+       "..\..\include\wx\imagjpeg.h"\
+       "..\..\include\wx\imagpcx.h"\
+       "..\..\include\wx\imagpng.h"\
+       "..\..\include\wx\imagpnm.h"\
+       "..\..\include\wx\imagtiff.h"\
+       "..\..\include\wx\imagxpm.h"\
+       "..\..\include\wx\init.h"\
+       "..\..\include\wx\intl.h"\
+       "..\..\include\wx\iosfwrap.h"\
+       "..\..\include\wx\ioswrap.h"\
+       "..\..\include\wx\isql.h"\
+       "..\..\include\wx\isqlext.h"\
+       "..\..\include\wx\layout.h"\
+       "..\..\include\wx\list.h"\
+       "..\..\include\wx\listbase.h"\
+       "..\..\include\wx\listbox.h"\
+       "..\..\include\wx\listctrl.h"\
+       "..\..\include\wx\log.h"\
+       "..\..\include\wx\longlong.h"\
+       "..\..\include\wx\mac\accel.h"\
+       "..\..\include\wx\mac\app.h"\
+       "..\..\include\wx\mac\bitmap.h"\
+       "..\..\include\wx\mac\bmpbuttn.h"\
+       "..\..\include\wx\mac\brush.h"\
+       "..\..\include\wx\mac\button.h"\
+       "..\..\include\wx\mac\checkbox.h"\
+       "..\..\include\wx\mac\checklst.h"\
+       "..\..\include\wx\mac\chkconf.h"\
+       "..\..\include\wx\mac\choice.h"\
+       "..\..\include\wx\mac\colour.h"\
+       "..\..\include\wx\mac\combobox.h"\
+       "..\..\include\wx\mac\control.h"\
+       "..\..\include\wx\mac\cursor.h"\
+       "..\..\include\wx\mac\dc.h"\
+       "..\..\include\wx\mac\dcclient.h"\
+       "..\..\include\wx\mac\dcmemory.h"\
+       "..\..\include\wx\mac\dcprint.h"\
+       "..\..\include\wx\mac\dcscreen.h"\
+       "..\..\include\wx\mac\dialog.h"\
+       "..\..\include\wx\mac\dirdlg.h"\
+       "..\..\include\wx\mac\filedlg.h"\
+       "..\..\include\wx\mac\font.h"\
+       "..\..\include\wx\mac\frame.h"\
+       "..\..\include\wx\mac\gauge.h"\
+       "..\..\include\wx\mac\gdiobj.h"\
+       "..\..\include\wx\mac\icon.h"\
+       "..\..\include\wx\mac\listbox.h"\
+       "..\..\include\wx\mac\macnotfy.h"\
+       "..\..\include\wx\mac\mdi.h"\
+       "..\..\include\wx\mac\menu.h"\
+       "..\..\include\wx\mac\menuitem.h"\
+       "..\..\include\wx\mac\msgdlg.h"\
+       "..\..\include\wx\mac\notebook.h"\
+       "..\..\include\wx\mac\palette.h"\
+       "..\..\include\wx\mac\pen.h"\
+       "..\..\include\wx\mac\radiobox.h"\
+       "..\..\include\wx\mac\radiobut.h"\
+       "..\..\include\wx\mac\region.h"\
+       "..\..\include\wx\mac\scrolbar.h"\
+       "..\..\include\wx\mac\slider.h"\
+       "..\..\include\wx\mac\statbmp.h"\
+       "..\..\include\wx\mac\statbox.h"\
+       "..\..\include\wx\mac\stattext.h"\
+       "..\..\include\wx\mac\statusbr.h"\
+       "..\..\include\wx\mac\textctrl.h"\
+       "..\..\include\wx\mac\timer.h"\
+       "..\..\include\wx\mac\toolbar.h"\
+       "..\..\include\wx\mac\toplevel.h"\
+       "..\..\include\wx\mac\window.h"\
+       "..\..\include\wx\mdi.h"\
+       "..\..\include\wx\memory.h"\
+       "..\..\include\wx\menu.h"\
+       "..\..\include\wx\menuitem.h"\
+       "..\..\include\wx\mgl\app.h"\
+       "..\..\include\wx\mgl\bitmap.h"\
+       "..\..\include\wx\mgl\brush.h"\
+       "..\..\include\wx\mgl\colour.h"\
+       "..\..\include\wx\mgl\cursor.h"\
+       "..\..\include\wx\mgl\dc.h"\
+       "..\..\include\wx\mgl\dcclient.h"\
+       "..\..\include\wx\mgl\dcmemory.h"\
+       "..\..\include\wx\mgl\dcscreen.h"\
+       "..\..\include\wx\mgl\font.h"\
+       "..\..\include\wx\mgl\gdiobj.h"\
+       "..\..\include\wx\mgl\icon.h"\
+       "..\..\include\wx\mgl\palette.h"\
+       "..\..\include\wx\mgl\pen.h"\
+       "..\..\include\wx\mgl\region.h"\
+       "..\..\include\wx\mgl\toplevel.h"\
+       "..\..\include\wx\mgl\window.h"\
+       "..\..\include\wx\motif\accel.h"\
+       "..\..\include\wx\motif\app.h"\
+       "..\..\include\wx\motif\bmpbuttn.h"\
+       "..\..\include\wx\motif\bmpmotif.h"\
+       "..\..\include\wx\motif\button.h"\
+       "..\..\include\wx\motif\checkbox.h"\
+       "..\..\include\wx\motif\checklst.h"\
+       "..\..\include\wx\motif\choice.h"\
+       "..\..\include\wx\motif\colour.h"\
+       "..\..\include\wx\motif\combobox.h"\
+       "..\..\include\wx\motif\control.h"\
+       "..\..\include\wx\motif\cursor.h"\
+       "..\..\include\wx\motif\dc.h"\
+       "..\..\include\wx\motif\dcclient.h"\
+       "..\..\include\wx\motif\dcmemory.h"\
+       "..\..\include\wx\motif\dcscreen.h"\
+       "..\..\include\wx\motif\dialog.h"\
+       "..\..\include\wx\motif\filedlg.h"\
+       "..\..\include\wx\motif\font.h"\
+       "..\..\include\wx\motif\frame.h"\
+       "..\..\include\wx\motif\gauge.h"\
+       "..\..\include\wx\motif\gdiobj.h"\
+       "..\..\include\wx\motif\icon.h"\
+       "..\..\include\wx\motif\listbox.h"\
+       "..\..\include\wx\motif\mdi.h"\
+       "..\..\include\wx\motif\menu.h"\
+       "..\..\include\wx\motif\menuitem.h"\
+       "..\..\include\wx\motif\msgdlg.h"\
+       "..\..\include\wx\motif\palette.h"\
+       "..\..\include\wx\motif\radiobox.h"\
+       "..\..\include\wx\motif\radiobut.h"\
+       "..\..\include\wx\motif\scrolbar.h"\
+       "..\..\include\wx\motif\slider.h"\
+       "..\..\include\wx\motif\statbmp.h"\
+       "..\..\include\wx\motif\statbox.h"\
+       "..\..\include\wx\motif\stattext.h"\
+       "..\..\include\wx\motif\textctrl.h"\
+       "..\..\include\wx\motif\timer.h"\
+       "..\..\include\wx\motif\toolbar.h"\
+       "..\..\include\wx\motif\toplevel.h"\
+       "..\..\include\wx\motif\window.h"\
+       "..\..\include\wx\msgdlg.h"\
+       "..\..\include\wx\msw\accel.h"\
+       "..\..\include\wx\msw\app.h"\
+       "..\..\include\wx\msw\bitmap.h"\
+       "..\..\include\wx\msw\bmpbuttn.h"\
+       "..\..\include\wx\msw\brush.h"\
+       "..\..\include\wx\msw\button.h"\
+       "..\..\include\wx\msw\checkbox.h"\
+       "..\..\include\wx\msw\checklst.h"\
+       "..\..\include\wx\msw\chkconf.h"\
+       "..\..\include\wx\msw\choice.h"\
+       "..\..\include\wx\msw\colour.h"\
+       "..\..\include\wx\msw\combobox.h"\
+       "..\..\include\wx\msw\control.h"\
+       "..\..\include\wx\msw\cursor.h"\
+       "..\..\include\wx\msw\dc.h"\
+       "..\..\include\wx\msw\dcclient.h"\
+       "..\..\include\wx\msw\dcmemory.h"\
+       "..\..\include\wx\msw\dcprint.h"\
+       "..\..\include\wx\msw\dcscreen.h"\
+       "..\..\include\wx\msw\dialog.h"\
+       "..\..\include\wx\msw\dirdlg.h"\
+       "..\..\include\wx\msw\filedlg.h"\
+       "..\..\include\wx\msw\font.h"\
+       "..\..\include\wx\msw\frame.h"\
+       "..\..\include\wx\msw\gauge95.h"\
+       "..\..\include\wx\msw\gccpriv.h"\
+       "..\..\include\wx\msw\gdiimage.h"\
+       "..\..\include\wx\msw\gdiobj.h"\
+       "..\..\include\wx\msw\icon.h"\
+       "..\..\include\wx\msw\listbox.h"\
+       "..\..\include\wx\msw\listctrl.h"\
+       "..\..\include\wx\msw\mdi.h"\
+       "..\..\include\wx\msw\menu.h"\
+       "..\..\include\wx\msw\menuitem.h"\
+       "..\..\include\wx\msw\msgdlg.h"\
+       "..\..\include\wx\msw\notebook.h"\
+       "..\..\include\wx\msw\ole\access.h"\
+       "..\..\include\wx\msw\palette.h"\
+       "..\..\include\wx\msw\pen.h"\
+       "..\..\include\wx\msw\radiobox.h"\
+       "..\..\include\wx\msw\radiobut.h"\
+       "..\..\include\wx\msw\region.h"\
+       "..\..\include\wx\msw\scrolbar.h"\
+       "..\..\include\wx\msw\slider95.h"\
+       "..\..\include\wx\msw\statbmp.h"\
+       "..\..\include\wx\msw\statbox.h"\
+       "..\..\include\wx\msw\statbr95.h"\
+       "..\..\include\wx\msw\stattext.h"\
+       "..\..\include\wx\msw\tbar95.h"\
+       "..\..\include\wx\msw\tbarmsw.h"\
+       "..\..\include\wx\msw\textctrl.h"\
+       "..\..\include\wx\msw\timer.h"\
+       "..\..\include\wx\msw\toplevel.h"\
+       "..\..\include\wx\msw\wince\tbarwce.h"\
+       "..\..\include\wx\msw\wince\time.h"\
+       "..\..\include\wx\msw\window.h"\
+       "..\..\include\wx\msw\winundef.h"\
+       "..\..\include\wx\msw\wrapwin.h"\
+       "..\..\include\wx\notebook.h"\
+       "..\..\include\wx\object.h"\
+       "..\..\include\wx\os2\accel.h"\
+       "..\..\include\wx\os2\app.h"\
+       "..\..\include\wx\os2\bitmap.h"\
+       "..\..\include\wx\os2\bmpbuttn.h"\
+       "..\..\include\wx\os2\brush.h"\
+       "..\..\include\wx\os2\button.h"\
+       "..\..\include\wx\os2\checkbox.h"\
+       "..\..\include\wx\os2\checklst.h"\
+       "..\..\include\wx\os2\choice.h"\
+       "..\..\include\wx\os2\colour.h"\
+       "..\..\include\wx\os2\combobox.h"\
+       "..\..\include\wx\os2\control.h"\
+       "..\..\include\wx\os2\cursor.h"\
+       "..\..\include\wx\os2\dc.h"\
+       "..\..\include\wx\os2\dcclient.h"\
+       "..\..\include\wx\os2\dcmemory.h"\
+       "..\..\include\wx\os2\dcprint.h"\
+       "..\..\include\wx\os2\dcscreen.h"\
+       "..\..\include\wx\os2\dialog.h"\
+       "..\..\include\wx\os2\filedlg.h"\
+       "..\..\include\wx\os2\font.h"\
+       "..\..\include\wx\os2\frame.h"\
+       "..\..\include\wx\os2\gauge.h"\
+       "..\..\include\wx\os2\gdiimage.h"\
+       "..\..\include\wx\os2\gdiobj.h"\
+       "..\..\include\wx\os2\icon.h"\
+       "..\..\include\wx\os2\listbox.h"\
+       "..\..\include\wx\os2\menu.h"\
+       "..\..\include\wx\os2\menuitem.h"\
+       "..\..\include\wx\os2\msgdlg.h"\
+       "..\..\include\wx\os2\notebook.h"\
+       "..\..\include\wx\os2\palette.h"\
+       "..\..\include\wx\os2\pen.h"\
+       "..\..\include\wx\os2\private.h"\
+       "..\..\include\wx\os2\radiobox.h"\
+       "..\..\include\wx\os2\radiobut.h"\
+       "..\..\include\wx\os2\region.h"\
+       "..\..\include\wx\os2\scrolbar.h"\
+       "..\..\include\wx\os2\slider.h"\
+       "..\..\include\wx\os2\statbmp.h"\
+       "..\..\include\wx\os2\statbox.h"\
+       "..\..\include\wx\os2\stattext.h"\
+       "..\..\include\wx\os2\textctrl.h"\
+       "..\..\include\wx\os2\timer.h"\
+       "..\..\include\wx\os2\toolbar.h"\
+       "..\..\include\wx\os2\toplevel.h"\
+       "..\..\include\wx\os2\window.h"\
+       "..\..\include\wx\os2\wxrsc.h"\
+       "..\..\include\wx\ownerdrw.h"\
+       "..\..\include\wx\palette.h"\
+       "..\..\include\wx\panel.h"\
+       "..\..\include\wx\pen.h"\
+       "..\..\include\wx\platform.h"\
+       "..\..\include\wx\radiobox.h"\
+       "..\..\include\wx\radiobut.h"\
+       "..\..\include\wx\region.h"\
+       "..\..\include\wx\renderer.h"\
+       "..\..\include\wx\scrolbar.h"\
+       "..\..\include\wx\scrolwin.h"\
+       "..\..\include\wx\settings.h"\
+       "..\..\include\wx\sizer.h"\
+       "..\..\include\wx\slider.h"\
+       "..\..\include\wx\statbmp.h"\
+       "..\..\include\wx\statbox.h"\
+       "..\..\include\wx\stattext.h"\
+       "..\..\include\wx\statusbr.h"\
+       "..\..\include\wx\stopwatch.h"\
+       "..\..\include\wx\strconv.h"\
+       "..\..\include\wx\stream.h"\
+       "..\..\include\wx\string.h"\
+       "..\..\include\wx\tbarbase.h"\
+       "..\..\include\wx\textctrl.h"\
+       "..\..\include\wx\textdlg.h"\
+       "..\..\include\wx\thread.h"\
+       "..\..\include\wx\timer.h"\
+       "..\..\include\wx\toolbar.h"\
+       "..\..\include\wx\toplevel.h"\
+       "..\..\include\wx\univ\bmpbuttn.h"\
+       "..\..\include\wx\univ\button.h"\
+       "..\..\include\wx\univ\checkbox.h"\
+       "..\..\include\wx\univ\checklst.h"\
+       "..\..\include\wx\univ\choice.h"\
+       "..\..\include\wx\univ\combobox.h"\
+       "..\..\include\wx\univ\control.h"\
+       "..\..\include\wx\univ\dialog.h"\
+       "..\..\include\wx\univ\frame.h"\
+       "..\..\include\wx\univ\gauge.h"\
+       "..\..\include\wx\univ\inpcons.h"\
+       "..\..\include\wx\univ\inphand.h"\
+       "..\..\include\wx\univ\listbox.h"\
+       "..\..\include\wx\univ\menu.h"\
+       "..\..\include\wx\univ\menuitem.h"\
+       "..\..\include\wx\univ\notebook.h"\
+       "..\..\include\wx\univ\radiobox.h"\
+       "..\..\include\wx\univ\radiobut.h"\
+       "..\..\include\wx\univ\scrarrow.h"\
+       "..\..\include\wx\univ\scrolbar.h"\
+       "..\..\include\wx\univ\scrthumb.h"\
+       "..\..\include\wx\univ\slider.h"\
+       "..\..\include\wx\univ\statbmp.h"\
+       "..\..\include\wx\univ\statbox.h"\
+       "..\..\include\wx\univ\stattext.h"\
+       "..\..\include\wx\univ\statusbr.h"\
+       "..\..\include\wx\univ\textctrl.h"\
+       "..\..\include\wx\univ\theme.h"\
+       "..\..\include\wx\univ\toolbar.h"\
+       "..\..\include\wx\univ\toplevel.h"\
+       "..\..\include\wx\univ\window.h"\
+       "..\..\include\wx\utils.h"\
+       "..\..\include\wx\validate.h"\
+       "..\..\include\wx\valtext.h"\
+       "..\..\include\wx\variant.h"\
+       "..\..\include\wx\vector.h"\
+       "..\..\include\wx\version.h"\
+       "..\..\include\wx\vidmode.h"\
+       "..\..\include\wx\window.h"\
+       "..\..\include\wx\wx.h"\
+       "..\..\include\wx\wxchar.h"\
+       "..\..\include\wx\wxprec.h"\
+       "..\..\include\wx\x11\app.h"\
+       "..\..\include\wx\x11\bitmap.h"\
+       "..\..\include\wx\x11\brush.h"\
+       "..\..\include\wx\x11\colour.h"\
+       "..\..\include\wx\x11\cursor.h"\
+       "..\..\include\wx\x11\dc.h"\
+       "..\..\include\wx\x11\dcclient.h"\
+       "..\..\include\wx\x11\dcmemory.h"\
+       "..\..\include\wx\x11\dcscreen.h"\
+       "..\..\include\wx\x11\font.h"\
+       "..\..\include\wx\x11\gdiobj.h"\
+       "..\..\include\wx\x11\icon.h"\
+       "..\..\include\wx\x11\palette.h"\
+       "..\..\include\wx\x11\pen.h"\
+       "..\..\include\wx\x11\region.h"\
+       "..\..\include\wx\x11\textctrl.h"\
+       "..\..\include\wx\x11\toplevel.h"\
+       "..\..\include\wx\x11\window.h"\
+       "..\..\include\wx\xti.h"\
+       
+NODEP_CPP_MINIM=\
+       "..\..\include\wx\generic\wx\setup.h"\
+       "..\..\include\wx\gtk\wx\setup.h"\
+       "..\..\include\wx\mac\wx\setup.h"\
+       "..\..\include\wx\motif\wx\setup.h"\
+       "..\..\include\wx\msw\wx\setup.h"\
+       "..\..\include\wx\os2\wx\setup.h"\
+       "..\..\include\wx\wx\generic\access.h"\
+       "..\..\include\wx\wx\setup.h"\
+       "..\..\include\wx\wx\tbarsmpl.h"\
+       ".\mondrian.xpm"\
+       
+
+!ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Debug"
+
+DEP_CPP_MINIM=\
+       "..\..\include\wx\accel.h"\
+       "..\..\include\wx\access.h"\
+       "..\..\include\wx\afterstd.h"\
+       "..\..\include\wx\app.h"\
+       "..\..\include\wx\arrstr.h"\
+       "..\..\include\wx\beforestd.h"\
+       "..\..\include\wx\bitmap.h"\
+       "..\..\include\wx\bmpbuttn.h"\
+       "..\..\include\wx\bookctrl.h"\
+       "..\..\include\wx\brush.h"\
+       "..\..\include\wx\buffer.h"\
+       "..\..\include\wx\build.h"\
+       "..\..\include\wx\button.h"\
+       "..\..\include\wx\checkbox.h"\
+       "..\..\include\wx\checklst.h"\
+       "..\..\include\wx\chkconf.h"\
+       "..\..\include\wx\choicdlg.h"\
+       "..\..\include\wx\choice.h"\
+       "..\..\include\wx\clntdata.h"\
+       "..\..\include\wx\cmndata.h"\
+       "..\..\include\wx\cocoa\app.h"\
+       "..\..\include\wx\cocoa\bitmap.h"\
+       "..\..\include\wx\cocoa\bmpbuttn.h"\
+       "..\..\include\wx\cocoa\brush.h"\
+       "..\..\include\wx\cocoa\button.h"\
+       "..\..\include\wx\cocoa\checkbox.h"\
+       "..\..\include\wx\cocoa\checklst.h"\
+       "..\..\include\wx\cocoa\choice.h"\
+       "..\..\include\wx\cocoa\colour.h"\
+       "..\..\include\wx\cocoa\combobox.h"\
+       "..\..\include\wx\cocoa\control.h"\
+       "..\..\include\wx\cocoa\cursor.h"\
+       "..\..\include\wx\cocoa\dc.h"\
+       "..\..\include\wx\cocoa\dcclient.h"\
+       "..\..\include\wx\cocoa\dcmemory.h"\
+       "..\..\include\wx\cocoa\dcscreen.h"\
+       "..\..\include\wx\cocoa\dialog.h"\
+       "..\..\include\wx\cocoa\font.h"\
+       "..\..\include\wx\cocoa\frame.h"\
+       "..\..\include\wx\cocoa\gauge.h"\
+       "..\..\include\wx\cocoa\gdiobj.h"\
+       "..\..\include\wx\cocoa\icon.h"\
+       "..\..\include\wx\cocoa\listbox.h"\
+       "..\..\include\wx\cocoa\mdi.h"\
+       "..\..\include\wx\cocoa\menu.h"\
+       "..\..\include\wx\cocoa\menuitem.h"\
+       "..\..\include\wx\cocoa\NSBox.h"\
+       "..\..\include\wx\cocoa\NSButton.h"\
+       "..\..\include\wx\cocoa\NSControl.h"\
+       "..\..\include\wx\cocoa\NSMenu.h"\
+       "..\..\include\wx\cocoa\NSPanel.h"\
+       "..\..\include\wx\cocoa\NSTableView.h"\
+       "..\..\include\wx\cocoa\NSTextField.h"\
+       "..\..\include\wx\cocoa\NSView.h"\
+       "..\..\include\wx\cocoa\NSWindow.h"\
+       "..\..\include\wx\cocoa\ObjcAssociate.h"\
+       "..\..\include\wx\cocoa\pen.h"\
+       "..\..\include\wx\cocoa\radiobox.h"\
+       "..\..\include\wx\cocoa\radiobut.h"\
+       "..\..\include\wx\cocoa\region.h"\
+       "..\..\include\wx\cocoa\slider.h"\
+       "..\..\include\wx\cocoa\statbmp.h"\
+       "..\..\include\wx\cocoa\statbox.h"\
+       "..\..\include\wx\cocoa\stattext.h"\
+       "..\..\include\wx\cocoa\textctrl.h"\
+       "..\..\include\wx\cocoa\toolbar.h"\
+       "..\..\include\wx\cocoa\toplevel.h"\
+       "..\..\include\wx\cocoa\window.h"\
+       "..\..\include\wx\colour.h"\
+       "..\..\include\wx\combobox.h"\
+       "..\..\include\wx\containr.h"\
+       "..\..\include\wx\control.h"\
+       "..\..\include\wx\ctrlsub.h"\
+       "..\..\include\wx\cursor.h"\
+       "..\..\include\wx\datetime.h"\
+       "..\..\include\wx\db.h"\
+       "..\..\include\wx\dc.h"\
+       "..\..\include\wx\dcclient.h"\
+       "..\..\include\wx\dcmemory.h"\
+       "..\..\include\wx\dcprint.h"\
+       "..\..\include\wx\dcscreen.h"\
+       "..\..\include\wx\debug.h"\
+       "..\..\include\wx\defs.h"\
+       "..\..\include\wx\dialog.h"\
+       "..\..\include\wx\dirdlg.h"\
+       "..\..\include\wx\dlimpexp.h"\
+       "..\..\include\wx\dynarray.h"\
+       "..\..\include\wx\encinfo.h"\
+       "..\..\include\wx\event.h"\
+       "..\..\include\wx\features.h"\
+       "..\..\include\wx\filedlg.h"\
+       "..\..\include\wx\filefn.h"\
+       "..\..\include\wx\flags.h"\
+       "..\..\include\wx\font.h"\
+       "..\..\include\wx\fontenc.h"\
+       "..\..\include\wx\frame.h"\
+       "..\..\include\wx\gauge.h"\
+       "..\..\include\wx\gdicmn.h"\
+       "..\..\include\wx\gdiobj.h"\
+       "..\..\include\wx\generic\accel.h"\
+       "..\..\include\wx\generic\choicdgg.h"\
+       "..\..\include\wx\generic\dirdlgg.h"\
+       "..\..\include\wx\generic\filedlgg.h"\
+       "..\..\include\wx\generic\imaglist.h"\
+       "..\..\include\wx\generic\listctrl.h"\
+       "..\..\include\wx\generic\logg.h"\
+       "..\..\include\wx\generic\mdig.h"\
+       "..\..\include\wx\generic\msgdlgg.h"\
+       "..\..\include\wx\generic\notebook.h"\
+       "..\..\include\wx\generic\paletteg.h"\
+       "..\..\include\wx\generic\panelg.h"\
+       "..\..\include\wx\generic\scrolwin.h"\
+       "..\..\include\wx\generic\statusbr.h"\
+       "..\..\include\wx\generic\textdlgg.h"\
+       "..\..\include\wx\generic\timer.h"\
+       "..\..\include\wx\gtk\accel.h"\
+       "..\..\include\wx\gtk\app.h"\
+       "..\..\include\wx\gtk\bitmap.h"\
+       "..\..\include\wx\gtk\bmpbuttn.h"\
+       "..\..\include\wx\gtk\brush.h"\
+       "..\..\include\wx\gtk\button.h"\
+       "..\..\include\wx\gtk\checkbox.h"\
+       "..\..\include\wx\gtk\checklst.h"\
+       "..\..\include\wx\gtk\choice.h"\
+       "..\..\include\wx\gtk\colour.h"\
+       "..\..\include\wx\gtk\combobox.h"\
+       "..\..\include\wx\gtk\control.h"\
+       "..\..\include\wx\gtk\cursor.h"\
+       "..\..\include\wx\gtk\dc.h"\
+       "..\..\include\wx\gtk\dcclient.h"\
+       "..\..\include\wx\gtk\dcmemory.h"\
+       "..\..\include\wx\gtk\dcscreen.h"\
+       "..\..\include\wx\gtk\dialog.h"\
+       "..\..\include\wx\gtk\font.h"\
+       "..\..\include\wx\gtk\frame.h"\
+       "..\..\include\wx\gtk\gauge.h"\
+       "..\..\include\wx\gtk\gdiobj.h"\
+       "..\..\include\wx\gtk\icon.h"\
+       "..\..\include\wx\gtk\listbox.h"\
+       "..\..\include\wx\gtk\mdi.h"\
+       "..\..\include\wx\gtk\menu.h"\
+       "..\..\include\wx\gtk\menuitem.h"\
+       "..\..\include\wx\gtk\msgdlg.h"\
+       "..\..\include\wx\gtk\notebook.h"\
+       "..\..\include\wx\gtk\pen.h"\
+       "..\..\include\wx\gtk\radiobox.h"\
+       "..\..\include\wx\gtk\radiobut.h"\
+       "..\..\include\wx\gtk\region.h"\
+       "..\..\include\wx\gtk\scrolbar.h"\
+       "..\..\include\wx\gtk\scrolwin.h"\
+       "..\..\include\wx\gtk\slider.h"\
+       "..\..\include\wx\gtk\statbmp.h"\
+       "..\..\include\wx\gtk\statbox.h"\
+       "..\..\include\wx\gtk\stattext.h"\
+       "..\..\include\wx\gtk\tbargtk.h"\
+       "..\..\include\wx\gtk\textctrl.h"\
+       "..\..\include\wx\gtk\timer.h"\
+       "..\..\include\wx\gtk\toplevel.h"\
+       "..\..\include\wx\gtk\window.h"\
+       "..\..\include\wx\hash.h"\
+       "..\..\include\wx\hashmap.h"\
+       "..\..\include\wx\icon.h"\
+       "..\..\include\wx\iconbndl.h"\
+       "..\..\include\wx\iconloc.h"\
+       "..\..\include\wx\imagbmp.h"\
+       "..\..\include\wx\image.h"\
+       "..\..\include\wx\imaggif.h"\
+       "..\..\include\wx\imagiff.h"\
+       "..\..\include\wx\imagjpeg.h"\
+       "..\..\include\wx\imagpcx.h"\
+       "..\..\include\wx\imagpng.h"\
+       "..\..\include\wx\imagpnm.h"\
+       "..\..\include\wx\imagtiff.h"\
+       "..\..\include\wx\imagxpm.h"\
+       "..\..\include\wx\init.h"\
+       "..\..\include\wx\intl.h"\
+       "..\..\include\wx\iosfwrap.h"\
+       "..\..\include\wx\ioswrap.h"\
+       "..\..\include\wx\isql.h"\
+       "..\..\include\wx\isqlext.h"\
+       "..\..\include\wx\layout.h"\
+       "..\..\include\wx\list.h"\
+       "..\..\include\wx\listbase.h"\
+       "..\..\include\wx\listbox.h"\
+       "..\..\include\wx\listctrl.h"\
+       "..\..\include\wx\log.h"\
+       "..\..\include\wx\longlong.h"\
+       "..\..\include\wx\mac\accel.h"\
+       "..\..\include\wx\mac\app.h"\
+       "..\..\include\wx\mac\bitmap.h"\
+       "..\..\include\wx\mac\bmpbuttn.h"\
+       "..\..\include\wx\mac\brush.h"\
+       "..\..\include\wx\mac\button.h"\
+       "..\..\include\wx\mac\checkbox.h"\
+       "..\..\include\wx\mac\checklst.h"\
+       "..\..\include\wx\mac\chkconf.h"\
+       "..\..\include\wx\mac\choice.h"\
+       "..\..\include\wx\mac\colour.h"\
+       "..\..\include\wx\mac\combobox.h"\
+       "..\..\include\wx\mac\control.h"\
+       "..\..\include\wx\mac\cursor.h"\
+       "..\..\include\wx\mac\dc.h"\
+       "..\..\include\wx\mac\dcclient.h"\
+       "..\..\include\wx\mac\dcmemory.h"\
+       "..\..\include\wx\mac\dcprint.h"\
+       "..\..\include\wx\mac\dcscreen.h"\
+       "..\..\include\wx\mac\dialog.h"\
+       "..\..\include\wx\mac\dirdlg.h"\
+       "..\..\include\wx\mac\filedlg.h"\
+       "..\..\include\wx\mac\font.h"\
+       "..\..\include\wx\mac\frame.h"\
+       "..\..\include\wx\mac\gauge.h"\
+       "..\..\include\wx\mac\gdiobj.h"\
+       "..\..\include\wx\mac\icon.h"\
+       "..\..\include\wx\mac\listbox.h"\
+       "..\..\include\wx\mac\macnotfy.h"\
+       "..\..\include\wx\mac\mdi.h"\
+       "..\..\include\wx\mac\menu.h"\
+       "..\..\include\wx\mac\menuitem.h"\
+       "..\..\include\wx\mac\msgdlg.h"\
+       "..\..\include\wx\mac\notebook.h"\
+       "..\..\include\wx\mac\palette.h"\
+       "..\..\include\wx\mac\pen.h"\
+       "..\..\include\wx\mac\radiobox.h"\
+       "..\..\include\wx\mac\radiobut.h"\
+       "..\..\include\wx\mac\region.h"\
+       "..\..\include\wx\mac\scrolbar.h"\
+       "..\..\include\wx\mac\slider.h"\
+       "..\..\include\wx\mac\statbmp.h"\
+       "..\..\include\wx\mac\statbox.h"\
+       "..\..\include\wx\mac\stattext.h"\
+       "..\..\include\wx\mac\statusbr.h"\
+       "..\..\include\wx\mac\textctrl.h"\
+       "..\..\include\wx\mac\timer.h"\
+       "..\..\include\wx\mac\toolbar.h"\
+       "..\..\include\wx\mac\toplevel.h"\
+       "..\..\include\wx\mac\window.h"\
+       "..\..\include\wx\mdi.h"\
+       "..\..\include\wx\memory.h"\
+       "..\..\include\wx\menu.h"\
+       "..\..\include\wx\menuitem.h"\
+       "..\..\include\wx\mgl\app.h"\
+       "..\..\include\wx\mgl\bitmap.h"\
+       "..\..\include\wx\mgl\brush.h"\
+       "..\..\include\wx\mgl\colour.h"\
+       "..\..\include\wx\mgl\cursor.h"\
+       "..\..\include\wx\mgl\dc.h"\
+       "..\..\include\wx\mgl\dcclient.h"\
+       "..\..\include\wx\mgl\dcmemory.h"\
+       "..\..\include\wx\mgl\dcscreen.h"\
+       "..\..\include\wx\mgl\font.h"\
+       "..\..\include\wx\mgl\gdiobj.h"\
+       "..\..\include\wx\mgl\icon.h"\
+       "..\..\include\wx\mgl\palette.h"\
+       "..\..\include\wx\mgl\pen.h"\
+       "..\..\include\wx\mgl\region.h"\
+       "..\..\include\wx\mgl\toplevel.h"\
+       "..\..\include\wx\mgl\window.h"\
+       "..\..\include\wx\motif\accel.h"\
+       "..\..\include\wx\motif\app.h"\
+       "..\..\include\wx\motif\bmpbuttn.h"\
+       "..\..\include\wx\motif\bmpmotif.h"\
+       "..\..\include\wx\motif\button.h"\
+       "..\..\include\wx\motif\checkbox.h"\
+       "..\..\include\wx\motif\checklst.h"\
+       "..\..\include\wx\motif\choice.h"\
+       "..\..\include\wx\motif\colour.h"\
+       "..\..\include\wx\motif\combobox.h"\
+       "..\..\include\wx\motif\control.h"\
+       "..\..\include\wx\motif\cursor.h"\
+       "..\..\include\wx\motif\dc.h"\
+       "..\..\include\wx\motif\dcclient.h"\
+       "..\..\include\wx\motif\dcmemory.h"\
+       "..\..\include\wx\motif\dcscreen.h"\
+       "..\..\include\wx\motif\dialog.h"\
+       "..\..\include\wx\motif\filedlg.h"\
+       "..\..\include\wx\motif\font.h"\
+       "..\..\include\wx\motif\frame.h"\
+       "..\..\include\wx\motif\gauge.h"\
+       "..\..\include\wx\motif\gdiobj.h"\
+       "..\..\include\wx\motif\icon.h"\
+       "..\..\include\wx\motif\listbox.h"\
+       "..\..\include\wx\motif\mdi.h"\
+       "..\..\include\wx\motif\menu.h"\
+       "..\..\include\wx\motif\menuitem.h"\
+       "..\..\include\wx\motif\msgdlg.h"\
+       "..\..\include\wx\motif\palette.h"\
+       "..\..\include\wx\motif\radiobox.h"\
+       "..\..\include\wx\motif\radiobut.h"\
+       "..\..\include\wx\motif\scrolbar.h"\
+       "..\..\include\wx\motif\slider.h"\
+       "..\..\include\wx\motif\statbmp.h"\
+       "..\..\include\wx\motif\statbox.h"\
+       "..\..\include\wx\motif\stattext.h"\
+       "..\..\include\wx\motif\textctrl.h"\
+       "..\..\include\wx\motif\timer.h"\
+       "..\..\include\wx\motif\toolbar.h"\
+       "..\..\include\wx\motif\toplevel.h"\
+       "..\..\include\wx\motif\window.h"\
+       "..\..\include\wx\msgdlg.h"\
+       "..\..\include\wx\msw\accel.h"\
+       "..\..\include\wx\msw\app.h"\
+       "..\..\include\wx\msw\bitmap.h"\
+       "..\..\include\wx\msw\bmpbuttn.h"\
+       "..\..\include\wx\msw\brush.h"\
+       "..\..\include\wx\msw\button.h"\
+       "..\..\include\wx\msw\checkbox.h"\
+       "..\..\include\wx\msw\checklst.h"\
+       "..\..\include\wx\msw\chkconf.h"\
+       "..\..\include\wx\msw\choice.h"\
+       "..\..\include\wx\msw\colour.h"\
+       "..\..\include\wx\msw\combobox.h"\
+       "..\..\include\wx\msw\control.h"\
+       "..\..\include\wx\msw\cursor.h"\
+       "..\..\include\wx\msw\dc.h"\
+       "..\..\include\wx\msw\dcclient.h"\
+       "..\..\include\wx\msw\dcmemory.h"\
+       "..\..\include\wx\msw\dcprint.h"\
+       "..\..\include\wx\msw\dcscreen.h"\
+       "..\..\include\wx\msw\dialog.h"\
+       "..\..\include\wx\msw\dirdlg.h"\
+       "..\..\include\wx\msw\filedlg.h"\
+       "..\..\include\wx\msw\font.h"\
+       "..\..\include\wx\msw\frame.h"\
+       "..\..\include\wx\msw\gauge95.h"\
+       "..\..\include\wx\msw\gccpriv.h"\
+       "..\..\include\wx\msw\gdiimage.h"\
+       "..\..\include\wx\msw\gdiobj.h"\
+       "..\..\include\wx\msw\icon.h"\
+       "..\..\include\wx\msw\listbox.h"\
+       "..\..\include\wx\msw\listctrl.h"\
+       "..\..\include\wx\msw\mdi.h"\
+       "..\..\include\wx\msw\menu.h"\
+       "..\..\include\wx\msw\menuitem.h"\
+       "..\..\include\wx\msw\msgdlg.h"\
+       "..\..\include\wx\msw\notebook.h"\
+       "..\..\include\wx\msw\ole\access.h"\
+       "..\..\include\wx\msw\palette.h"\
+       "..\..\include\wx\msw\pen.h"\
+       "..\..\include\wx\msw\radiobox.h"\
+       "..\..\include\wx\msw\radiobut.h"\
+       "..\..\include\wx\msw\region.h"\
+       "..\..\include\wx\msw\scrolbar.h"\
+       "..\..\include\wx\msw\slider95.h"\
+       "..\..\include\wx\msw\statbmp.h"\
+       "..\..\include\wx\msw\statbox.h"\
+       "..\..\include\wx\msw\statbr95.h"\
+       "..\..\include\wx\msw\stattext.h"\
+       "..\..\include\wx\msw\tbar95.h"\
+       "..\..\include\wx\msw\tbarmsw.h"\
+       "..\..\include\wx\msw\textctrl.h"\
+       "..\..\include\wx\msw\timer.h"\
+       "..\..\include\wx\msw\toplevel.h"\
+       "..\..\include\wx\msw\wince\tbarwce.h"\
+       "..\..\include\wx\msw\wince\time.h"\
+       "..\..\include\wx\msw\window.h"\
+       "..\..\include\wx\msw\winundef.h"\
+       "..\..\include\wx\msw\wrapwin.h"\
+       "..\..\include\wx\notebook.h"\
+       "..\..\include\wx\object.h"\
+       "..\..\include\wx\os2\accel.h"\
+       "..\..\include\wx\os2\app.h"\
+       "..\..\include\wx\os2\bitmap.h"\
+       "..\..\include\wx\os2\bmpbuttn.h"\
+       "..\..\include\wx\os2\brush.h"\
+       "..\..\include\wx\os2\button.h"\
+       "..\..\include\wx\os2\checkbox.h"\
+       "..\..\include\wx\os2\checklst.h"\
+       "..\..\include\wx\os2\choice.h"\
+       "..\..\include\wx\os2\colour.h"\
+       "..\..\include\wx\os2\combobox.h"\
+       "..\..\include\wx\os2\control.h"\
+       "..\..\include\wx\os2\cursor.h"\
+       "..\..\include\wx\os2\dc.h"\
+       "..\..\include\wx\os2\dcclient.h"\
+       "..\..\include\wx\os2\dcmemory.h"\
+       "..\..\include\wx\os2\dcprint.h"\
+       "..\..\include\wx\os2\dcscreen.h"\
+       "..\..\include\wx\os2\dialog.h"\
+       "..\..\include\wx\os2\filedlg.h"\
+       "..\..\include\wx\os2\font.h"\
+       "..\..\include\wx\os2\frame.h"\
+       "..\..\include\wx\os2\gauge.h"\
+       "..\..\include\wx\os2\gdiimage.h"\
+       "..\..\include\wx\os2\gdiobj.h"\
+       "..\..\include\wx\os2\icon.h"\
+       "..\..\include\wx\os2\listbox.h"\
+       "..\..\include\wx\os2\menu.h"\
+       "..\..\include\wx\os2\menuitem.h"\
+       "..\..\include\wx\os2\msgdlg.h"\
+       "..\..\include\wx\os2\notebook.h"\
+       "..\..\include\wx\os2\palette.h"\
+       "..\..\include\wx\os2\pen.h"\
+       "..\..\include\wx\os2\private.h"\
+       "..\..\include\wx\os2\radiobox.h"\
+       "..\..\include\wx\os2\radiobut.h"\
+       "..\..\include\wx\os2\region.h"\
+       "..\..\include\wx\os2\scrolbar.h"\
+       "..\..\include\wx\os2\slider.h"\
+       "..\..\include\wx\os2\statbmp.h"\
+       "..\..\include\wx\os2\statbox.h"\
+       "..\..\include\wx\os2\stattext.h"\
+       "..\..\include\wx\os2\textctrl.h"\
+       "..\..\include\wx\os2\timer.h"\
+       "..\..\include\wx\os2\toolbar.h"\
+       "..\..\include\wx\os2\toplevel.h"\
+       "..\..\include\wx\os2\window.h"\
+       "..\..\include\wx\os2\wxrsc.h"\
+       "..\..\include\wx\ownerdrw.h"\
+       "..\..\include\wx\palette.h"\
+       "..\..\include\wx\panel.h"\
+       "..\..\include\wx\pen.h"\
+       "..\..\include\wx\platform.h"\
+       "..\..\include\wx\radiobox.h"\
+       "..\..\include\wx\radiobut.h"\
+       "..\..\include\wx\region.h"\
+       "..\..\include\wx\renderer.h"\
+       "..\..\include\wx\scrolbar.h"\
+       "..\..\include\wx\scrolwin.h"\
+       "..\..\include\wx\settings.h"\
+       "..\..\include\wx\sizer.h"\
+       "..\..\include\wx\slider.h"\
+       "..\..\include\wx\statbmp.h"\
+       "..\..\include\wx\statbox.h"\
+       "..\..\include\wx\stattext.h"\
+       "..\..\include\wx\statusbr.h"\
+       "..\..\include\wx\stopwatch.h"\
+       "..\..\include\wx\strconv.h"\
+       "..\..\include\wx\stream.h"\
+       "..\..\include\wx\string.h"\
+       "..\..\include\wx\tbarbase.h"\
+       "..\..\include\wx\textctrl.h"\
+       "..\..\include\wx\textdlg.h"\
+       "..\..\include\wx\thread.h"\
+       "..\..\include\wx\timer.h"\
+       "..\..\include\wx\toolbar.h"\
+       "..\..\include\wx\toplevel.h"\
+       "..\..\include\wx\univ\bmpbuttn.h"\
+       "..\..\include\wx\univ\button.h"\
+       "..\..\include\wx\univ\checkbox.h"\
+       "..\..\include\wx\univ\checklst.h"\
+       "..\..\include\wx\univ\choice.h"\
+       "..\..\include\wx\univ\combobox.h"\
+       "..\..\include\wx\univ\control.h"\
+       "..\..\include\wx\univ\dialog.h"\
+       "..\..\include\wx\univ\frame.h"\
+       "..\..\include\wx\univ\gauge.h"\
+       "..\..\include\wx\univ\inpcons.h"\
+       "..\..\include\wx\univ\inphand.h"\
+       "..\..\include\wx\univ\listbox.h"\
+       "..\..\include\wx\univ\menu.h"\
+       "..\..\include\wx\univ\menuitem.h"\
+       "..\..\include\wx\univ\notebook.h"\
+       "..\..\include\wx\univ\radiobox.h"\
+       "..\..\include\wx\univ\radiobut.h"\
+       "..\..\include\wx\univ\scrarrow.h"\
+       "..\..\include\wx\univ\scrolbar.h"\
+       "..\..\include\wx\univ\scrthumb.h"\
+       "..\..\include\wx\univ\slider.h"\
+       "..\..\include\wx\univ\statbmp.h"\
+       "..\..\include\wx\univ\statbox.h"\
+       "..\..\include\wx\univ\stattext.h"\
+       "..\..\include\wx\univ\statusbr.h"\
+       "..\..\include\wx\univ\textctrl.h"\
+       "..\..\include\wx\univ\theme.h"\
+       "..\..\include\wx\univ\toolbar.h"\
+       "..\..\include\wx\univ\toplevel.h"\
+       "..\..\include\wx\univ\window.h"\
+       "..\..\include\wx\utils.h"\
+       "..\..\include\wx\validate.h"\
+       "..\..\include\wx\valtext.h"\
+       "..\..\include\wx\variant.h"\
+       "..\..\include\wx\vector.h"\
+       "..\..\include\wx\version.h"\
+       "..\..\include\wx\vidmode.h"\
+       "..\..\include\wx\window.h"\
+       "..\..\include\wx\wx.h"\
+       "..\..\include\wx\wxchar.h"\
+       "..\..\include\wx\wxprec.h"\
+       "..\..\include\wx\x11\app.h"\
+       "..\..\include\wx\x11\bitmap.h"\
+       "..\..\include\wx\x11\brush.h"\
+       "..\..\include\wx\x11\colour.h"\
+       "..\..\include\wx\x11\cursor.h"\
+       "..\..\include\wx\x11\dc.h"\
+       "..\..\include\wx\x11\dcclient.h"\
+       "..\..\include\wx\x11\dcmemory.h"\
+       "..\..\include\wx\x11\dcscreen.h"\
+       "..\..\include\wx\x11\font.h"\
+       "..\..\include\wx\x11\gdiobj.h"\
+       "..\..\include\wx\x11\icon.h"\
+       "..\..\include\wx\x11\palette.h"\
+       "..\..\include\wx\x11\pen.h"\
+       "..\..\include\wx\x11\region.h"\
+       "..\..\include\wx\x11\textctrl.h"\
+       "..\..\include\wx\x11\toplevel.h"\
+       "..\..\include\wx\x11\window.h"\
+       "..\..\include\wx\xti.h"\
+       
+NODEP_CPP_MINIM=\
+       "..\..\include\wx\wx\generic\access.h"\
+       "..\..\include\wx\wx\tbarsmpl.h"\
+       "..\..\lib\wince_emud\wx\setup.h"\
+       ".\mondrian.xpm"\
+       
+

 !ENDIF 
 
 # End Source File
 !ENDIF 
 
 # End Source File


@@ -2427,32 +3436,32 @@ SOURCE=.\minimal.rc
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release"
 
 # ADD BASE RSC /l 0x409
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug"
 
 # ADD BASE RSC /l 0x409
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Release"
 
 # ADD BASE RSC /l 0x409
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Release"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug eVC4"
 
 # ADD BASE RSC /l 0x409
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Debug eVC4"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release eVC4"
 
 # ADD BASE RSC /l 0x409
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE x86) Release eVC4"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Debug"
 
 # ADD BASE RSC /l 0x409
 
 !ELSEIF  "$(CFG)" == "minimalCE - Win32 (WCE emulator) Debug"
 
 # ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409 /i "../../include"
+# ADD RSC /l 0x409 /i "../../include" /i "../../samples"

 
 !ENDIF 
 
 
 !ENDIF 
 

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 7977fab35d58dc51100d2b4a2d5ae4ce7a3076ce..26143fcf664196a24d5551942e05b64061203ff2 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -41,6 +41,7 @@
 #endif
 
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 #endif
 
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>

+#include "wx/msw/missing.h" // needs to be before #include <commdlg.h>

 
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
 
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"


@@ -785,6 +786,9 @@ wxDC::DoDrawPolyPolygon(int n,
                         wxCoord yoffset,
                         int fillStyle)
 {
                         wxCoord yoffset,
                         int fillStyle)
 {

+#ifdef __WXWINCE__
+    wxDCBase::DoDrawPolyPolygon(n, start, points, xoffset, yoffset, fillStyle);
+#else    

     WXMICROWIN_CHECK_HDC
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
     WXMICROWIN_CHECK_HDC
 
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling


@@ -803,9 +807,13 @@ wxDC::DoDrawPolyPolygon(int n,
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#endif        

         (void)PolyPolygon(GetHdc(), cpoints, start, n);
         (void)PolyPolygon(GetHdc(), cpoints, start, n);

+#ifndef __WXWINCE__

         SetPolyFillMode(GetHdc(),prev);
         SetPolyFillMode(GetHdc(),prev);

+#endif        

         delete[] cpoints;
     }
     else
         delete[] cpoints;
     }
     else


@@ -813,10 +821,16 @@ wxDC::DoDrawPolyPolygon(int n,
         for (i = 0; i < cnt; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 
         for (i = 0; i < cnt; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#endif        

         (void)PolyPolygon(GetHdc(), (POINT*) points, start, n);
         (void)PolyPolygon(GetHdc(), (POINT*) points, start, n);

+#ifndef __WXWINCE__

         SetPolyFillMode(GetHdc(),prev);
         SetPolyFillMode(GetHdc(),prev);

+#endif        

     }
     }

+#endif
+  // __WXWINCE__

 }
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 }
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 47bc5ff54a1bcf528ed52689350a1c64327f96ee..f20ea0752443e3dacf1a566f0c34b1d56e69cd4b 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -41,8 +41,6 @@
 #include "wx/module.h"
 
 #include "wx/msw/private.h"
 #include "wx/module.h"
 
 #include "wx/msw/private.h"

-#include "wx/msw/missing.h"
-

 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>


@@ -52,6 +50,7 @@
 #include "wx/msw/wince/missing.h"
 #endif
 
 #include "wx/msw/wince/missing.h"
 #endif
 

+#include "wx/msw/missing.h"

 #include "wx/msw/winundef.h"
 
 // This can't be undefed in winundef.h or
 #include "wx/msw/winundef.h"
 
 // This can't be undefed in winundef.h or

diff --git a/src/msw/wince/wxWindowsCE.vcp b/src/msw/wince/wxWindowsCE.vcp
index 5afe33a36d43f1ad3f1d61e701a0543a0dd532e9..57a3478c5ae046d6c1d21cb5a7bb4d410302aa2c 100644 (file)
--- a/src/msw/wince/wxWindowsCE.vcp
+++ b/src/msw/wince/wxWindowsCE.vcp
@@ -2334,7 +2334,7 @@ SOURCE=..\volume.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=..\wave.cpp
+SOURCE=..\sound.cpp

 
 
 # End Source File
 
 
 # End Source File

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index fd309ac757d6eb626d304b54f362506b6697a51d..f6ba76104fc231fbe5f061e32a5c9f82f8de6322 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -97,7 +97,7 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)) || defined(__CYGWIN10__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) /* && !defined(__WXWINCE__) */ ) || defined(__CYGWIN10__)

     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif


@@ -106,7 +106,7 @@
     #include <windowsx.h>
 #endif
 
     #include <windowsx.h>
 #endif
 

-#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)) || defined(__CYGWIN10__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) /* && !defined(__WXWINCE__) */ ) || defined(__CYGWIN10__)

     #ifdef __WIN95__
         #include <commctrl.h>
     #endif
     #ifdef __WIN95__
         #include <commctrl.h>
     #endif