Fixed source for WinCE compatibility

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-17 10:06:26 +00:00
parent 2eb85fe466
commit d61c1a6f21
21 changed files with 1228 additions and 154 deletions
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -2,7 +2,7 @@
 # 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
@@ -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 distrib
+    rm -f -r distrib
    rm -f *.spec
    rm -f -r contrib/utils/wxrcedit
--- 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/msw/wince/wxWindowsCE.vcp
 src/msw/wince/wxWindowsCE.vcw
 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/dialogsCE.vcp
 samples/dialogs/dialogsCE.vcw
 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/minimalCE.vcp
 samples/minimal/minimalCE.vcw
 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/widgetsCE.vcp
 samples/widgets/widgetsCE.vcw
 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/bombsCE.vcp
 demos/bombs/bombsCE.vcw
 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/lifeCE.vcp
 demos/life/lifeCE.vcw
 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
--- 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
-  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
--- a/docs/html/faq.htm
+++ b/docs/html/faq.htm
@@ -1,4 +1,3 @@
 <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>
 <li><a href="faqgtk.htm">GTK+ 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>
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -1,4 +1,3 @@
 <HTML>
 <HEAD>
@@ -21,7 +20,8 @@
 <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>
--- a/docs/html/faqmot.htm
+++ b/docs/html/faqmot.htm
@@ -1,4 +1,3 @@
 <HTML>
 <HEAD>
@@ -21,7 +20,8 @@
 <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>
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -1,4 +1,3 @@
 <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="#dspfmt">Why does Visual C++ complain about corrupted project files??</a></li>
 </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>
-This is under consideration, though we need to get wxWindows Unicode-aware first.
+This port is largely complete. For further information, see the <a href="http://www.wxwindows.org/embedded.htm#wxwince">wxEmbedded</a> page.<P>
 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>
 <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>
-<li>Visual C++ 1.5, 4.0, 5.0, 6.0
+<li>Visual C++ 1.5, 4.0, 5.0, 6.0, 7.0, 7.1
-<li>Borland C++ 4.5, 5.0
+<li>Borland C++ 4.5, 5.0, 5.5
-<li>Borland C++Builder 1.0, 3.0
+<li>Borland C++Builder 1.0, 3.0, X
-<li>Watcom C++ 10.6 (WIN32)
+<li>Watcom C++ 10.6 (Win32), OpenWatcom 1.0
-<li>Cygwin b20
+<li>Cygwin (using configure)
 <li>Mingw32
-<li>MetroWerks CodeWarrior 4
+<li>MetroWerks CodeWarrior (many versions)
 <li>Digital Mars 8.34+
 </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>
@@ -178,24 +171,20 @@ wxWindows.
 <h3><a name="unicode">Is Unicode supported?</a></h3>
-Yes, Unicode is fully supported under Windows NT/2000 (Windows 9x don&#39;t
+Yes, Unicode is fully supported under Windows NT/2000 and there is limited
-have Unicode support anyhow).
+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>
-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 (meaning DBCS, not Unicode). First you have to
-"For Japanese under Win2000, it seems that wxWindows has no problems to work with double byte char sets
+install Japanese support on your Win2K system and choose for ANSI translation
-(I mean DBCS, that&#39;s not Unicode). First you have to install Japanese support on your Win2K system
+<tt>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932</tt>
-and choose for ANSI translation 
+(default is 1252 for Western). Then you can see all the Japanese letters in
-HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932 (default is 1252 for Western).
+wxWindows applications.
-Then you can see all the funny Japanese letters under wxWindows too.<P>
+<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>
 <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
-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>
@@ -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>.
-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
@@ -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>
-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
@@ -461,7 +450,7 @@ First, you can use wxRegKey directly, for example:
    regKey.SetName(idName);
    {
-        wxLogNull dummy; 
+        wxLogNull dummy;
        if (!regKey.Create())
        {
            idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\");
@@ -506,6 +495,20 @@ for the current status.
 <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>
--- a/docs/html/faqx11.htm
+++ b/docs/html/faqx11.htm
@@ -1,4 +1,3 @@
 <HTML>
 <HEAD>
@@ -21,7 +20,8 @@
 <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>
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -1,6 +1,6 @@
 <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>
@@ -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.
 <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>
@@ -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>
 <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>
-    <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 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 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 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>
@@ -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>
-        <A HREF="mailto:leif@danmos.dk">Leif Jensen</A>,
+        <A HREF="mailto:leif@@danmos.dk">Leif Jensen</A>,
-        <A HREF="mailto:Henrik@fangorn.dk">Henrik R<>der Clausen</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 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>
@@ -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>
-    <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>
-    <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</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:lionel.allorge@@lunerouge.com">Lionel Allorge</A>,
-                                   <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</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 align=center valign=center><A HREF="mailto:DanR@gmx.de">Daniel Reith</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:sparhawk@@aon.at">Gerhard Gruber</A>,
-                                   <A HREF="mailto:stefan@hedemann.de">Stefan Hedemann</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:D.Reymann@@geisenheim.mnd.fh-wiesbaden.de">Dr. Detlev Reymann</A>,
                                   <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>
-    <td align=center valign=center><A HREF="mailto:tsolako1@otenet.gr">Tsolakos Stavros</A>,
+    <td align=center valign=center><A HREF="mailto:tsolako1@@otenet.gr">Tsolakos Stavros</A>,
-                                   <A HREF="mailto:nassosy@compulink.gr">Nassos Yiannopoulos</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 align=center valign=center><A HREF="mailto:Janos_Vegh@users.sourceforge.net">V<EFBFBD>gh J<>nos Dr.</A>
+    <td align=center valign=center><A HREF="mailto:Janos_Vegh@@users.sourceforge.net">V<EFBFBD>gh J<>nos Dr.</A>
                                   </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>
-        <a href="mailto:bambang@3wsi.com">Bambang Purnomosidi D. P.</a>
+        <a href="mailto:bambang@@3wsi.com">Bambang Purnomosidi D. P.</a>
    </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>
-        <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>
 <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>
-    <td align=center valign=center><A HREF="mailto:matiso@hoga.pl">Piotr Mackowiak</A>,
+    <td align=center valign=center><A HREF="mailto:matiso@@hoga.pl">Piotr Mackowiak</A>,
-                                   <a href="mailto:jpiw@go2.pl">Janusz Piwowarski</a></td>
+                                   <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>
-    <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>
-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></td>
+    <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>,
+    <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:vadim@@wxwindows.org">Vadim Zeitlin</A>
-                                   <A HREF="mailto:kai@cmail.ru">Andrew V. Samoilov</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 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>
-    <td align=center valign=center><IMG SRC="images/no.gif" ALT="Not yet"></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></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>
-    <td align=center valign=center><IMG SRC="images/yes.gif" ALT="Ok"></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>,
+    <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>
+                                   <A HREF="mailto:kgb@@compart.fi">Kaj G Backas</A></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><IMG SRC="images/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:dogusanh@dynaset.org">Hakki Dogusan</A></td>
+    <td align=center valign=center><A HREF="mailto:dogusanh@@dynaset.org">Hakki Dogusan</A></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><IMG SRC="images/yes.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:manko@salingshot.co.nz">Eugene Manko></td>
+    <td align=center valign=center><A HREF="mailto:manko@@salingshot.co.nz">Eugene Manko</td>
 </tr>
--- 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.
 \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}
@@ -289,14 +299,3 @@ implements the following methods:\par
 \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.}
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -210,5 +210,5 @@ web site.
 Have fun!
-The wxWindows Team, September 2003
+The wxWindows Team, February 2004
--- 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
 // Not in WinCE
 #ifndef HGDI_ERROR
 #define HGDI_ERROR ((HANDLE)(0xFFFFFFFFL))
 #endif
 #endif
    // _WX_MISSING_H_
--- 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
-#ifndef __WIN64__
+#if !defined(__WIN64__) && !defined(__WXWINCE__)
    #define UINT_PTR unsigned int
    #define ULONG_PTR unsigned long
    #define DWORD_PTR unsigned long
--- a/include/wx/wave.h
+++ b/include/wx/wave.h
@@ -17,8 +17,10 @@
 #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"
 #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
--- 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;
-
+  
  file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
--- 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"
--- a/samples/minimal/minimalCE.vcp
+++ b/samples/minimal/minimalCE.vcp
--- 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>
 #include "wx/msw/missing.h" // needs to be before #include <commdlg.h>
 #include "wx/sysopt.h"
 #include "wx/dcprint.h"
@@ -785,6 +786,9 @@ wxDC::DoDrawPolyPolygon(int n,
                        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
@@ -803,9 +807,13 @@ wxDC::DoDrawPolyPolygon(int n,
            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
        }
 #ifndef __WXWINCE__
        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
 #endif        
        (void)PolyPolygon(GetHdc(), cpoints, start, n);
 #ifndef __WXWINCE__
        SetPolyFillMode(GetHdc(),prev);
 #endif        
        delete[] cpoints;
    }
    else
@@ -813,10 +821,16 @@ wxDC::DoDrawPolyPolygon(int n,
        for (i = 0; i < cnt; i++)
            CalcBoundingBox(points[i].x, points[i].y);
 #ifndef __WXWINCE__
        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
 #endif        
        (void)PolyPolygon(GetHdc(), (POINT*) points, start, n);
 #ifndef __WXWINCE__
        SetPolyFillMode(GetHdc(),prev);
 #endif        
    }
 #endif
  // __WXWINCE__
 }
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
--- 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/msw/missing.h"
 #if defined(__WXWINCE__)
  #include <ole2.h>
  #include <shellapi.h>
@@ -52,6 +50,7 @@
 #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
--- 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
-SOURCE=..\wave.cpp
+SOURCE=..\sound.cpp
 # End Source File
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -97,7 +97,7 @@
 #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
@@ -106,7 +106,7 @@
    #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
`@@ -210,5 +210,5 @@ web site.`

	`Have fun!`	`Have fun!`

	`The wxWindows Team, September 2003`	`The wxWindows Team, February 2004`
`@@ -1,3 +1,3 @@`
	`mondrian ICON "mondrian.ico"`	`mondrian ICON "sample.ico"`
	`#include "wx/msw/wx.rc"`	`#include "wx/msw/wx.rc"`