Added bc_ide.txt as a tech note; updated readme; added CHM targets for makefiles

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

contrib/docs/latex/ogl/ogl.hpj

@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxwind~1\docs\latex\ogl ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxwind~1\contrib\docs\latex\ogl ; Assume that bitmaps are where the source is
 TITLE=OGL Manual
 CONTENTS=Contents
 COMPRESS=HIGH

contrib/src/ogl/makefile.vc

@@ -132,7 +132,7 @@ DOCSOURCES=$(LOCALDOCDIR)\ogl.tex \
  $(LOCALDOCDIR)\topics.tex $(LOCALDOCDIR)\sample.tex
 
 html: $(DOCDIR)\html\ogl\ogl.htm
-htmlhelp: $(DOCDIR)\html\ogl\ogl.chm
+htmlhelp: $(DOCDIR)\htmlhelp\ogl.chm
 hlp: $(DOCDIR)\winhelp\ogl.hlp
 pdfrtf: $(DOCDIR)\pdf\ogl.rtf
 ps: $(DOCDIR)\ps\ogl.ps
@@ -170,13 +170,12 @@ $(DOCDIR)\html\ogl\ogl.htm:         $(DOCSOURCES)
         -erase $(DOCDIR)\html\ogl\*.ref
         cd $(THISDIR)
 
-
+$(DOCDIR)\htmlhelp\ogl.chm: $(DOCDIR)\html\ogl\ogl.htm $(DOCDIR)\html\ogl\ogl.hhp
-$(DOCDIR)\html\ogl\ogl.chm: $(DOCDIR)\html\ogl\ogl.htm $(DOCDIR)\html\ogl\ogl.hhp
 	cd $(DOCDIR)\html\ogl
 	-hhc ogl.hhp
+    move ogl.chm $(DOCDIR)\htmlhelp\ogl.chm
 	cd $(THISDIR)
 
-
 $(LOCALDOCDIR)\ogl.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex ogl
@@ -193,4 +192,3 @@ $(WXDIR)\docs\ps\ogl.ps:	$(LOCALDOCDIR)\ogl.dvi
         move ogl.ps $(WXDIR)\docs\ps\ogl.ps
         cd $(THISDIR)
 
-

distrib/msw/wisebott.txt

@@ -21,7 +21,7 @@ item: Set Variable
   Value=%GROUPDIR%\%GROUP%
 end
 item: Create Shortcut
-  Source=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Source=%MAINDIR%\Docs\htmlhelp\Wx.chm
   Destination=%GROUP%\wxWindows Manual.lnk
   Working Directory=%MAINDIR%
 end
@@ -31,17 +31,17 @@ item: Create Shortcut
   Working Directory=%MAINDIR%
 end
 item: Create Shortcut
-  Source=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Source=%MAINDIR%\docs\htmlhelp\dialoged.chm
   Destination=%GROUP%\Dialog Editor Help.lnk
   Working Directory=%MAINDIR%
 end
 item: Create Shortcut
-  Source=%MAINDIR%\contrib\docs\winhelp\ogl.hlp
+  Source=%MAINDIR%\contrib\docs\htmlhelp\ogl.chm
   Destination=%GROUP%\Object Graphics Library Help.lnk
   Working Directory=%MAINDIR%
 end
 item: Create Shortcut
-  Source=%MAINDIR%\docs\winhelp\tex2rtf.hlp
+  Source=%MAINDIR%\docs\htmlhelp\tex2rtf.chm
   Destination=%GROUP%\Tex2RTF Help.lnk
   Working Directory=%MAINDIR%
 end
@@ -91,7 +91,7 @@ end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=wxWindows Manual
-  Command Line=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Command Line=%MAINDIR%\Docs\htmlhelp\wx.chm
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon
@@ -115,19 +115,19 @@ end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Dialog Editor Help
-  Command Line=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Command Line=%MAINDIR%\docs\htmlhelp\dialoged.chm
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Object Graphics Library Help
-  Command Line=%MAINDIR%\contrib\docs\winhelp\ogl.hlp
+  Command Line=%MAINDIR%\contrib\docs\htmlhelp\ogl.chm
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon
   Group=%GROUP%
   Icon Name=Tex2RTF Help
-  Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp
+  Command Line=%MAINDIR%\docs\htmlhelp\tex2rtf.chm
   Default Directory=%MAINDIR%
 end
 item: Add ProgMan Icon

distrib/msw/wx_chm.rsp

@@ -1,2 +1,3 @@
 docs/htmlhelp/*.chm
+contrib/docs/htmlhelp/*.chm
 

distrib/msw/wx_htb.rsp

@@ -1,2 +1,3 @@
 docs/htb/*.htb
+contrib/docs/htb/*.htb
 

distrib/msw/zipdist.bat

@@ -1,11 +1,11 @@
 @echo off
-rem Zip up an external, generic + Windows distribution of wxWindows 2.0
+rem Zip up an external, generic + Windows distribution of wxWindows 2
 set src=%wxwin
 set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_16
+set version=2.1.16
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -36,37 +36,48 @@ if direxist %dest\wx deltree /Y %dest\wx
 cd %src
 echo Zipping...
 
-zip32 -@ %dest\wx%version%_gen.zip < %src\distrib\msw\generic.rsp
+Rem Zip up the complete wxMSW-xxx.zip file
-zip32 -@ -u %dest\wx%version%_gen.zip < %src\distrib\msw\makefile.rsp
+Rem NO, do it by unarchiving component files, deleting/copying some files, then
-zip32 -@ %dest\wx%version%_msw.zip < %src\distrib\msw\msw.rsp
+Rem rearchiving.
-zip32 -@ -u %dest\wx%version%_msw.zip < %src\distrib\msw\makefile.rsp
+Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp
-zip32 -@ %dest\wx%version%_gtk.zip < %src\distrib\msw\gtk.rsp
+Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp
-zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
+Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
-zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
+Rem zip32 -@ -u %dest\wxMSW-%version%.zip  < %src\distrib\msw\jpeg.rsp
-zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
+Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
-zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
-Rem (Obsolete) zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
 
-zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
+Rem Below is the old-style separated-out format. This is retained only
-zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
+Rem for local use, and for creating wxMSW-xxx.zip.
-zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp
-zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
+zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
-zip32 -@ %dest\wx%version%_htb.zip < %src\distrib\msw\wx_htb.rsp
+zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx%version%_chm.zip < %src\distrib\msw\wx_chm.rsp
+zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
+zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
+zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
+Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp
+
+zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
+zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
+zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
 zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp
 
 rem VC++ project files
-zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
+zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp
 
 rem BC++ project files
-zip32 -@ %dest\wx%version%_bc.zip < %src\distrib\msw\bc.rsp
+zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp
 
 rem CodeWarrior project files
-zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp
+zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp
 
 rem OGL 3
 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
@@ -121,14 +132,14 @@ Rem After this change of directory, we're in the
 Rem temporary 'wx' directory and not acting on
 Rem the source wxWindows directory.
 cd %dest\wx
-unzip32 -o ..\wx%version%_msw.zip
+unzip32 -o ..\wxWindows-%version%-msw.zip
-unzip32 -o ..\wx%version%_gen.zip
+unzip32 -o ..\wxWindows-%version%-gen.zip
-unzip32 -o ..\wx%version%_vc.zip
+unzip32 -o ..\wxWindows-%version%-vc.zip
-unzip32 -o ..\wx%version%_bc.zip
+unzip32 -o ..\wxWindows-%version%-bc.zip
-unzip32 -o ..\wx%version%_hlp.zip
+unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip
 unzip32 -o ..\extradoc.zip
 Rem Need Word file, for Remstar DB classes
-unzip32 -o ..\wx%version%_wrd.zip
+unzip32 -o ..\wxWindows-%version%-Word.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 unzip32 -o ..\tiff.zip
@@ -143,9 +154,12 @@ erase /SY Makefile.in
 erase /Y docs\html\wxbook.htm docs\html\roadmap.htm
 erase /Y contrib\docs\winhelp\mmedia.*
 erase /Y contrib\docs\winhelp\stc.*
+erase /Y contrib\docs\htmlhelp\mmedia.*
+erase /Y contrib\docs\htmlhelp\stc.*
 erase /Y contrib\docs\pdf\*.*
 deltree /Y contrib\docs\latex\ogl
 erase /Y src\mingegcs.bat
+erase /Y distrib
 
 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin
@@ -156,6 +170,9 @@ copy %src\bin\life.exe bin
 copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
 copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
 
+Rem Make wxMSW-xxx.zip
+zip32 ..\wxMSW-%version%.zip *
+
 rem Time to regenerate the WISE install script, wxwin2.wse.
 rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
 rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
@@ -169,7 +186,7 @@ set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
 echo Invoking %wisecmd...
 start %wisecmd
 pause Press any key to continue with the wxWindows distribution...
-Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
+Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\wxMSW-%version%-setup.exe
 
 cd %dest
 
@@ -196,7 +213,7 @@ ren setup.w07 s
 ren s setup.w07
 
 rem Put all the setup files into a single zip archive.
-zip32 wx%version%_setup.zip readme.txt setup.*
+zip32 wxWindows-%version%-setup.zip readme.txt setup.*
 
 echo wxWindows archived.
 

docs/latex/wx/flexsizr.tex

@@ -1,7 +1,7 @@
 \section{\class{wxFlexGridSizer}}\label{wxflexgridsizer}
 
-A flex grid sizer is a sizer which lays out its children in a two-
+A flex grid sizer is a sizer which lays out its children in a two-dimensional
-dimensional table with all table fields in one row having the same 
+table with all table fields in one row having the same 
 height and all fields in one column having the same width.
 
 \wxheading{Derived from}
@@ -18,8 +18,7 @@ height and all fields in one column having the same width.
 
 Constructor for a wxGridSizer. {\it rows} and {\it cols} determine the number of
 columns and rows in the sizer - if either of the parameters is zero, it will be
-calculated form the total number of children in the sizer, thus making the
+calculated to form the total number of children in the sizer, thus making the
 sizer grow dynamically. {\it vgap} and {\it hgap} define extra space between
 all children.
 
-

docs/latex/wx/function.tex

@@ -28,7 +28,7 @@ wxWindows 2.2.
 
 \membersection{wxCHECK\_VERSION}\label{wxcheckversion}
 
-\func{bool}{wxCHECK\_VERSION}{\param{major, minor, release}}
+\func{bool}{wxCHECK\_VERSION}{\param{}{major, minor, release}}
 
 This is a macro which evaluates to true if the current wxWindows version is at
 least major.minor.release.
@@ -37,7 +37,7 @@ For example, to test if the program is compiled with wxWindows 2.2 or higher,
 the following can be done:
 
 \begin{verbatim}
-wxString s;
+    wxString s;
 #if wxCHECK_VERSION(2, 2, 0)
     if ( s.StartsWith("foo") )
 #else // replacement code for old version

docs/latex/wx/gridsizr.tex

@@ -1,7 +1,7 @@
 \section{\class{wxGridSizer}}\label{wxgridsizer}
 
-A grid sizer is a sizer which lays out its children in a two-
+A grid sizer is a sizer which lays out its children in a two-dimensional
-dimensional table with all table fields having the same size,
+table with all table fields having the same size,
 i.e. the width of each field is the width of the widest child,
 the height of each field is the height of the tallest child.
 
@@ -18,8 +18,7 @@ the height of each field is the height of the tallest child.
 
 Constructor for a wxGridSizer. {\it rows} and {\it cols} determine the number of
 columns and rows in the sizer - if either of the parameters is zero, it will be
-calculated form the total number of children in the sizer, thus making the
+calculated to form the total number of children in the sizer, thus making the
 sizer grow dynamically. {\it vgap} and {\it hgap} define extra space between
 all children.
 
-

docs/latex/wx/image.tex

@@ -805,6 +805,16 @@ Sets the handler extension.
 
 \docparam{extension}{Handler extension.}
 
+\membersection{wxImageHandler::SetMimeType}\label{wximagehandlersetmimetype}
+
+\func{void}{SetMimeType}{\param{const wxString\& }{mimetype}}
+
+Sets the handler MIME type.
+
+\wxheading{Parameters}
+
+\docparam{mimename}{Handler MIME type.}
+
 \membersection{wxImageHandler::SetType}
 
 \func{void}{SetType}{\param{long }{type}}
@@ -815,14 +825,3 @@ Sets the handler type.
 
 \docparam{name}{Handler type.}
 
-
-\membersection{wxImageHandler::SetMimeType}
-
-\func{void}{SetMimeType}{\param{const wxString\& }{mimetype}}
-
-Sets the handler MIME type.
-
-\wxheading{Parameters}
-
-\docparam{mimename}{Handler MIME type.}
-

docs/motif/install.txt

@@ -19,17 +19,12 @@ First steps
 - Prerequisites: Motif 1.2 or above, or Lesstif
   (not yet tested). Motif 2.0 and above may also be suitable.
 
-- Download the appropriate .tgz archive, or alternatively the files
+- Download wxMotif-x.y.z.tgz, where x.y.z is the version number.
-  wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a
+  Download documentation in a preferred format, such as
-  preferred format, such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
+  wxWindows-HTML.zip or wxWindows-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
+  directory.
-  to convert the ASCII files to Unix format. Don't worry about files being
-  overwritten: they should be identical anyway.
-
-  (See http://www.cdrom.com/pub/infozip/ if you don't have zip/unzip
-  already installed. Zip isn't the same as gzip!)
 
 - It is recommended that you install bison and flex; using yacc
   and lex may require tweaking of the makefiles. You also need

docs/motif/issues.txt

@@ -5,6 +5,8 @@ Last updated 19/3/2000.
 
 See also: todo.txt.
 
+- Sockets not yet working since idle wake-up not implemented.
+
 - wxTextCtrl doesn't work as a stream buffer in Linux/gcc.
 
 - No wxSpinButton.
@@ -21,8 +23,8 @@ See also: todo.txt.
   e.g. wxScrolledWindows, so maybe have wxSystemSettings value for
   scrollbar colour, and/or ability to set scrollbar colour independently.
 
-- wxFrame can accept events, but apps cannot draw into it for some reason,
+- wxFrame can accept events, but apps cannot draw into it for
-  so the rotate sample won't work. Workaround: use an embedded wxWindow.
+  Workaround: use an embedded wxWindow.
 
 - In Life! sample, text above slider isn't legible.
 

docs/msw/install.txt

@@ -299,7 +299,7 @@ some samples) you need to compile them with bc32.ide.
 Note (3): the debug version of the wxWindows library is about 40 MB, and the
 release version is around 5 MB.
 
-See also the file bc_ide.txt for further instructions and details
+See also the file docs/tech/tn0007.txt for further instructions and details
 of how to create your own project files.
 
 Borland C++Builder compilation
@@ -325,6 +325,10 @@ project and they will get linked in in preference to any files in the
 lib; just make sure that your include path finds all the wx include
 files.
 
+NOTE: these instructions are a work in progress. For alternative
+and more detailed instructions on using the C++Builder
+IDE with wxWindows, see the file docs/tech/tn0004.txt.
+
 Watcom C++ 10.6/11 compilation
 ---------------------------
 

docs/readme.txt

@@ -1,4 +1,4 @@
-wxWindows 2.1.15
+wxWindows 2.1.16
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -50,74 +50,79 @@ file for each platform (available via docs/html/index.htm) for details.
 Files
 -----
 
-The distribution is available in a number of formats.
+The distribution is available in archive formats appropriate to the
-The most convenient is the platform-specific distribution,
+target system. Documentation is available mainly in zip format,
-but the zip set forms a more complete distribution, for example if
+and in .tgz format where appropriate. Some add-on libraries (such
-you wish to take part in wxWindows development. Also, add-ons
+as the Object Graphics Library) are available in zip form only.
-such as OGL may only be available in zip form.
+In the following, x.y.z represents the current version number.
-
-Zip set
--------
-
-Depending on what you downloaded, you may have one or more of
-these ports. You may unarchive any or all of the ports into
-the same directory hierarchy. The zip archive set comprises the
-following, where x is the minor version and y the release number:
-
-wx2_x_y_gen.zip            Generic source code and samples (required)
-wx2_x_y_msw.zip            Windows-specific source code
-wx2_x_y_mot.zip            Motif-specific source code
-wx2_x_y_gtk.zip            GTK-specific source code
-wx2_x_y_stubs.zip          Stubs ('empty port') source. Needs
-                           wx2_x_y_gen.zip/tgz.
-wx2_x_y_doc.zip            Documentation source code (not required)
-wx2_x_y_hlp.zip            WinHelp documentation
-wx2_x_y_pdf.zip            Acrobat PDF documentation
-wx2_x_y_htm.zip            HTML documentation
-wx2_x_y_vc.zip             MS VC++ 5/6 project files
-wx2_x_y_bc.zip             Borland C++ 5 project files
-wx2_x_y_cw.zip             Metrowerks CodeWarrior 4.1 project files
-jpeg.zip                   Optional JPEG library
-tiff.zip                   Optional TIFF library
-ogl3.zip                   Optional Object Graphics Library
-mmedia.zip                 Optional MMedia class library (Motif, GTK, MSW)
-stc.zip                    Optional wxStyledTextCtrl library (Motif, GTK, MSW)
-tex2rtf2.zip               Tex2RTF documentation tool
 
 wxWindows for GTK distribution
 ------------------------------
 
-wxGTK-2.x.y.tgz            wxGTK source distribution. You will
+wxGTK-x.y.z.tgz                    wxGTK source distribution. You will
-                           need the HTML and/or PDF documentation
+                                   need the HTML, HTB and/or PDF documentation
-                           from the zip set (above).
+                                   (see below)
+wxGTK-demos-x.y.z.tgz              wxGTK demos source
+wxGTK-samples-x.y.z.tgz            wxGTK samples source
+wxGTK-x.y.z-0.src.rpm              wxGTK Linux source as an RPM, without manuals
+wxGTK-x.y.z-0.i386.rpm             wxGTK Linux binaries as an RPM, without manuals
+wxGTK-devel-x.y.z-0.i386.rpm       wxGTK Linux minimum development system as an RPM
 
 wxWindows for Motif distribution
 --------------------------------
 
-wxMotif-2.x.y.tgz          wxMotif source distribution. You will
+wxMotif-x.y.z.tgz                  wxMotif source distribution. Contains
-                           need the HTML and/or PDF documentation
+                                   TIFF, JPEG, Tex2RTF source plus HTML
-   -- OR --                from the zip set (above).
+                                   documentation.
 
-wx2_x_y_gen.zip
+wxWindows for MS Windows distribution
-wx2_x_y_mot.zip
+-------------------------------------
-jpeg.zip
-tiff.zip
 
-wxWindows for Windows distribution
+setup.exe, setup.w*                Setup files (Windows 95/98, NT)
-----------------------------------
+                                   in floppy-disk-sized chunks
+wxMSW-x.y.z-setup.zip              Zip archive containing the
+                                   setup files
+wxMSW-x.y.z.zip                    Zip archive containing all the
+                                   files that are in the setup
+                                   distribution
 
-As well as the core source, the Windows setup contains:
+As well as the core source, the wxMSW distribution contains:
 
-- Windows Help versions of the documentation (docs/winhelp);
+- Windows HTML Help versions of the documentation (docs/htmlhelp);
-- OGL 3 (Object Graphics Library, in contrib/src/ogl);
+- Object Graphics Library, in contrib/src/ogl;
 - a Dialog Editor binary;
 - a Tex2RTF binary;
 - Life! sample binary;
 - the JPEG library source;
 - the TIFF library source.
 
-setup.exe               Setup file (Windows 95/98, NT)
+Documentation files
-setup.*                 Other setup files
+-------------------
+
+wxWindows-x.y.z-WinHelp.zip        WinHelp documentation
+wxWindows-x.y.z-PDF.zip            Acrobat PDF documentation
+wxWindows-x.y.z-HTML.zip           HTML documentation
+wxWindows-x.y.z-HTMLHelp.zip       Windows HTML Help documentation
+wxWindows-x.y.z-HTB.zip            wxHTML documentation (for
+                                   use with the helpview utility)
+wxWindows-x.y.z-Word.zip           MS Word documentation (currently,
+                                   database class documentation only)
+wxWindows-x.y.z-DocSource.zip      Documentation source code (not required)
+
+Add-ons
+-------
+
+wxWindows-x.y.z-cw.zip             Metrowerks CodeWarrior 4.1 project files
+jpeg.zip                           JPEG library (already included
+                                   in most distributions)
+tiff.zip                           TIFF library (already included
+                                   in most distributions)
+ogl3.zip                           Optional Object Graphics Library
+mmedia.zip                         Optional MMedia library (Motif, GTK, MSW)
+stc.zip                            Optional wxStyledTextCtrl library
+                                   (Motif, GTK, MSW)
+tex2rtf2.zip                       Tex2RTF documentation tool
+wxGTK-gl-x.y.z-0.i386.rpm          add-on OpenGL binary as an RPM
 
 Installation
 ------------
@@ -208,5 +213,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, 19 March, 2000
+The wxWindows Team, 23rd May, 2000
 

docs/tech/index.txt

@@ -4,5 +4,6 @@ TN0003   Adding wxWindows class documentation
 TN0004   Compiling a sample in the C++Builder 1.0 IDE
 TN0005   Adding a wxWindows contribution
 TN0006   Making and installing RPMs for wxWindows
+TN0007   Using and modifying the BC++ IDE files
 
 Version: $Id$

docs/tech/tn0007.txt

@@ -1,3 +1,6 @@
+Using and modifying the BC++ IDE files
+======================================
+
 Readme for wxWindows 2.0 Ide-files
 First release Feb. 1999, detlev@reymann-online.de
 

samples/makefile.vc

@@ -235,7 +235,7 @@ clean:
         cd $(WXDIR)\samples\png
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\plot
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\printing
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\proplist

src/msw/makefile.vc

@@ -668,7 +668,7 @@ pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
 html:	wxhtml
 wxhtml:	$(DOCDIR)\html\wx\wx.htm htb
-htmlhelp: $(DOCDIR)\html\wx\wx.chm
+htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
 ps:     wxps referencps
 wxps:	$(WXDIR)\docs\ps\wx.ps
 referencps:	$(WXDIR)\docs\ps\referenc.ps
@@ -779,6 +779,7 @@ $(DOCDIR)/pdf/techref.rtf:         $(DOCDIR)/latex/techref/techref.tex
 $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex
         cd $(DOCDIR)\latex\wx
         -mkdir $(DOCDIR)\html\wx
+        copy *.gif $(DOCDIR)\html\wx
         -start $(WAITFLAG) tex2rtf $(DOCDIR)\latex\wx\manual.tex $(DOCDIR)\html\wx\wx.htm -twice -html
         -erase $(DOCDIR)\html\wx\*.con
         -erase $(DOCDIR)\html\wx\*.ref
@@ -786,7 +787,7 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
         -erase $(DOCDIR)\latex\wx\*.ref
          cd $(THISDIR)
 
-$(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
+$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
 	cd $(DOCDIR)\html\wx
 	-hhc wx.hhp
     -mkdir ..\..\htmlhelp

src/wxvc.dsp

@@ -552,6 +552,10 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\plot.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File

src/wxvc_dll.dsp

@@ -554,6 +554,10 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\plot.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File

utils/dialoged/docs/tex2rtf.ini

@@ -14,6 +14,11 @@ htmlBrowseButtons = bitmap
 winHelpVersion = 3
 winHelpContents = yes
 winHelpTitle = "Dialog Editor Manual"
+;;
+;; These two are for generating MS HTML Help project, contents and index files.
+;;
+htmlWorkshopFiles = true
+htmlIndex = true
 truncateFilenames = yes
 \overview [2] { \sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}}
 \htmlonly{\image{}{books.gif}}\helpref{#1}{#2}

utils/dialoged/src/makefile.vc

@@ -84,6 +84,7 @@ DOCSOURCES=$(LOCALDOCDIR)\dialoged.tex $(LOCALDOCDIR)\body.tex\
  $(LOCALDOCDIR)\classes.tex $(LOCALDOCDIR)\tech.tex
 
 html: $(DOCDIR)\html\dialoged\dlged.htm
+htmlhelp: $(DOCDIR)\htmlhelp\dialoged.chm
 hlp: $(DOCDIR)\winhelp\dialoged.hlp
 pdfrtf: $(DOCDIR)\pdf\dialoged.rtf
 ps: $(DOCDIR)\ps\dialoged.ps
@@ -110,11 +111,18 @@ $(DOCDIR)\pdf\dialoged.rtf: $(DOCSOURCES)
 $(DOCDIR)\html\dialoged\dlged.htm:         $(DOCSOURCES)
         cd $(LOCALDOCDIR)
         -mkdir $(DOCDIR)\html\dialoged
+        -copy *.gif $(DOCDIR)\html\dialoged
         -start /w tex2rtf $(LOCALDOCDIR)\dialoged.tex $(DOCDIR)\html\dialoged\dlged.htm -twice -html
         -erase $(DOCDIR)\html\dialoged\*.con
         -erase $(DOCDIR)\html\dialoged\*.ref
         cd $(THISDIR)
 
+$(DOCDIR)\htmlhelp\dialoged.chm : $(DOCDIR)\html\dialoged\dlged.htm $(DOCDIR)\html\dialoged\dlged.hhp
+	cd $(DOCDIR)\html\dialoged
+	-hhc dlged.hhp
+    move $(DOCDIR)\html\dialoged\dlged.chm $(DOCDIR)\htmlhelp\dialoged.chm
+	cd $(THISDIR)
+
 $(LOCALDOCDIR)\dialoged.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex dialoged

utils/tex2rtf/docs/tex2rtf.ini

@@ -13,6 +13,11 @@ listItemIndent=40
 winHelpContents = yes
 winHelpVersion = 3 ; 3 for Windows 3.x, 4 for Windows 95
 generateHPJ = yes
+;;
+;; These two are for generating MS HTML Help project, contents and index files.
+;;
+htmlWorkshopFiles = true
+htmlIndex = true
 htmlBrowseButtons = bitmap
 winHelpTitle = "Tex2RTF Manual"
 truncateFilenames = yes

utils/tex2rtf/docs/tex2rtf.tex

@@ -8,7 +8,7 @@
 \parskip=10pt%
 \parindent=0pt%
 %\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only
-\winhelpignore{\title{Manual for Tex2RTF 2.0:\\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{November 1999}%
 }%

utils/tex2rtf/src/makefile.vc

@@ -91,6 +91,7 @@ cleanall:
 DOCSOURCES=$(LOCALDOCDIR)\tex2rtf.tex
 
 html: $(DOCDIR)\html\tex2rtf\t2rtf.htm
+htmlhelp: $(DOCDIR)\htmlhelp\tex2rtf.chm
 hlp: $(DOCDIR)\winhelp\tex2rtf.hlp
 pdfrtf: $(DOCDIR)\pdf\tex2rtf.rtf
 ps: $(WXDIR)\docs\ps\tex2rtf.ps
@@ -118,11 +119,18 @@ $(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES)
 $(DOCDIR)\html\tex2rtf\t2rtf.htm:         $(DOCSOURCES)
         cd $(LOCALDOCDIR)
         -mkdir $(DOCDIR)\html\tex2rtf
+        -copy *.gif $(DOCDIR)\html\tex2rtf
         -start /w tex2rtf $(LOCALDOCDIR)\tex2rtf.tex $(DOCDIR)\html\tex2rtf\t2rtf.htm -twice -html
         -erase $(DOCDIR)\html\tex2rtf\*.con
         -erase $(DOCDIR)\html\tex2rtf\*.ref
         cd $(THISDIR)
 
+$(DOCDIR)\htmlhelp\tex2rtf.chm : $(DOCDIR)\html\tex2rtf\t2rtf.htm $(DOCDIR)\html\tex2rtf\t2rtf.hhp
+	cd $(DOCDIR)\html\tex2rtf
+	-hhc t2rtf.hhp
+    move t2rtf.chm $(DOCDIR)\htmlhelp\tex2rtf.chm
+	cd $(THISDIR)
+
 $(LOCALDOCDIR)\tex2rtf.dvi:	$(DOCSOURCES)
 	cd $(LOCALDOCDIR)
         -latex tex2rtf