Misc small fixes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 81e4d3e7277e1a779a80b77955bd4e379251fbc1..2df0c09ba17de5ff53e35a9f28067ff7d6d56b76 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -44,6 +44,10 @@ docs/changes.txt
 docs/upgrade.txt
 docs/todo.txt
 docs/licence.txt
+docs/licendoc.txt
+docs/preamble.txt
+docs/gpl.txt
+docs/lgpl.txt
 docs/symbols.txt
 docs/bugs.txt
 docs/*.htm

diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp
index 2f96c4b574de95a6be9750ee35110c79020b77b7..5b4e32b747e33988f24533c94fd105a2ea737398 100644 (file)
--- a/distrib/msw/gtk.rsp
+++ b/distrib/msw/gtk.rsp
@@ -32,53 +32,6 @@ src/iodbc/build
 src/iodbc/Changes.log
 src/iodbc/postgres/*.h
 
-setup/*.in
-setup/*.hin
-
-setup/general/createall
-setup/general/jointar
-setup/general/makeapp
-setup/general/makedirs
-setup/general/makedoc
-setup/general/mygrep
-setup/general/needed
-
-setup/rules/bin
-setup/rules/bin2
-setup/rules/doc
-setup/rules/gbin
-setup/rules/gbin2
-setup/rules/glib
-setup/rules/glibbin
-setup/rules/glibgbin
-setup/rules/gslib
-setup/rules/lib
-setup/rules/libbin
-setup/rules/libgbin
-
-setup/rules/generic/bin1
-setup/rules/generic/bin1gen
-setup/rules/generic/bin2
-setup/rules/generic/bin2gen
-setup/rules/generic/depend
-setup/rules/generic/globals
-setup/rules/generic/lib
-setup/rules/generic/needed
-setup/rules/generic/obj
-setup/rules/generic/slib
-setup/rules/generic/sobj
-
-setup/shared/sharedAIX
-setup/shared/sharedBsd
-setup/shared/sharedDgux
-setup/shared/sharedHpux
-setup/shared/sharedIrix
-setup/shared/sharedLinux
-setup/shared/sharedOSF
-setup/shared/sharedSolaris2
-setup/shared/sharedSunos4
-setup/shared/sharedSysV
-
 misc/afm/*.afm
 misc/gs_afm/*.afm
 

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index aa881eb035ce689061b1724b277b7b7d4185525d..4c9a3f729c62646d754ef23e3e04c6dc4c2173dd 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -46,7 +46,6 @@ samples/wizard/Makefile.in
 samples/wxpoem/Makefile.in
 samples/wxsocket/Makefile.in
 samples/nettest/Makefile.in
-samples/scrollsub/Makefile.in
 samples/font/Makefile.in
 samples/menu/Makefile.in
 samples/console/Makefile.in

diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp
index 6c35b3d41a87330e60d07a12607a27862ad9fa86..71b76e4d987e9f8cadae9ba4c4ee07e9084b7832 100644 (file)
--- a/distrib/msw/motif.rsp
+++ b/distrib/msw/motif.rsp
@@ -30,59 +30,9 @@ include/wx/install-sh
 
 docs/motif/*.txt
 docs/motif/makewxmotif
-docs/motif2/*.txt
-docs/motif2/COPYING.LIB
 
 lib/dummy
 
 misc/afm/*.afm
 misc/gs_afm/*.afm
 
-setup/*.in
-setup/*.hin
-
-setup/general/createall
-setup/general/jointar
-setup/general/makeapp
-setup/general/makedirs
-setup/general/makedoc
-setup/general/mygrep
-setup/general/needed
-
-setup/rules/bin
-setup/rules/bin2
-setup/rules/doc
-setup/rules/gbin
-setup/rules/gbin2
-setup/rules/glib
-setup/rules/glibbin
-setup/rules/glibgbin
-setup/rules/gslib
-setup/rules/lib
-setup/rules/libbin
-setup/rules/libgbin
-
-setup/rules/generic/bin1
-setup/rules/generic/bin1gen
-setup/rules/generic/bin2
-setup/rules/generic/bin2gen
-setup/rules/generic/depend
-setup/rules/generic/globals
-setup/rules/generic/lib
-setup/rules/generic/needed
-setup/rules/generic/obj
-setup/rules/generic/slib
-setup/rules/generic/sobj
-
-setup/shared/sharedAIX
-setup/shared/sharedBsd
-setup/shared/sharedDgux
-setup/shared/sharedHpux
-setup/shared/sharedIrix
-setup/shared/sharedLinux
-setup/shared/sharedOSF
-setup/shared/sharedSolaris2
-setup/shared/sharedSunos4
-setup/shared/sharedSysV
-
-

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index b500044781e1ab8936a9f5f1818cfe2d23a6f891..5bafc4437b62c5c486fe4d4d1b88dd49361a5d1e 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -43,7 +43,7 @@
         #! these files don't compile
         next if $file =~ /^pnghand\./;
 
-        next if $wxGeneric{$file} =~ /\b16\b/;
+#!        next if $wxGeneric{$file} =~ /\b16\b/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         my $isCFile = $file =~ /\.c$/;

diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt
index e7e87ec85577b157a8973cc80fdbcf3b82dc3705..0ee98df843a59b9a86003e577a39fa0579f9d892 100644 (file)
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -50,11 +50,6 @@ item: Create Shortcut
   Destination=%GROUP%\Tex2RTF Help.lnk
   Working Directory=%MAINDIR%
 end
-item: Create Shortcut
-  Source=%MAINDIR%\docs\winhelp\wxtree.hlp
-  Destination=%GROUP%\wxTree Help.lnk
-  Working Directory=%MAINDIR%
-end
 item: Create Shortcut
   Source=%MAINDIR%\docs\html\index.htm
   Destination=%GROUP%\HTML Docs Index.lnk
@@ -70,8 +65,30 @@ item: Create Shortcut
   Destination=%GROUP%\Dialog Editor.lnk
   Working Directory=%MAINDIR%
 end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\release.txt
+  Destination=%GROUP%\Release Details.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\wxtree.hlp
+  Destination=%GROUP%\wxTreeLayout Help.lnk
+  Working Directory=%MAINDIR%
+end
 item: Else Statement
 end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxTreeLayout Help
+  Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Release Details
+  Command Line=%MAINDIR%\docs\release.txt
+  Default Directory=%MAINDIR%
+end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Dialog Editor
@@ -126,12 +143,6 @@ item: Add ProgMan Icon
   Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp
   Default Directory=%MAINDIR%
 end
-item: Add ProgMan Icon
-  Group=%GROUP%
-  Icon Name=wxTree Help
-  Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp
-  Default Directory=%MAINDIR%
-end
 item: End Block
 end
 item: Self-Register OCXs/DLLs

diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index 0fea7e4c38d52137931dae78dd67465d14c7ded2..713df8169bbb0eff041b503344b499b82d1eff0f 100644 (file)
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=wxWindows 2.1.10 Installation
+  Title=wxWindows 2.1.11 Installation
   Flags=00000100
   Split=1420
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxWindows 2.1.10
+  Value=wxWindows 2.1.11
 end
 item: Set Variable
   Variable=GROUP

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 9a919141e8607037cef619f08d2470dc7e628d0f..01a6aab5affda7b6309c914e36d0eaf36bb3a62d 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -12,6 +12,7 @@ if "%dest" == "" goto usage
 if "%1" == "-help" goto usage
 if "%1" == "--help" goto usage
 if "%1" == "/?" goto usage
+if "%1" == "wiseonly" goto dounzip
 if "%1" == "wise" set wise=1
 echo About to archive an external wxWindows distribution:
 echo   From   %src
@@ -20,8 +21,6 @@ if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause
 
-rem goto dounzip
-
 erase %dest\wx*.zip
 erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
@@ -79,16 +78,17 @@ copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt
 copy %src\docs\gtk\install.txt %dest\install_gtk.txt
 copy %src\docs\readme.txt %dest
+copy %src\docs\release.txt %dest
 copy %src\docs\motif\makewxmotif %dest
 copy %src\docs\gtk\makewxgtk %dest
 
+Rem Skip WISE setup if wise is 0.
+if "%wise" == "0" goto end
+
 :dounzip
 
 cd %dest
 
-Rem Skip WISE setup if wise is 0.
-if "%wise" == "0" goto end
-
 rem Unzip the Windows files into 'wx'
 mkdir %dest\wx
 
@@ -134,14 +134,34 @@ Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
 
 cd %dest
 
+Rem tidy up capitalisation of filenames
+ren setup.EXE s
+ren s setup.exe
+
+ren setup.w02 s
+ren s setup.w02
+
+ren setup.w03 s
+ren s setup.w03
+
+ren setup.w04 s
+ren s setup.w04
+
+ren setup.w05 s
+ren s setup.w05
+
+ren setup.w06 s
+ren s setup.w06
+
 echo wxWindows archived.
+
 goto end
 
 :usage
 echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
 echo and optionally makes a deliver\wx directory and a setup.exe
-echo if you specify 'wise'.
+echo if you specify 'wise' (skipping the zipping if you use 'wiseonly').
 echo.
-echo Usage: zipdist [wise]
+echo Usage: zipdist [wise | wiseonly]
 
 :end

diff --git a/docs/gtk/makewxgtk b/docs/gtk/makewxgtk
index 8956a8fe05b1f4fc6ac6777d8529c5b6c30feef9..fa496124e2935e6cc81512cefe9cb0e9bb9b3334 100644 (file)
--- a/docs/gtk/makewxgtk
+++ b/docs/gtk/makewxgtk
@@ -3,9 +3,9 @@
 # and makes wxGTK.
 # Call from top-level wxWindows directory.
 # Note that this uses standard (but commonly-used) configure options;
-# if you're feeling brave, you may wish to compile with threads.
+# if you're feeling braven, you may wish to compile with threads.
 # -- Julian Smart
-chmod a+x configure config.sub config.guess setup/general/* setup/shared/*
-./configure --with-shared --with-gtk --with-debug_flag --with-debug_info --without-threads
-make makefiles
+rm -f *.cache
+chmod a+x configure config.sub config.guess
+./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg
 make

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 62f4bf05bd30683238c4df694618c6bcb1c5af25..f1269cfc7c1e3e8aaa76b33d4eeabea35e77e3b5 100644 (file)
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -20,8 +20,8 @@ First steps
   (not yet tested). Motif 2.0 and above may also be suitable.
 
 - Download the appropriate .tgz archive, or alternatively the files
-  wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a preferred format,
-  such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
+  wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a
+  preferred format, such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
 
 - Make a directory such as ~/wx and unarchive the files into this
   directory. If using the zip archives, use the -a option if available

diff --git a/docs/motif/makewxmotif b/docs/motif/makewxmotif
index cc86aad8130849464f4e1df1cca0e09dc94e2044..d2927541ec9431ba13d6f9915b536657be3260ee 100644 (file)
--- a/docs/motif/makewxmotif
+++ b/docs/motif/makewxmotif
@@ -5,7 +5,7 @@
 # Note that this uses standard (but commonly-used) configure options;
 # if you're feeling brave, you may wish to compile with threads.
 # -- Julian Smart
-chmod a+x configure config.sub config.guess setup/general/* setup/shared/*
-./configure --with-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --without-threads
-make makefiles
+rm -f *.cache
+chmod a+x configure config.sub config.guess
+./configure --disable-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-sockets --without-odbc --without-threads --enable-newgrid
 make

diff --git a/docs/readme.txt b/docs/readme.txt
index cb0634e350b5c7fd0641bb3012f77e00d8ddb885..8a5a31f112322d9d1b91ab5238cd5518a2465145 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -116,7 +116,6 @@ wxMotif-2.x.y.tgz          wxMotif source distribution. You will
    -- OR --                from the zip set (above).
 
 wx2_x_y_gen.zip
-wx2_x_y_msw.zip
 wx2_x_y_mot.zip
 jpeg.zip
 

diff --git a/docs/release.txt b/docs/release.txt
index ab13ab2b65ed8459e4385b70520c171575e312ae..390473d269d779b4e43f3268f86de66d3bdf2b1b 100644 (file)
--- a/docs/release.txt
+++ b/docs/release.txt
@@ -31,4 +31,9 @@ wxWindows Release Notes
 
 - wxHTML printing has spacing problems under Windows, and may not
   work fully under Unix. Hopefully this will be resolved for 2.1.12.
-  
+
+- wxStaticBox under Windows obscures controls placed within it:
+  this will be fixed in 2.1.12.
+
+- wxStaticBitmap under Windows doesn't respect the transparency mask.
+

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 5316ad60872d9de1941b445162c09752494fd9e0..8e8be7a5454e6b0ca40e47c9e8dba5ac6fd785b9 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 10:10, 1999/11/06
+# This file was automatically generated by tmake at 22:33, 1999/11/08
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -212,6 +212,7 @@ MSWOBJS = accel.obj &
        filedlg.obj &
        font.obj &
        fontdlg.obj &
+       fontenum.obj &
        fontutil.obj &
        frame.obj &
        gauge95.obj &
@@ -220,9 +221,11 @@ MSWOBJS = accel.obj &
        gsocket.obj &
        helpwin.obj &
        icon.obj &
+       imaglist.obj &
        iniconf.obj &
        joystick.obj &
        listbox.obj &
+       listctrl.obj &
        main.obj &
        mdi.obj &
        menu.obj &
@@ -231,6 +234,7 @@ MSWOBJS = accel.obj &
        minifram.obj &
        msgdlg.obj &
        nativdlg.obj &
+       notebook.obj &
        oleutils.obj &
        ownerdrw.obj &
        palette.obj &
@@ -262,6 +266,7 @@ MSWOBJS = accel.obj &
        thread.obj &
        timer.obj &
        tooltip.obj &
+       treectrl.obj &
        utils.obj &
        utilsexc.obj &
        uuid.obj &
@@ -402,6 +407,9 @@ font.obj:     $(MSWDIR)\font.cpp
 fontdlg.obj:     $(MSWDIR)\fontdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fontenum.obj:     $(MSWDIR)\fontenum.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 fontutil.obj:     $(MSWDIR)\fontutil.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -426,6 +434,9 @@ helpwin.obj:     $(MSWDIR)\helpwin.cpp
 icon.obj:     $(MSWDIR)\icon.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+imaglist.obj:     $(MSWDIR)\imaglist.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 iniconf.obj:     $(MSWDIR)\iniconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -435,6 +446,9 @@ joystick.obj:     $(MSWDIR)\joystick.cpp
 listbox.obj:     $(MSWDIR)\listbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+listctrl.obj:     $(MSWDIR)\listctrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 main.obj:     $(MSWDIR)\main.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -459,6 +473,9 @@ msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+notebook.obj:     $(MSWDIR)\notebook.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 oleutils.obj:     $(OLEDIR)\oleutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -552,6 +569,9 @@ timer.obj:     $(MSWDIR)\timer.cpp
 tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+treectrl.obj:     $(MSWDIR)\treectrl.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 utils.obj:     $(MSWDIR)\utils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 4444b261809175d10dad0fcdcb9c3c8b64d4360c..aebe08ac3959d08b6d478bd7a7dd10abcd8f2bf9 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -315,7 +315,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( m_windowStyle & wxTR_LINES_AT_ROOT )
         wstyle |= TVS_LINESATROOT;
 
-#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
+#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined( __WATCOMC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
 #if !defined(__VISUALC__) || (__VISUALC__ > 1010)

diff --git a/utils/tex2rtf/docs/tex2rtf.hpj b/utils/tex2rtf/docs/tex2rtf.hpj
index 50e4491fc45068088903628f998569611037f595..b00537e2d3f04dafc73ca58ad75fcc2525ff6dba 100644 (file)
--- a/utils/tex2rtf/docs/tex2rtf.hpj
+++ b/utils/tex2rtf/docs/tex2rtf.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxwind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
 TITLE=Tex2RTF Manual
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/utils/tex2rtf/docs/tex2rtf.tex b/utils/tex2rtf/docs/tex2rtf.tex
index bb6bd0ba3bb11c47b20bad7770e72e7f4506eb20..43b8fe5345ed4fd7c5f2d928c2167bc3359e2432 100644 (file)
--- a/utils/tex2rtf/docs/tex2rtf.tex
+++ b/utils/tex2rtf/docs/tex2rtf.tex
@@ -8,11 +8,11 @@
 \parskip=10pt%
 \parindent=0pt%
 %\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only
-\winhelpignore{\title{Manual for Tex2RTF 1.64:\\A \LaTeX\ to RTF and HTML converter}%
+\winhelpignore{\title{Manual for Tex2RTF 2.0:\\A \LaTeX\ to RTF and HTML converter}%
 \author{Julian Smart}%
-\date{October 1997}%
+\date{November 1999}%
 }%
-\winhelponly{\title{Manual for Tex2RTF 1.64}%
+\winhelponly{\title{Manual for Tex2RTF 2.0}%
 \author{by Julian Smart\\$$\image{1cm;0cm}{tex2rtf.wmf}$$}%
 }%
 \makeindex%
@@ -84,24 +84,13 @@ C++ class library \popref{wxWindows}{wxwindows}.
 
 \section{Status of Tex2RTF}\index{status of Tex2RTF}%
 
-Tex2RTF is under continual development, often following users'
-suggestions. From version 1.33, Tex2RTF is effectively in a second phase
-of development. In addition to the bare minimum of syntax and facilities
-for producing useable help systems or linear RTF, commands are being
-added to allow visually effective, even aesthetically pleasing,
-documentation to be produced.
-
-Examples are the \verb$\indented$, \verb$\twocollist$ and \verb$\marginpar$\rtfsp
-commands; over time I hope to be able to reproduce most of the popular
-styles of formatting and presentation in Windows Help files, whilst
-allowing a reasonable equivalent to be generated in the other formats.
-
-Some new developments in the various formats still need to be catered
-for by Tex2RTF, such as Windows 95 help files and HTML 3.0. Features
-that can be added to Tex2RTF as a result of these developments include
-math and inline image map support in HTML, table support in Windows
-Help, and generally better formatting abilities in both. However, documentation
-about these formats is sketchy at the time of writing (October 1995).
+Windows HTML help, and wxWindows 2 wxHTML help, are now catered for using
+the htmlWorkshopFiles setting.
+
+Tex2RTF is very rarely updated these days: it would be nice to
+rewrite the parser (and indeed the rest of it) at some point,
+to improve error reporting, space handling and ability to
+handle more advanced Tex/Latex commands.
 
 \section{Acknowledgements}\index{acknowledgements}%
 
@@ -111,7 +100,7 @@ a great help in giving advice for improvements to the manual.
 
 \section{Change log}\index{change log}%
 
-Version 1.65, August 24th 1999
+Version 2.0, August 24th 1999
 
 \begin{itemize}\itemsep=0pt
 \item Added htmlWorkshopFiles setting, to output .hpp, .hhc