This commit was manufactured by cvs2svn to create tag 'TESTED'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/TESTED@4425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Various fixes for various compilers...
1999-11-07 18:34:36 +00:00 · 1999-11-07 18:34:36 +00:00 · 1999-11-07 16:44:45 +00:00 · 1999-11-07 16:08:25 +00:00 · 1999-11-07 15:26:56 +00:00 · 1999-11-07 15:06:13 +00:00
1710 changed files with 209076 additions and 78225 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,7 @@ bin
 .gdb_history
 Test
 config.cache
+configarg.cache
 config.status
 system.list
 linux.system.cache
@@ -17,6 +18,9 @@ linux-gnu.system.cache
 *.ncb
 *.pro
 *.opt
+*.d
+*.swp
+*.swo
 Release
 Debug
 ReleaseDLL
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -35,6 +35,27 @@ and its make.exe).
 -> Set your path so that it includes the directory
   where your compiler and tools reside

+b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's
+     Win32 headers
+
+Using the newer gcc-2.95/Noralander header combination
+will allow you to compile more of the MSW code, such
+as OLE and Drag-n-Drop.
+
+Instructions are similar to those for Regular Mingw32 except
+
+->Get the compiler from
+    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
+
+->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches.
+  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
+  different versions of the headers floating around.
+
+->Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
+  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+  If using MINGW32, also set the MINGW32VERSION variable
+  appropriately.
+

 c) Build instructions

@@ -58,6 +79,9 @@ c) Build instructions

   and iostreams ares disabled with
   #define wxUSE_STD_IOSTREAM   0
+
+   note: ODBC and SOCKETS can be 1 for gcc-2.95
+
 -> type: cd c:\wxWin\src\msw
 -> type: make -f makefile.g95  (if using GNU tools)
 or type: make -f makefile.vc   (if using MS VC++)
@@ -141,7 +165,7 @@ To cross compile the windows library, do
 (or whatever you called it)
 Now run configure. There are two ways to do this
 -> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
-   --enable-dnd=no
+   --enable-dnd=no --without-odbc
 where --build= should read whatever platform you're building on. Configure
 will notice that build and host platforms differ, and automatically prepend
 i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
@@ -157,6 +181,9 @@ Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
 [ Update: some new mingw32 versions now have a new set of windows header
 files, which apparently can handle ole. Untested at the moment ]

+ODBC files don't compile as of 13.10.99 - may be this will be fixed by the
+moment you're reading these lines.
+
 Configure will conclude that shared libraries are out of the question and
 opt for a static one. I haven't looked into DLL creation yet.

@@ -165,14 +192,37 @@ Type
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)

+NB: you risk to get quite a few warnings about "ANSI C++ forbids implicit
+    conversion from 'void *'" in all places where va_arg macro is used. This
+    is due to a bug in (some versions of) mingw32 headers which may be
+    corrected by editing the file
+
+    ${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
+
+    (instead of egcs-2.91.57 you may have something different), searching for
+    the lines
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
+typedef char *__gnuc_va_list;
+#else
+typedef void *__gnuc_va_list;
+#endif
+#endif
+
+    and adding "|| defined(_WIN32)" to the list of platforms on which
+    __gnuc_va_list is char *.
+
 If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try
 building the minimal sample:

 -> cd samples/minimal
 -> make
-> mv minimal minimal.exe

-and run it with wine, for example
+and run it with wine, for example (or copy to a Windows box)
 -> wine minimal.exe

 If all is well, do an install; from win32
--- a/Makefile.in
+++ b/Makefile.in
--- a/Mingw32-gcc295.patches
+++ b/Mingw32-gcc295.patches
@@ -0,0 +1,116 @@
+*** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999
+--- basetyps.h Fri Aug 06 11:14:36 1999
+***************
+*** 74,91 ****
+--- 74,97 ----
+   STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
+  }
+  #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+
+ #ifndef GUID_DEFINED
+ #define GUID_DEFINED
+  typedef struct _GUID
+  {
+      unsigned long Data1;
+      unsigned short Data2;
+      unsigned short Data3;
+      unsigned char Data4[8];
+  } GUID;
+ #endif /* GUID_DEFINED */
+  typedef GUID *REFGUID;
+  typedef GUID *LPGUID;
+ #ifndef UUID_DEFINED
+ #define UUID_DEFINED
+  typedef GUID UUID;
+ #endif /* UUID_DEFINED */
+  typedef GUID IID;
+  typedef GUID CLSID;
+  typedef CLSID *LPCLSID;
+  typedef IID *LPIID;
+
+
+*** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999
+--- oaidl.h Fri Aug 06 13:18:48 1999
+***************
+*** 39,44 ****
+--- 39,53 ----
+  #define IMPLTYPEFLAG_FRESTRICTED 4
+  #define IMPLTYPEFLAG_FDEFAULTVTABLE 8
+
+ #define DISPID_UNKNOWN ( -1 )
+ #define DISPID_VALUE ( 0 )
+ #define DISPID_PROPERTYPUT ( -3 )
+ #define DISPID_NEWENUM ( -4 )
+ #define DISPID_EVALUATE ( -5 )
+ #define DISPID_CONSTRUCTOR ( -6 )
+ #define DISPID_DESTRUCTOR ( -7 )
+ #define DISPID_COLLECT ( -8 )
+
+  typedef interface ITypeLib *LPTYPELIB;
+  typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
+  typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
+***************
+*** 49,54 ****
+--- 58,73 ----
+  typedef interface IDispatch *LPDISPATCH;
+  typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
+
+ extern "C" const IID IID_ITypeLib;
+ extern "C" const IID IID_ICreateTypeInfo;
+ extern "C" const IID IID_ICreateTypeInfo2;
+ extern "C" const IID IID_ICreateTypeLib;
+ extern "C" const IID IID_ICreateTypeLib2;
+ extern "C" const IID IID_ITypeInfo;
+ extern "C" const IID IID_IErrorInfo;
+ extern "C" const IID IID_IDispatch;
+ extern "C" const IID IID_ICreateErrorInfo;
+
+  typedef enum tagSYSKIND {
+   SYS_WIN16,SYS_WIN32,SYS_MAC
+  } SYSKIND;
+***************
+*** 375,382 ****
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID)
+PURE;
+!  STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+--- 394,401 ----
+   STDMETHOD_(ULONG,Release)(THIS) PURE;
+   STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+   STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+!  STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*)
+PURE;
+!  STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+  };
+
+  #ifdef __cplusplus
+
+
+*** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999
+--- objidl.h Fri Aug 06 11:00:19 1999
+***************
+*** 627,633 ****
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+--- 627,633 ----
+   STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
+   STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
+   STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
+!  STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
+   STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
+   STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
+   STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**);
+
+
+
+
--- a/2389
+++ b/2389
--- a/configure.in
+++ b/configure.in
--- a/distrib/msw/bc.rsp
+++ b/distrib/msw/bc.rsp
@@ -1,3 +1,2 @@
 src/bc32.ide
-src/bc32d.ide
 samples/bc32.ide
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -3,6 +3,7 @@ BuildCVS.txt
 acconfig.h
 *.m4
 autogen.sh
+configure
 config.guess
 config.sub
 configure.in
@@ -16,10 +17,21 @@ modules
 template.mak
 wx-config.in
 makefile.unx.in
+wxinstall
+Makefile

 distrib/msw/*.rsp
 distrib/msw/*.bat
+distrib/msw/*.cpp
+distrib/msw/*.txt
 distrib/msw/tardist
+distrib/msw/tmake/*.t
+distrib/msw/tmake/Makefile
+distrib/msw/tmake/filelist.txt
+distrib/msw/tmake/makeall.bat
+distrib/msw/tmake/makeall.sh
+distrib/msw/tmake/wxwin.pro
+distrib/msw/tmake/tmake.conf
 distrib/gtk/*

 locale/*.po
@@ -37,7 +49,14 @@ docs/bugs.txt
 docs/*.htm
 docs/html/*.htm
 docs/html/*.gif
+docs/html/*.png

+src/makeenvs/*.env
+src/make.env
+src/makeprog.env
+src/makelib.env
+
+src/Makefile
 src/*.inc
 src/mkdir
 src/Makefile
@@ -66,6 +85,7 @@ src/html/*.h
 src/html/bitmaps/*.xpm

 src/unix/*.cpp
+src/unix/*.c

 src/png/*.c
 src/png/*.h
@@ -97,6 +117,7 @@ include/wx/protocol/*.h
 include/wx/wx_setup.vms
 include/wx/common/*.h
 include/wx/generic/*.h
+include/wx/generic/*.xpm
 include/wx/unix/*.h
 include/wx/html/*.h
 include/wx/html/msw/*.bmp
@@ -104,8 +125,6 @@ include/wx/html/msw/*.ico
 include/wx/html/msw/*.rc
 lib/dummy

-bin/*.*
-
 tools/gettext/*.*

 bitmaps/xpm/16x16/*.*
@@ -238,6 +257,18 @@ samples/config/*.bmp
 samples/config/*.rc
 samples/config/*.wav

+samples/db/*.cpp
+samples/db/*.h
+samples/db/*.def
+samples/db/makefile*
+samples/db/*.xbm
+samples/db/*.xpm
+samples/db/*.txt
+samples/db/*.ico
+samples/db/*.bmp
+samples/db/*.rc
+samples/db/*.wav
+
 samples/dynamic/*.cpp
 samples/dynamic/*.h
 samples/dynamic/*.def
@@ -607,6 +638,17 @@ samples/grid/*.xpm
 samples/grid/*.ico
 samples/grid/*.bmp

+samples/newgrid/*.cpp
+samples/newgrid/*.h
+samples/newgrid/*.def
+samples/newgrid/*.rc
+samples/newgrid/*.txt
+samples/newgrid/makefile*
+samples/newgrid/*.xbm
+samples/newgrid/*.xpm
+samples/newgrid/*.ico
+samples/newgrid/*.bmp
+
 samples/internat/*.cpp
 samples/internat/*.h
 samples/internat/*.def
@@ -868,6 +910,21 @@ samples/html/zip/*.png
 samples/html/zip/*.ico
 samples/html/zip/*.htm
 samples/html/zip/*.html
+samples/html/zip/*.zip
+
+samples/html/helpview/*.cpp
+samples/html/helpview/*.h
+samples/html/helpview/makefile*
+samples/html/helpview/*.rc
+samples/html/helpview/*.def
+samples/html/helpview/*.bmp
+samples/html/helpview/*.xpm
+samples/html/helpview/*.xbm
+samples/html/helpview/*.png
+samples/html/helpview/*.ico
+samples/html/helpview/*.htm
+samples/html/helpview/*.html
+samples/html/helpview/test.zip

 samples/richedit/*.cpp
 samples/richedit/*.h
@@ -907,3 +964,75 @@ samples/wizard/*.png
 samples/wizard/*.ico
 samples/wizard/*.txt

+samples/console/*.cpp
+samples/console/*.h
+samples/console/makefile*
+samples/console/*.rc
+samples/console/*.def
+samples/console/*.bmp
+samples/console/*.xpm
+samples/console/*.xbm
+samples/console/*.png
+samples/console/*.ico
+samples/console/*.txt
+
+samples/font/*.cpp
+samples/font/*.h
+samples/font/makefile*
+samples/font/*.rc
+samples/font/*.def
+samples/font/*.bmp
+samples/font/*.xpm
+samples/font/*.xbm
+samples/font/*.png
+samples/font/*.ico
+samples/font/*.txt
+
+samples/nettest/*.cpp
+samples/nettest/*.h
+samples/nettest/makefile*
+samples/nettest/*.rc
+samples/nettest/*.def
+samples/nettest/*.bmp
+samples/nettest/*.xpm
+samples/nettest/*.xbm
+samples/nettest/*.png
+samples/nettest/*.ico
+samples/nettest/*.txt
+
+samples/scrollsub/*.cpp
+samples/scrollsub/*.h
+samples/scrollsub/makefile*
+samples/scrollsub/*.rc
+samples/scrollsub/*.def
+samples/scrollsub/*.bmp
+samples/scrollsub/*.xpm
+samples/scrollsub/*.xbm
+samples/scrollsub/*.png
+samples/scrollsub/*.ico
+samples/scrollsub/*.txt
+
+samples/menu/*.cpp
+samples/menu/*.h
+samples/menu/makefile*
+samples/menu/*.rc
+samples/menu/*.def
+samples/menu/*.bmp
+samples/menu/*.xpm
+samples/menu/*.xbm
+samples/menu/*.png
+samples/menu/*.ico
+samples/menu/*.txt
+
+samples/font/*.cpp
+samples/font/*.h
+samples/font/makefile*
+samples/font/*.rc
+samples/font/*.def
+samples/font/*.bmp
+samples/font/*.xpm
+samples/font/*.xbm
+samples/font/*.png
+samples/font/*.ico
+samples/font/*.txt
+
--- a/distrib/msw/glcanvas.rsp
+++ b/distrib/msw/glcanvas.rsp
@@ -1,3 +1,4 @@
+utils/glcanvas/Makefile.in
 utils/glcanvas/docs/*.*
 utils/glcanvas/win/*.cpp
 utils/glcanvas/win/*.h
--- a/distrib/msw/gtk.rsp
+++ b/distrib/msw/gtk.rsp
@@ -1,3 +1,5 @@
+configure
+
 distrib/gtk/copy_src
 distrib/gtk/README.txt
 distrib/gtk/Setup
@@ -8,15 +10,10 @@ docs/gtk/COPYING.LIB
 docs/gtk/makewxgtk

 include/wx/gtk/*.h
+include/wx/gtk/*.xpm
 include/install-sh
 include/wx/install-sh

-src/Makefile
-src/gtk.inc
-src/make.env
-src/makelib.env
-src/makeprog.env
-
 src/gtk/Makefile
 src/gtk/*.cpp
 src/gtk/*.c
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -1,3 +1,4 @@
+Makefile.in
 src/Makefile
 locale/Makefile
 samples/Makefile.in
@@ -6,6 +7,7 @@ samples/caret/Makefile.in
 samples/checklst/Makefile.in
 samples/config/Makefile.in
 samples/controls/Makefile.in
+samples/db/Makefile.in
 samples/dialogs/Makefile.in
 samples/dnd/Makefile.in
 samples/docview/Makefile.in
@@ -42,6 +44,9 @@ samples/validate/Makefile.in
 samples/wizard/Makefile.in
 samples/wxpoem/Makefile.in
 samples/wxsocket/Makefile.in
+samples/nettest/Makefile.in
+samples/scrollsub/Makefile.in
+utils/glcanvas/motif/Makefile.in
 utils/Makefile.in
 utils/wxMMedia2/Makefile.in
 utils/wxMMedia2/lib/Makefile.in
--- a/distrib/msw/makewise.bat
+++ b/distrib/msw/makewise.bat
@@ -0,0 +1,51 @@
+@echo off
+Rem Make a WISE Installer distribution list, where each file is represented by
+Rem a section like this:
+Rem 
+Rem item: Install File
+Rem   Source=d:\wx2\thefile.txt
+Rem   Destination=%MAINDIR%\thefile.txt
+Rem   Flags=0000000000000010
+Rem end
+
+Rem Generate a list of all files in the distribution.
+dir /BS >& %TEMP\files1.tmp
+
+Rem Now we iterate through the list of files, writing out the middle section of
+Rem the file.
+Rem We have to remove the first part of the path,
+Rem by truncating the start by the size of the current directory.
+
+set sz=%@EVAL[%@LEN[%_CWD]+1]
+set len=%@LINES[%TEMP\files1.tmp]
+
+erase /Y %TEMP\files2.tmp
+
+Rem, first add system files
+cat %WXWIN\distrib\msw\wisesys.txt > %temp\files2.tmp
+
+do i = 0 to %len by 1
+    set line=%@LINE[%TEMP\files1.tmp,%i]
+    Rem Skip directories.
+    if isdir %line enddo
+    set sz2=%@LEN[%line]
+    set n=%@EVAL[%sz2-%sz]
+    set line2=%@SUBSTR[%line,%sz,%n]
+
+    Rem Echo the file section
+    echo item: Install File >> %TEMP\files2.tmp
+    echo   Source=%line >> %TEMP\files2.tmp
+    echo   Destination=%%MAINDIR%%\%line2 >> %TEMP\files2.tmp
+    echo   Flags=0000000000000010 >> %TEMP\files2.tmp
+    echo end >> %TEMP\files2.tmp
+enddo
+
+Rem Concatenate the 3 sections
+cat %WXWIN\distrib\msw\wisetop.txt %TEMP\files2.tmp %WXWIN\distrib\msw\wisebott.txt > %WXWIN\distrib\msw\wxwin2.wse
+
+erase /Y %TEMP\files1.tmp
+rem erase /Y %TEMP\files2.tmp
+
+goto end
+
+:end
--- a/distrib/msw/motif.rsp
+++ b/distrib/msw/motif.rsp
@@ -1,20 +1,3 @@
-install-sh
-Makefile
-template.mak
-configure
-configure.in
-config.guess
-config.sub
-wx-config.in
-mkinstalldirs
-wxinstall
-
-src/makeenvs/*.env
-src/make.env
-src/makeprog.env
-src/makelib.env
-
-src/Makefile
 src/motif.inc

 src/motif/*.cpp
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,3 +1,10 @@
+Mingw32-gcc295.patches
+
+lib/watcom/*.txt
+lib/watcom/*.lib
+lib/watcom/*.bat
+lib/bcc16/*.lib
+
 docs/licence.txt
 docs/msw/*.txt
 docs/wine/*.txt
@@ -5,7 +12,6 @@ docs/wine/COPYING.LIB

 distrib/msw/*.rsp
 distrib/msw/*.bat
-distrib/msw/tmake/*.t

 tools/gettext/xgettext.exe
 tools/gettext/msgfmt.exe
@@ -44,6 +50,8 @@ src/*.bat

 src/common/dosyacc.c
 src/common/doslex.c
+src/common/y_tab.c
+src/common/lex_yy.c

 src/msw/*.cpp
 src/msw/*.h
@@ -52,12 +60,8 @@ src/msw/*.lst
 src/msw/*.def
 src/msw/*.inc
 src/msw/winestub.c
+src/msw/gsocket.c

-src/msw/ctl3d/*.*
-src/msw/ctl3d/msvc/*.*
-src/msw/ctl3d/wat32/*.*
-src/msw/ctl3d/wat386/*.*
-src/msw/ctl3d/borland/*.*
 src/msw/ole/*.cpp
 src/msw/*.prj

--- a/distrib/msw/ogl.rsp
+++ b/distrib/msw/ogl.rsp
@@ -1,3 +1,4 @@
+utils/ogl/Makefile.in
 utils/ogl/Makefile

 utils/ogl/src/*.cpp
--- a/distrib/msw/readme.txt
+++ b/distrib/msw/readme.txt
@@ -0,0 +1,36 @@
+Distribution scripts and lists
+-----------------------------------------------------------------
+
+This directory (distrib\msw) contains some 4DOS batch files
+(.bat) and 'response' files (.rsp) to simplify the job of
+producing distributions. The .rsp files specify which files are
+associated with a particular module, e.g. wx200vc.rsp refers to
+the VC++ project files, wx200gen.rsp represents the generic files,
+wx200msw.rsp specifies the Windows specific files, etc.
+
+When making a distribution on Windows, I call zipdist.bat to prepare
+zip files with everything needed for Windows,
+GTK and Motif. zipdist then unzips some of them into
+deliver\wx, removes and adds a few files to perfect the
+distribution.
+
+zipdist then calls 'makewise.bat' to generate a new wxwin2.wse
+script, for WISE Installer. It takes wisetop.txt, wisebott.txt
+and adds the section for file installation. (If you've modified
+wxwin2.wse using WISE Installer, simply compile and run splitwise.exe
+to put back up-to-date wisetop.txt, wisebott.txt files before
+running zipdist.)
+
+Finally, zipdist runs WISE Installer using a command line
+argument to produce the setup.* files automatically.
+
+Note that although zipdist.bat produces archives for 3 platforms,
+I only use a subset of these to produce the Windows-specific
+setup.exe. I then have the option of distributing the zip files
+as well.
+
+You may need to install 4DOS to run these scripts. If anyone
+wishes to remove 4DOS dependency, that's fine with me.
+
+Julian Smart, 11th October 1999
+
--- a/distrib/msw/splitwise.cpp
+++ b/distrib/msw/splitwise.cpp
@@ -0,0 +1,106 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        splitwise.cpp
+// Purpose:     Use this to split wxwin2.wse in the distrib/msw directory
+//              into wisetop.txt, wisebott.txt. This allows you to do the
+//              following:
+//
+//              1) Edit the existing wxwin2.wse in WISE Install.
+//              2) Call splitwise.exe to split off the non-file bits (i.e.
+//                 preserve everything except the "item: Install File" lines).
+//              3) Call makewise.bat to generate a new wxwin2.wse from
+//                 wisetop.txt, wisebott.txt and the file list generated
+//                 from the files in deliver\wx (which themselves have been
+//                 put there by zipdist.bat).
+//
+//              If you don't wish to change the WISE settings, then there's no
+//              need to use splitwise, but it's very likely that settings will
+//              be altered, e.g. to change the version number, what's installed,
+//              etc.
+//
+// Author:      Julian Smart
+// Modified by:
+// Created:     13/10/99
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char g_Line[1024];
+
+int ReadLine(FILE* fd, char* buf)
+{
+    int ch;
+    int i = 0;
+    while (((ch = getc(fd)) != EOF) && (ch != '\n'))
+    {
+        buf[i] = ch;
+        i ++;
+    }
+    buf[i] = 0;
+
+    if (ch == EOF && (i == 0))
+        return 0;
+    else
+        return 1;
+}
+
+void WriteLine(FILE* fd, char* buf)
+{
+    int len = strlen(buf);
+    int i;
+    for (i = 0; i < len; i++)
+        putc(buf[i], fd);
+    putc('\n', fd);
+}
+
+int main(int argc, char* argv[])
+{
+    FILE* wiseTop = fopen("wisetop.txt", "w");
+    if (!wiseTop)
+        return 1;
+
+    FILE* wiseBottom = fopen("wisebott.txt", "w");
+    if (!wiseBottom)
+        return 1;
+
+    FILE* wiseWhole = fopen("wxwin2.wse", "r");
+    if (!wiseWhole)
+        return 1;
+
+    // Write out the top of the file
+    g_Line[0] = 0;
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        if (strcmp(g_Line, "item: Install File") == 0)
+            break;
+        else
+            WriteLine(wiseTop, g_Line);
+    }
+    // Skip to the end of the file items
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        if ((strncmp(g_Line, "item:", 5) == 0) && (strcmp(g_Line, "item: Install File") != 0))
+        {
+            WriteLine(wiseBottom, g_Line);
+            break;
+        }
+    }
+    // Write the rest of the bottom
+    while (ReadLine(wiseWhole, g_Line))
+    {
+        WriteLine(wiseBottom, g_Line);
+    }
+
+    fclose(wiseTop);
+    fclose(wiseBottom);
+    fclose(wiseWhole);
+
+    return 0;
+}
+
+
--- a/distrib/msw/tmake/Makefile
+++ b/distrib/msw/tmake/Makefile
@@ -13,6 +13,7 @@ all: $(MSW_MAKEFILES_DIR)/makefile.vc \
     $(MSW_MAKEFILES_DIR)/makefile.sc \
     $(MSW_MAKEFILES_DIR)/makefile.wat \
     $(MSW_MAKEFILES_DIR)/makefile.g95 \
+     $(MSW_MAKEFILES_DIR)/makefile.g295 \
     $(WXDIR)/Makefile.in

 $(MSW_MAKEFILES_DIR)/makefile.vc: filelist.txt wxwin.pro
@@ -36,5 +37,8 @@ $(MSW_MAKEFILES_DIR)/makefile.wat: filelist.txt wxwin.pro
 $(MSW_MAKEFILES_DIR)/makefile.g95: filelist.txt wxwin.pro
 	$(TMAKE) -t g95 wxwin.pro -o $@

+$(MSW_MAKEFILES_DIR)/makefile.g295: filelist.txt wxwin.pro g295.t
+	$(TMAKE) -t g295 wxwin.pro -o $@
+
 $(WXDIR)/Makefile.in: filelist.txt wxwin.pro
 	$(TMAKE) -t unx wxwin.pro -o $@
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -38,6 +38,8 @@
            next;
        }

+        $isCFile = $file =~ /\.c$/;
+
        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
        $file =~ s/cp?p?$/obj/;
        my $obj = "\$(MSWDIR)\\" . $file . " ";
@@ -47,7 +49,7 @@
            #! remember that this file is in ole subdir
            $project{"WXOLEOBJS"} .= $obj;
        }
-
+        $project{"WXCOBJS"} .= $obj if $isCFile;
    }
 #$}

@@ -201,7 +203,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    foreach (@objs) {
        $text .= $_ . ": ";
        if ( $project{"WXOLEOBJS"} =~ /\Q$_/ ) { s/MSWDIR/OLEDIR/; }
-        s/obj$/\$(SRCSUFF)/;
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
        $text .= $_ . "\n\n";
    }
 #$}
@@ -305,7 +308,7 @@ $(CFG): makefile.b32
 -WE
 -tWM

-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
 -I$(WXDIR)\include\wx\msw\gnuwin32

 -L$(BCCDIR)\lib
@@ -334,7 +337,10 @@ cleanall: clean


 MFTYPE=b32
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+# makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
 	cd $(WXWIN)\distrib\msw\tmake
 	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
 	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -2,6 +2,11 @@
 #! File:    bcc.t
 #! Purpose: tmake template file from which makefile.bcc is generated by running
 #!          tmake -t bcc wxwin.pro -o makefile.bcc
+#!
+#!          TODO:
+#!          - resourc2.obj is not correctly generated (see list and target).
+#!          - cpp is incorrectly substituted into filenames containing 'obj'
+#!
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$
@@ -36,14 +41,17 @@
    }

    #! special hack for Borland in 16 bits needs this file
-    $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.cpp';
+    $project{"WXCOMMONOBJS"} .= '${MSWDIR}\resourc2.obj';

    foreach $file (sort keys %wxMSW) {
        #! don't take files not appropriate for 16-bit Windows
        next if $wxMSW{$file} =~ /\b(32|O)\b/;

+        $isCFile = $file =~ /\.c$/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        $project{"WXMSWOBJS"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
    }
 #$}

@@ -94,7 +102,7 @@ PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=

 !if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif

 !if "$(USE_XPM_IN_MSW)" == "1"
@@ -137,7 +145,10 @@ wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 	erase $(LIBTARGET)
 	tlib $(LIBTARGET) /P1024 @&&!
-+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+$(COMMONOBJS:.obj =.obj +)\
+$(GENERICOBJS:.obj =.obj +)\
+$(MSWOBJS:.obj =.obj +)\
+$(PERIPH_LIBS:.lib =.lib +)
 !

 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -162,7 +173,8 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    my @objs = split;
    foreach (@objs) {
        $text .= $_ . ": ";
-        s/obj/\$(SRCSUFF)/;
+        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
+        s/obj$/$suffix/;
        $text .= $_ . "\n\n";
    }
 #$}
@@ -177,7 +189,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
        $text .= $_ . ": ";
        $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
        s/MSWDIR/COMMDIR/;
-        s/obj/$suffix/;
+        s/obj$/$suffix/;
        $text .= $_ . "\n\n";
    }
 #$}
@@ -192,7 +204,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
    foreach (@objs) {
        $text .= $_ . ": ";
        s/MSWDIR/GENDIR/;
-        s/obj/\$(SRCSUFF)/;
+        s/obj$/\$(SRCSUFF)/;
        $text .= $_ . "\n\n";
    }
 #$}
@@ -214,19 +226,14 @@ all_execs:

 all_libs:
    cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+    make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
          wxstring wxtree mfutils # wxxpm

 all_contribs:
    cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
+    make -f makefile.bcc fafa wxstring itsy gauge # wxxpm

 # CONTRIB
-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.bcc -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
 wxxpm:	$(CFG)
 	cd $(WXDIR)\src\xpm
 	make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
@@ -269,7 +276,7 @@ $(CFG): makefile.bcc
 -Fs-
 -Vf
 -Ff=4
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
 -I$(WXDIR)\include\wx\msw\gnuwin32
 -L$(BCCDIR)\lib
 -D__WXWIN__
@@ -302,7 +309,10 @@ cleanall: clean


 MFTYPE=bcc
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+# Can't use this or we'll have to distribute all tmake files with wxWindows
+#makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
+
+self:
 	cd $(WXWIN)\distrib\msw\tmake
 	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
 	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
--- a/distrib/msw/tmake/dos.t
+++ b/distrib/msw/tmake/dos.t
@@ -6,7 +6,6 @@
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
-
 #${
    #! include the code which parses filelist.txt file and initializes
    #! %wxCommon, %wxGeneric and %wxMSW hashes.
@@ -15,7 +14,7 @@
    #! now transform these hashes into $project tags
    foreach $file (sort keys %wxGeneric) {
        if ( $wxGeneric{$file} =~ /\b(PS|G|U)\b/ ) {
-            #! this file for some reason was compiled for VC++ 1.52
+            #! this file for some reason wasn't compiled for VC++ 1.52
            next unless $file =~ /^prntdlgg\./;
        }

@@ -23,23 +22,34 @@
        $project{"WXGENERICOBJS"} .= "\$(GENDIR)\\" . $file . " "
    }

+    #! because we later search for " <filename> " in this string
+    $project{"WXCOBJS"} = " ";
+
    foreach $file (sort keys %wxCommon) {
        #! socket files don't compile under Win16 currently
        next if $wxCommon{$file} =~ /\b(32|S)\b/;

+        $isCFile = $file =~ /\.c$/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXCOMMONOBJS"} .= "\$(COMMDIR)\\" . $file . " "
+        $obj = "\$(COMMDIR)\\" . $file . " ";
+        #! $project{"WXCOMMONOBJS"} .= $obj;
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXCOMMONOBJS1" : "WXCOMMONOBJS2"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
    }

    foreach $file (sort keys %wxMSW) {
        #! don't take files not appropriate for 16-bit Windows
        next if $wxMSW{$file} =~ /\b(32|O)\b/;

+        $isCFile = $file =~ /\.c$/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= "\$(MSWDIR)\\" . $file . " "
+        $obj = "\$(MSWDIR)\\" . $file . " ";
+        #! have to split lib in 2 halves because otherwise it's too big
+        $project{$file =~ "^[a-o]" ? "WXMSWOBJS1" : "WXMSWOBJS2"} .= $obj;
+        $project{"WXCOBJS"} .= $obj if $isCFile;
    }
 #$}
-
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!

@@ -101,58 +111,74 @@ MSWDIR=.

 GENERICOBJS= #$ ExpandList("WXGENERICOBJS");

-COMMONOBJS = \
+# we can't have all objects in one list because the library becomes too big
+COMMONOBJS1 = \
 		$(COMMDIR)\y_tab.obj \
-		#$ ExpandList("WXCOMMONOBJS");
+		#$ ExpandList("WXCOMMONOBJS1");

-MSWOBJS = #$ ExpandList("WXMSWOBJS");
+COMMONOBJS2 = \
+		#$ ExpandList("WXCOMMONOBJS2");
+
+# we can't have all objects in one list because the library becomes too big
+MSWOBJS1 = #$ ExpandList("WXMSWOBJS1");
+
+MSWOBJS2 = #$ ExpandList("WXMSWOBJS2");

 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS1) $(COMMONOBJS2) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)

 # Normal, static library
-all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
+all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib

-
-# $(WXDIR)\lib\wx.lib:      dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-# 	-erase $(LIBTARGET)
-# 	lib /PAGESIZE:128 @<<
-# $(LIBTARGET)
-# y
-# $(OBJECTS) $(PERIPH_LIBS)
-# nul
-# ;
-# <<
-
-$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS) $(PERIPH_LIBS)
+$(WXDIR)\lib\wx1.lib:      $(COMMONOBJS1) $(PERIPH_LIBS)
 	-erase $(WXDIR)\lib\wx1.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx1.lib
 y
-$(COMMONOBJS) $(PERIPH_LIBS)
+$(COMMONOBJS1) $(PERIPH_LIBS)
 nul
 ;
 <<

-$(WXDIR)\lib\wx2.lib:      $(GENERICOBJS)
+$(WXDIR)\lib\wx2.lib:      $(COMMONOBJS2)
 	-erase $(WXDIR)\lib\wx2.lib
 	lib /PAGESIZE:128 @<<
 $(WXDIR)\lib\wx2.lib
 y
+$(COMMONOBJS2)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx3.lib:      $(GENERICOBJS)
+	-erase $(WXDIR)\lib\wx3.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx3.lib
+y
 $(GENERICOBJS)
 nul
 ;
 <<

-$(WXDIR)\lib\wx3.lib:      $(MSWOBJS)
-	-erase $(WXDIR)\lib\wx3.lib
+$(WXDIR)\lib\wx4.lib:      $(MSWOBJS1)
+	-erase $(WXDIR)\lib\wx4.lib
 	lib /PAGESIZE:128 @<<
-$(WXDIR)\lib\wx3.lib
+$(WXDIR)\lib\wx4.lib
 y
-$(MSWOBJS)
+$(MSWOBJS1)
+nul
+;
+<<
+
+$(WXDIR)\lib\wx5.lib:      $(MSWOBJS2)
+	-erase $(WXDIR)\lib\wx5.lib
+	lib /PAGESIZE:128 @<<
+$(WXDIR)\lib\wx5.lib
+y
+$(MSWOBJS2)
 nul
 ;
 <<
@@ -174,15 +200,24 @@ $(CPPFLAGS) /YcWX/WXPREC.H /c /Tp $*.$(SRCSUFF)
 <<

 #${
-    $_ = $project{"WXMSWOBJS"} . $project{"WXCOMMONOBJS"} . $project{"WXGENERICOBJS"};
+    $_ = $project{"WXMSWOBJS1"} . $project{"WXMSWOBJS2"} . $project{"WXCOMMONOBJS1"} . $project{"WXCOMMONOBJS2"} . $project{"WXGENERICOBJS"};
    my @objs = split;
    foreach (@objs) {
+        if ( $project{"WXCOBJS"} =~ / \Q$_\E / ) {
+            s:\\:/:;
+            $text .= $_ . ':     $*.c' . "\n" .
+                 '        cl @<<' . "\n" .
+                 '$(CPPFLAGS2) /Fo$@ /c /Tc $*.c' . "\n" .
+                 "<<\n\n";
+        }
+        else {
            s:\\:/:;
            $text .= $_ . ':     $*.$(SRCSUFF)' . "\n" .
                 '        cl @<<' . "\n" .
                 '$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)' . "\n" .
                 "<<\n\n";
        }
+    }
 #$}

 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -47,6 +47,8 @@
            $wxHTML{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "U" ) {
            $wxUNIX{$fields[0]} = $fields[2];
+        } elsif ( $fields[1] eq "B" ) {
+            $wxBase{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "W" ) {
            $wxWXINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "P" ) {
@@ -55,7 +57,7 @@
            $wxHTMLINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "F" ) {
            $wxMOTIFINCLUDE{$fields[0]} = $fields[2];
-        } elsif ( $fields[1] eq "B" ) {
+        } elsif ( $fields[1] eq "9" ) {
            $wxMSWINCLUDE{$fields[0]} = $fields[2];
        } elsif ( $fields[1] eq "K" ) {
            $wxGTKINCLUDE{$fields[0]} = $fields[2];
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -7,6 +7,7 @@
 #
 # Format of this file: TAB separated columns. The first column contains the
 # filename, the second a letter corresonding a directory:
+#  B	/src/common but only needed for the wxBase compilation
 #  G	/src/generic
 #  C	/src/common
 #  M	/src/msw
@@ -17,7 +18,7 @@
 #  W	/include/wx
 #  K	/include/wx/gtk        K for gtK
 #  F	/include/wx/motif      F for motiF
-#  B	/include/wx/msw        B for Bill Gates
+#  9	/include/wx/msw        9 for Windows 9x
 #  N	/include/wx/generic    N for geNeric
 #  L	/include/wx/html       L for htmL
 #  P	/include/wx/protocol
@@ -28,6 +29,7 @@
 # compiler, &c)
 #
 # Known flags:
+#  B	makes part of the base library too
 #  16	a generic file implementing Win32 control for Win16
 #  32	only can be compiled under Win32
 #  PS	PostScript related file, normally not compiled under Windows
@@ -37,6 +39,7 @@
 #  S	Socket file (currently doesn't compile under Win16 nor with GNU)
 #  R	Not required for the GTK port
 #  X	Not required for the Motif port
+#
 #  WX	Base header
 #  GTK	GTK header
 #  MSW	MSW header
@@ -59,13 +62,15 @@ dcpsg.cpp	G	U
 dirdlgg.cpp	G	16
 fontdlgg.cpp	G	G,R
 filedlgg.cpp	G	U,X
-gridg.cpp	G
+grid.cpp	G
+helpext.cpp	G	G
 helphtml.cpp	G	G
 helpwxht.cpp	G	G
 helpxlp.cpp	G	G,R
 imaglist.cpp	G	16
 laywin.cpp	G
 listctrl.cpp	G	16
+logg.cpp	G
 msgdlgg.cpp	G	G
 notebook.cpp	G	16,R
 panelg.cpp	G
@@ -78,95 +83,107 @@ proplist.cpp	G
 sashwin.cpp	G
 scrolwin.cpp	G
 splitter.cpp	G
+statline.cpp	G	U,R
 statusbr.cpp	G
-tabg.cpp	G	R
+tabg.cpp	G
 numdlgg.cpp	G
 textdlgg.cpp	G
 tipdlg.cpp	G
 treectrl.cpp	G	16
 wizard.cpp	G

-choiccmn.cpp	C	R
+appcmn.cpp	C	B
+choiccmn.cpp	C
 cmndata.cpp	C
-config.cpp	C
-ctrlcmn.cpp	C	R
-date.cpp	C
+clipcmn.cpp	C
+config.cpp	C	B
+ctrlcmn.cpp	C
+ctrlsub.cpp	C
+date.cpp	C	B
 datstrm.cpp	C
 db.cpp	C
 dbtable.cpp	C
 dcbase.cpp	C
 dlgcmn.cpp	C
+dobjcmn.cpp	C
 docmdi.cpp	C
 docview.cpp	C
-dynarray.cpp	C
-dynlib.cpp	C
-event.cpp	C
-extended.c	C
-ffile.cpp	C
-file.cpp	C
-fileconf.cpp	C
-filefn.cpp	C
-filesys.cpp	C
+dynarray.cpp	C	B
+dynlib.cpp	C	B
+event.cpp	C	B
+extended.c	C	B
+ffile.cpp	C	B
+file.cpp	C	B
+fileconf.cpp	C	B
+filefn.cpp	C	B
+filesys.cpp	C	B
+fontcmn.cpp	C
+fontmap.cpp	C
 framecmn.cpp	C
 fs_inet.cpp	C
 fs_zip.cpp	C
 ftp.cpp	C	S
 gdicmn.cpp	C
 gifdecod.cpp	C
-hash.cpp	C
+hash.cpp	C	B
 helpbase.cpp	C
 http.cpp	C	S
 imagbmp.cpp	C
 image.cpp	C
+imagall.cpp	C
 imaggif.cpp	C
-imagjpeg.cpp	C
-imagpcx.cpp	C
-imagpng.cpp	C
-imagpnm.cpp	C
-intl.cpp	C
+imagjpeg.cpp	C	32
+imagpcx.cpp	C	32
+imagpng.cpp	C	32
+imagpnm.cpp	C	32
+init.cpp	B
+intl.cpp	C	B
 ipcbase.cpp	C
 layout.cpp	C
-list.cpp	C
-log.cpp	C
+lboxcmn.cpp	C
+list.cpp	C	B
+log.cpp	C	B
 memory.cpp	C
-mimetype.cpp	C	32
-module.cpp	C
+menucmn.cpp	C
+mimetype.cpp	C	32,B
+module.cpp	C	B
 mstream.cpp	C
-object.cpp	C
+object.cpp	C	B
 objstrm.cpp	C
-odbc.cpp	C	R
+odbc.cpp	C	R,X
 paper.cpp	C
 prntbase.cpp	C
-process.cpp	C	32
+process.cpp	C	32,B
 protocol.cpp	C	S
 resource.cpp	C
 sckaddr.cpp	C	S
 sckfile.cpp	C	S
 sckipc.cpp	C	S
 sckstrm.cpp	C	S
+serbase.cpp	C
 sizer.cpp	C
 socket.cpp	C	S
-stream.cpp	C
-strconv.cpp	C
-string.cpp	C
+stream.cpp	C	B
+strconv.cpp	C	B
+string.cpp	C	B
 tbarbase.cpp	C
-tbarsmpl.cpp	C	16
+tbarsmpl.cpp	C
 textcmn.cpp	C
-textfile.cpp	C
-time.cpp	C
-timercmn.cpp	C
-tokenzr.cpp	C
-txtstrm.cpp	C
+textfile.cpp	C	B
+time.cpp	C	B
+timercmn.cpp	C	B
+tokenzr.cpp	C	B
+txtstrm.cpp	C	B
 unzip.c	C
 url.cpp	C	S
-utilscmn.cpp	C
+utilscmn.cpp	C	B
 valgen.cpp	C
 validate.cpp	C
 valtext.cpp	C
-variant.cpp	C
+variant.cpp	C	B
 wfstream.cpp	C
 wincmn.cpp	C
-wxchar.cpp	C
+wxchar.cpp	C	B
 wxexpr.cpp	C
 zipstrm.cpp	C
 zstream.cpp	C
@@ -207,6 +224,8 @@ droptgt.cpp	M	O
 filedlg.cpp	M
 font.cpp	M
 fontdlg.cpp	M
+fontenum.cpp	M
+fontutil.cpp	M
 frame.cpp	M
 gauge95.cpp	M	32
 gaugemsw.cpp	M	16
@@ -232,7 +251,7 @@ ownerdrw.cpp	M
 palette.cpp	M
 pen.cpp	M
 penwin.cpp	M
-pnghand.cpp	M
+pnghand.cpp	M	32
 printdlg.cpp	M
 printwin.cpp	M
 radiobox.cpp	M
@@ -245,6 +264,7 @@ settings.cpp	M
 slider95.cpp	M	32
 slidrmsw.cpp	M	16
 spinbutt.cpp	M
+spinctrl.cpp	M
 statbmp.cpp	M
 statbox.cpp	M
 statbr95.cpp	M	32
@@ -265,9 +285,13 @@ uuid.cpp	M	O
 wave.cpp	M
 window.cpp	M
 xpmhand.cpp	M
+gsocket.c	M	S

+dialup.cpp	U
+fontenum.cpp	U
+fontutil.cpp	U
 threadpsx.cpp	U
-utilsunx.cpp	U
+utilsunx.cpp	U	B
 gsocket.c	U

 gsockgtk.c	R
@@ -299,7 +323,6 @@ fontdlg.cpp	R
 frame.cpp	R
 gauge.cpp	R
 gdiobj.cpp	R
-gsockgtk.c	R
 icon.cpp	R
 listbox.cpp	R
 main.cpp	R
@@ -316,6 +339,7 @@ scrolbar.cpp	R
 settings.cpp	R
 slider.cpp	R
 spinbutt.cpp	R
+spinctrl.cpp	R
 statbmp.cpp	R
 statbox.cpp	R
 statline.cpp	R
@@ -329,7 +353,7 @@ utilsres.cpp	R
 wave.cpp	R
 window.cpp	R

-gsockmot.cpp	X
+gsockmot.c	X	S
 accel.cpp	X
 app.cpp	X
 bitmap.cpp	X
@@ -337,6 +361,7 @@ bmpbuttn.cpp	X
 brush.cpp	X
 button.cpp	X
 checkbox.cpp	X
+checklst.cpp	X
 choice.cpp	X
 clipbrd.cpp	X
 colour.cpp	X
@@ -371,6 +396,7 @@ region.cpp	X
 scrolbar.cpp	X
 settings.cpp	X
 slider.cpp	X
+spinbutt.cpp	X
 statbmp.cpp	X
 statbox.cpp	X
 stattext.cpp	X
@@ -380,28 +406,29 @@ timer.cpp	X
 utils.cpp	X
 window.cpp	X

+helpdata.cpp	H
+helpfrm.cpp	H
+helpctrl.cpp	H
 htmlcell.cpp	H
-htmlfilter.cpp	H
-htmlhelp.cpp	H
-htmlhelp_io.cpp	H
-htmlparser.cpp	H
+htmlfilt.cpp	H
+htmlpars.cpp	H
 htmltag.cpp	H
 htmlwin.cpp	H
-htmlwinparser.cpp	H
-mod_fonts.cpp	H
-mod_hline.cpp	H
-mod_image.cpp	H
-mod_layout.cpp	H
-mod_links.cpp	H
-mod_list.cpp	H
-mod_pre.cpp	H
-mod_tables.cpp	H
-search.cpp	H
+winpars.cpp	H
+m_fonts.cpp	H
+m_hline.cpp	H
+m_image.cpp	H
+m_layout.cpp	H
+m_links.cpp	H
+m_list.cpp	H
+m_pre.cpp	H
+m_tables.cpp	H
+htmprint.cpp	H

 arrimpl.cpp	W
 listimpl.cpp	W
 accel.h	W
-app.h	W
+app.h	W	B
 bitmap.h	W
 bmpbuttn.h	W
 brush.h	W
@@ -421,9 +448,10 @@ combobox.h	W
 confbase.h	W
 config.h	W
 control.h	W
+ctrlsub.h	W
 cursor.h	W
 dataobj.h	W
-date.h	W
+date.h	W	B
 datstrm.h	W
 db.h	W
 dbtable.h	W
@@ -434,26 +462,31 @@ dcprint.h	W
 dcps.h	W
 dcscreen.h	W
 dde.h	W
-debug.h	W
-defs.h	W
+debug.h	W	B
+defs.h	W	B
 dialog.h	W
+dialup.h	W
 dirdlg.h	W
 dnd.h	W
 docmdi.h	W
 docview.h	W
 dragimag.h	W
-dynarray.h	W
-dynlib.h	W
-event.h	W
+dynarray.h	W	B
+dynlib.h	W	B
+event.h	W	B
 expr.h	W
-ffile.h	W
-file.h	W
-fileconf.h	W
+ffile.h	W	B
+file.h	W	B
+fileconf.h	W	B
 filedlg.h	W
 filefn.h	W
 filesys.h	W
 font.h	W
 fontdlg.h	W
+fontenum.h	W
+fontmap.h	W
+fontdlg.h	W
+fontutil.h	W
 frame.h	W
 fs_inet.h	W
 fs_zip.h	W
@@ -463,7 +496,7 @@ gdiobj.h	W
 gifdecod.h	W
 grid.h	W
 gsocket.h	W
-hash.h	W
+hash.h	W	B
 help.h	W
 helpbase.h	W
 helphtml.h	W
@@ -472,30 +505,30 @@ helpxlp.h	W
 icon.h	W
 image.h	W
 imaglist.h	W
-intl.h	W
+intl.h	W	B
 ioswrap.h	W
 ipcbase.h	W
 joystick.h	W
 layout.h	W
 laywin.h	W
-list.h	W
+list.h	W	B
 listbox.h	W
 listctrl.h	W
-log.h	W
-longlong.h	W
+log.h	W	B
+longlong.h	W	B
 matrix.h	W
 mdi.h	W
 memory.h	W
 menu.h	W
 menuitem.h	W
 metafile.h	W
-mimetype.h	W
+mimetype.h	W	B
 minifram.h	W
-module.h	W
+module.h	W	B
 msgdlg.h	W
 mstream.h	W
 notebook.h	W
-object.h	W
+object.h	W	B
 objstrm.h	W
 odbc.h	W
 ownerdrw.h	W
@@ -507,7 +540,7 @@ pnghand.h	W
 print.h	W
 printdlg.h	W
 prntbase.h	W
-process.h	W
+process.h	W	B
 progdlg.h	W
 prop.h	W
 propform.h	W
@@ -524,20 +557,21 @@ scrolbar.h	W
 scrolwin.h	W
 serbase.h	W
 settings.h	W
-setup.h	W
+setup.h	W	B
 sizer.h	W
 slider.h	W
 socket.h	W
 spinbutt.h	W
+spinctrl.h	W
 splitter.h	W
 statbmp.h	W
 statbox.h	W
 statline.h	W
 stattext.h	W
 statusbr.h	W
-strconv.h	W
-stream.h	W
-string.h	W
+strconv.h	W	B
+stream.h	W	B
+string.h	W	B
 tab.h	W
 tabctrl.h	W
 taskbar.h	W
@@ -547,35 +581,35 @@ tbarmsw.h	W
 tbarsmpl.h	W
 textctrl.h	W
 textdlg.h	W
-textfile.h	W
-txtstrm.h	W
-thread.h	W
-time.h	W
-timer.h	W
+textfile.h	W	B
+txtstrm.h	W	B
+thread.h	W	B
+time.h	W	B
+timer.h	W	B
 tipdlg.h	W
-tokenzr.h	W
+tokenzr.h	W	B
 toolbar.h	W
 tooltip.h	W
 treectrl.h	W
 types.h	W
 url.h	W
-utils.h	W
+utils.h	W	B
 valgen.h	W
 validate.h	W
 valtext.h	W
-variant.h	W
-version.h	W
+variant.h	W	B
+version.h	W	B
 wave.h	W
 wfstream.h	W
 window.h	W
-wx.h	W
+wx.h	W	B
 wx_cw.h	W
 wx_cw_cm.h	W
 wx_cw_d.h	W
-wxchar.h	W
+wxchar.h	W	B
 wxexpr.h	W
 wxhtml.h	W
-wxprec.h	W
+wxprec.h	W	B
 xpmhand.h	W
 zipstrm.h	W
 zstream.h	W
@@ -594,7 +628,9 @@ colour.h	K
 combobox.h	K
 control.h	K
 cursor.h	K
+dataform.h	K
 dataobj.h	K
+dataobj2.h	K
 dc.h	K
 dcclient.h	K
 dcmemory.h	K
@@ -624,6 +660,7 @@ scrolbar.h	K
 settings.h	K
 slider.h	K
 spinbutt.h	K
+spinctrl.h	K
 statbmp.h	K
 statbox.h	K
 statline.h	K
@@ -652,7 +689,9 @@ colour.h	F
 combobox.h	F
 control.h	F
 cursor.h	F
+dataform.h	F
 dataobj.h	F
+dataobj2.h	F
 dc.h	F
 dcclient.h	F
 dcmemory.h	F
@@ -695,120 +734,121 @@ timer.h	F
 toolbar.h	F
 window.h	F

-accel.h	B
-app.h	B
-bitmap.h	B
-bmpbuttn.h	B
-brush.h	B
-button.h	B
-caret.h	B
-checkbox.h	B
-checklst.h	B
-choice.h	B
-clipbrd.h	B
-colordlg.h	B
-colour.h	B
-combobox.h	B
-control.h	B
-curico.h	B
-curicop.h	B
-cursor.h	B
-dc.h	B
-dcclient.h	B
-dcmemory.h	B
-dcprint.h	B
-dcscreen.h	B
-dde.h	B
-dialog.h	B
-dib.h	B
-dibutils.h	B
-dirdlg.h	B
-dragimag.h	B
-filedlg.h	B
-font.h	B
-fontdlg.h	B
-frame.h	B
-gauge.h	B
-gauge95.h	B
-gaugemsw.h	B
-gdiobj.h	B
-helpwin.h	B
-icon.h	B
-imaglist.h	B
-iniconf.h	B
-joystick.h	B
-listbox.h	B
-listctrl.h	B
-mdi.h	B
-menu.h	B
-menuitem.h	B
-metafile.h	B
-minifram.h	B
-msgdlg.h	B
-msvcrt.h	B
-notebook.h	B
-palette.h	B
-pen.h	B
-pnghand.h	B
-pngread.h	B
-printdlg.h	B
-printwin.h	B
-private.h	B
-radiobox.h	B
-radiobut.h	B
-regconf.h	B
-region.h	B
-registry.h	B
-scrolbar.h	B
-settings.h	B
-setup0.h	B
-slider.h	B
-slider95.h	B
-slidrmsw.h	B
-spinbutt.h	B
-statbmp.h	B
-statbox.h	B
-statbr95.h	B
-statline.h	B
-stattext.h	B
-tabctrl.h	B
-taskbar.h	B
-tbar95.h	B
-tbarmsw.h	B
-textctrl.h	B
-timer.h	B
-tooltip.h	B
-treectrl.h	B
-wave.h	B
-window.h	B
-winundef.h	B
-xpmhand.h	B
-# blank.cur	B
-# bullseye.cur	B
-# child.ico	B
-# clock.cur	B
-# error.ico	B
-# hand.cur	B
-# heart.cur	B
-# info.ico	B
-# magnif1.cur	B
-# mdi.ico	B
-# noentry.cur	B
-# pbrush.cur	B
-# pencil.cur	B
-# pntleft.cur	B
-# pntright.cur	B
-# query.cur	B
-# question.ico	B
-# roller.cur	B
-# size.cur	B
-# std.ico	B
-# tip.ico	B
-# warning.ico	B
-# watch1.cur	B
-# disable.bmp	B
-# wx.rc	B
+accel.h	9
+app.h	9
+bitmap.h	9
+bmpbuttn.h	9
+brush.h	9
+button.h	9
+caret.h	9
+checkbox.h	9
+checklst.h	9
+choice.h	9
+clipbrd.h	9
+colordlg.h	9
+colour.h	9
+combobox.h	9
+control.h	9
+curico.h	9
+curicop.h	9
+cursor.h	9
+dc.h	9
+dcclient.h	9
+dcmemory.h	9
+dcprint.h	9
+dcscreen.h	9
+dde.h	9
+dialog.h	9
+dib.h	9
+dibutils.h	9
+dirdlg.h	9
+dragimag.h	9
+filedlg.h	9
+font.h	9
+fontdlg.h	9
+frame.h	9
+gauge.h	9
+gauge95.h	9
+gaugemsw.h	9
+gdiobj.h	9
+helpwin.h	9
+icon.h	9
+imaglist.h	9
+iniconf.h	9
+joystick.h	9
+listbox.h	9
+listctrl.h	9
+mdi.h	9
+menu.h	9
+menuitem.h	9
+metafile.h	9
+minifram.h	9
+msgdlg.h	9
+msvcrt.h	9
+notebook.h	9
+palette.h	9
+pen.h	9
+pnghand.h	9
+pngread.h	9
+printdlg.h	9
+printwin.h	9
+private.h	9
+radiobox.h	9
+radiobut.h	9
+regconf.h	9
+region.h	9
+registry.h	9
+scrolbar.h	9
+settings.h	9
+setup0.h	9
+slider.h	9
+slider95.h	9
+slidrmsw.h	9
+spinbutt.h	9
+statbmp.h	9
+statbox.h	9
+statbr95.h	9
+statline.h	9
+stattext.h	9
+tabctrl.h	9
+taskbar.h	9
+tbar95.h	9
+tbarmsw.h	9
+textctrl.h	9
+timer.h	9
+tooltip.h	9
+treectrl.h	9
+wave.h	9
+window.h	9
+winundef.h	9
+xpmhand.h	9
+# blank.cur	9
+# bullseye.cur	9
+# child.ico	9
+# clock.cur	9
+# error.ico	9
+# hand.cur	9
+# heart.cur	9
+# info.ico	9
+# magnif1.cur	9
+# mdi.ico	9
+# noentry.cur	9
+# pbrush.cur	9
+# pencil.cur	9
+# pntleft.cur	9
+# pntright.cur	9
+# query.cur	9
+# question.ico	9
+# roller.cur	9
+# size.cur	9
+# std.ico	9
+# tip.ico	9
+# warning.ico	9
+# watch1.cur	9
+# disable.bmp	9
+# wx.rc	9

+fontutil.h	S
 execute.h	S

 file.h	P
@@ -816,17 +856,19 @@ ftp.h	P
 http.h	P
 protocol.h	P

-forcelink.h	L
+forcelnk.h	L
+helpdata.h	L
+helpfrm.h	L
+helpctrl.h	L
 htmlcell.h	L
 htmldefs.h	L
-htmlfilter.h	L
-htmlhelp.h	L
-htmlparser.h	L
+htmlfilt.h	L
+htmlpars.h	L
 htmltag.h	L
 htmlwin.h	L
-htmlwinparser.h	L
-mod_templ.h	L
-version.h	L
+winpars.h	L
+m_templ.h	L
+htmprint.h	L

 caret.h	N
 choicdgg.h	N
@@ -835,6 +877,7 @@ dcpsg.h	N
 dirdlgg.h	N
 fontdlgg.h	N
 filedlgg.h	N
+grid.h	N
 gridg.h	N
 helpext.h	N
 helpwxht.h	N
--- a/distrib/msw/tmake/g295.t
+++ b/distrib/msw/tmake/g295.t
@@ -0,0 +1,263 @@
+#!#############################################################################
+#! File:    g295.t
+#! Purpose: tmake template file from which makefile.g295 is generated by running
+#!          tmake -t g295 wxwin.pro -o makefile.g295
+#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
+#! Created: 14.07.99
+#! Version: $Id$
+#!#############################################################################
+
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
+        #! so take the generic version
+        if ( $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/ ) {
+            next;
+        }
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b(16)\b/;
+
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        #! Mingw32 doesn't have the OLE headers and has some troubles with
+        #! socket code
+        next if $wxMSW{$file} =~ /\b(16)\b/;
+
+	$project{"WXMSWOBJS"} .= '$(MSWDIR)/';
+        $project{"WXMSWOBJS"} .= 'ole/' if $wxMSW{$file} =~ /\bO\b/;
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXMSWOBJS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        $file =~ s/cp?p?$/\$(OBJSUFF)/;
+        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
+    }
+
+#$}
+# This file was automatically generated by tmake at #$ Now()
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G295.T!
+
+#
+# File:     makefile.g295
+# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
+# Created:  1993
+# Updated:  1999
+# Copyright:(c) 1993, AIAI, University of Edinburgh,
+# Copyright:(c) 1999, Vadim Zeitlin
+# Copyright:(c) 1999, Robert Roebling
+#
+# Makefile for libwx.a
+
+# Replace this with your own path if necessary
+WXDIR = ../..
+
+# All common compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+# Subordinate library possibilities
+
+EXTRAOBJS=
+
+GENDIR  = $(WXDIR)/src/generic
+COMMDIR = $(WXDIR)/src/common
+HTMLDIR = $(WXDIR)/src/html
+XPMDIR  = $(WXDIR)/src/xpm
+PNGDIR  = $(WXDIR)/src/png
+JPEGDIR = $(WXDIR)/src/jpeg
+ZLIBDIR = $(WXDIR)/src/zlib
+OLEDIR  = $(WXDIR)/src/msw/ole
+MSWDIR  = $(WXDIR)/src/msw
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS = \
+                #$ ExpandList("WXGENERICOBJS");
+
+COMMONOBJS  = \
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		#$ ExpandList("WXCOMMONOBJS");
+
+HTMLOBJS = \
+                #$ ExpandList("WXHTMLOBJS");
+
+MSWOBJS     = \
+		#$ ExpandList("WXMSWOBJS");
+
+ZLIBOBJS    = \
+		$(ZLIBDIR)/adler32.$(OBJSUFF) \
+		$(ZLIBDIR)/compress.$(OBJSUFF) \
+		$(ZLIBDIR)/crc32.$(OBJSUFF) \
+		$(ZLIBDIR)/gzio.$(OBJSUFF) \
+		$(ZLIBDIR)/uncompr.$(OBJSUFF) \
+		$(ZLIBDIR)/deflate.$(OBJSUFF) \
+		$(ZLIBDIR)/trees.$(OBJSUFF) \
+		$(ZLIBDIR)/zutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inflate.$(OBJSUFF) \
+		$(ZLIBDIR)/infblock.$(OBJSUFF) \
+		$(ZLIBDIR)/inftrees.$(OBJSUFF) \
+		$(ZLIBDIR)/infcodes.$(OBJSUFF) \
+		$(ZLIBDIR)/infutil.$(OBJSUFF) \
+		$(ZLIBDIR)/inffast.$(OBJSUFF)
+
+PNGOBJS     = \
+		$(PNGDIR)/png.$(OBJSUFF) \
+		$(PNGDIR)/pngread.$(OBJSUFF) \
+		$(PNGDIR)/pngrtran.$(OBJSUFF) \
+		$(PNGDIR)/pngrutil.$(OBJSUFF) \
+		$(PNGDIR)/pngpread.$(OBJSUFF) \
+		$(PNGDIR)/pngtrans.$(OBJSUFF) \
+		$(PNGDIR)/pngwrite.$(OBJSUFF) \
+		$(PNGDIR)/pngwtran.$(OBJSUFF) \
+		$(PNGDIR)/pngwutil.$(OBJSUFF) \
+		$(PNGDIR)/pngerror.$(OBJSUFF) \
+		$(PNGDIR)/pngmem.$(OBJSUFF) \
+		$(PNGDIR)/pngwio.$(OBJSUFF) \
+		$(PNGDIR)/pngrio.$(OBJSUFF) \
+		$(PNGDIR)/pngget.$(OBJSUFF) \
+		$(PNGDIR)/pngset.$(OBJSUFF)
+
+
+JPEGOBJS    = \
+		$(JPEGDIR)/jcomapi.$(OBJSUFF) \
+		$(JPEGDIR)/jutils.$(OBJSUFF) \
+		$(JPEGDIR)/jerror.$(OBJSUFF) \
+		$(JPEGDIR)/jmemmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jmemnobs.$(OBJSUFF) \
+		$(JPEGDIR)/jcapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jcapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jctrans.$(OBJSUFF) \
+		$(JPEGDIR)/jcparam.$(OBJSUFF) \
+		$(JPEGDIR)/jdatadst.$(OBJSUFF) \
+		$(JPEGDIR)/jcinit.$(OBJSUFF) \
+		$(JPEGDIR)/jcmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jcmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jcmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jcprepct.$(OBJSUFF) \
+		$(JPEGDIR)/jccoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jccolor.$(OBJSUFF) \
+		$(JPEGDIR)/jcsample.$(OBJSUFF) \
+		$(JPEGDIR)/jchuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jfdctint.$(OBJSUFF) \
+		$(JPEGDIR)/jdapimin.$(OBJSUFF) \
+		$(JPEGDIR)/jdapistd.$(OBJSUFF) \
+		$(JPEGDIR)/jdtrans.$(OBJSUFF) \
+		$(JPEGDIR)/jdatasrc.$(OBJSUFF) \
+		$(JPEGDIR)/jdmaster.$(OBJSUFF) \
+		$(JPEGDIR)/jdinput.$(OBJSUFF) \
+		$(JPEGDIR)/jdmarker.$(OBJSUFF) \
+		$(JPEGDIR)/jdhuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdphuff.$(OBJSUFF) \
+		$(JPEGDIR)/jdmainct.$(OBJSUFF) \
+		$(JPEGDIR)/jdcoefct.$(OBJSUFF) \
+		$(JPEGDIR)/jdpostct.$(OBJSUFF) \
+		$(JPEGDIR)/jddctmgr.$(OBJSUFF) \
+		$(JPEGDIR)/jidctfst.$(OBJSUFF) \
+		$(JPEGDIR)/jidctflt.$(OBJSUFF) \
+		$(JPEGDIR)/jidctint.$(OBJSUFF) \
+		$(JPEGDIR)/jidctred.$(OBJSUFF) \
+		$(JPEGDIR)/jdsample.$(OBJSUFF) \
+		$(JPEGDIR)/jdcolor.$(OBJSUFF) \
+		$(JPEGDIR)/jquant1.$(OBJSUFF) \
+		$(JPEGDIR)/jquant2.$(OBJSUFF) \
+		$(JPEGDIR)/jdmerge.$(OBJSUFF)
+
+XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
+		$(XPMDIR)/crdatfri.o\
+		$(XPMDIR)/create.o $(XPMDIR)/crifrbuf.o\
+		$(XPMDIR)/crifrdat.o\
+		$(XPMDIR)/data.o\
+		$(XPMDIR)/hashtab.o $(XPMDIR)/misc.o\
+		$(XPMDIR)/parse.o $(XPMDIR)/rdftodat.o\
+		$(XPMDIR)/rdftoi.o\
+		$(XPMDIR)/rgb.o $(XPMDIR)/scan.o\
+		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
+		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o
+
+OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+
+all:    $(OBJECTS) $(WXLIB)
+
+$(WXLIB): $(OBJECTS) $(EXTRAOBJS)
+	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
+	$(RANLIB) $@
+
+$(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
+
+$(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
+	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+	copy ..\common\dosyacc.c ..\common\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+	copy ..\common\doslex.c ..\common\lex_yy.c
+
+# Replace lex with flex if you run into compilation
+# problems with lex_yy.c. See also note about LEX_SCANNER
+# above.
+# $(COMMDIR)/lex_yy.c:	$(COMMDIR)/lexer.l
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+# Try one of these if the above line doesn't work.
+# Alternative syntax (1)
+#	$(LEX) -t -L $(COMMDIR)/lexer.l > $(COMMDIR)/lex_yy.c
+# Alternative syntax (2)
+#	$(LEX) -L -o$(COMMDIR)/lex_yy.c $(COMMDIR)/lexer.l
+#
+#	sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \
+#	sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
+#       sed -e "s/YYLMAX 200/YYLMAX 5000/g" > lex_yy.c
+#	rm -f lex.yy.c
+#
+# Replace yacc with bison if you run into compilation
+# problems with y_tab.c.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) -o $(COMMDIR)/y_tab.c $(COMMDIR)/parser.y
+#
+# If you use e.g. gcc on Unix, uncomment these lines
+# and comment out the above.
+#
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+#	$(YACC) $(COMMDIR)/parser.y
+#	mv y.tab.c $(COMMDIR)/y_tab.c
+
+clean:
+	-erase *.o
+	-erase *.bak
+	-erase core
+	-erase ..\common\y_tab.c
+	-erase ..\common\lex_yy.c
+	-erase ..\common\*.o
+	-erase ..\common\*.bak
+	-erase ..\generic\*.o
+	-erase ..\generic\*.bak
+	-erase ..\html\*.o
+	-erase ..\png\*.o
+	-erase ..\png\*.bak
+	-erase ..\zlib\*.o
+	-erase ..\zlib\*.bak
+	-erase ..\jpeg\*.o
+	-erase ..\..\lib\libwx.a
+
+cleanall: clean
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -6,7 +6,6 @@
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
-
 #${
    #! include the code which parses filelist.txt file and initializes
    #! %wxCommon, %wxGeneric and %wxMSW hashes.
@@ -28,24 +27,41 @@
        next if $wxCommon{$file} =~ /\b(16)\b/;

        #! needs extra files (sql*.h) so not compiled by default.
-        next if $file =~ /^odbc\./;
+        #! next if $file =~ /^odbc\./;

+        if ( $file =~ /^odbc\./ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(COMMDIR)/' . $file . " "
+        }
+        else
+        {
          $file =~ s/cp?p?$/\$(OBJSUFF)/;
          $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
        }
+    }

    foreach $file (sort keys %wxMSW) {
-        #! Mingw32 doesn't have the OLE headers and has some troubles with
-        #! socket code
-        next if $wxMSW{$file} =~ /\b(O|16)\b/;
-
        #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
        next if $file =~ /^dirdlg\./;

+        next if $wxMSW{$file} =~ /\b(16)\b/;
+
+        #! Mingw32 doesn't have the OLE headers and has some troubles with
+        #! socket code, so put in  ADVANCEDOBJS
+        if ( $wxMSW{$file} =~ /\b(O)\b/ )
+        {
+          $file =~ s/cp?p?$/\$(OBJSUFF)/;
+          $project{"ADVANCEDOBJS"} .= '$(MSWDIR)/ole/' . $file . " "
+        }
+        else
+        {
          $file =~ s/cp?p?$/\$(OBJSUFF)/;
          $project{"WXMSWOBJS"} .= '$(MSWDIR)/' . $file . " "
        }

+    }
+
    foreach $file (sort keys %wxHTML) {
        $file =~ s/cp?p?$/\$(OBJSUFF)/;
        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
@@ -87,6 +103,10 @@ ZLIBDIR = $(WXDIR)/src/zlib
 OLEDIR  = $(WXDIR)/src/msw/ole
 MSWDIR  = $(WXDIR)/src/msw

+PNGLIB = $(WXDIR)/lib/libpng.a
+ZLIBLIB = $(WXDIR)/lib/libzlib.a
+JPEGLIB = $(WXDIR)/lib/libjpeg.a
+
 DOCDIR = $(WXDIR)\docs

 GENERICOBJS = \
@@ -102,6 +122,9 @@ HTMLOBJS = \
 MSWOBJS     = \
 		#$ ExpandList("WXMSWOBJS");

+ADVANCEDOBJS     = \
+		#$ ExpandList("ADVANCEDOBJS");
+
 ZLIBOBJS    = \
 		$(ZLIBDIR)/adler32.$(OBJSUFF) \
 		$(ZLIBDIR)/compress.$(OBJSUFF) \
@@ -196,25 +219,46 @@ XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/simx.o $(XPMDIR)/wrffrdat.o\
 		$(XPMDIR)/wrffrp.o $(XPMDIR)/wrffri.o

-OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) # $(XPMOBJECTS)
+#OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS)

-all:    $(OBJECTS) $(WXLIB)
+ifeq ($(MINGW32),1)
+  ifeq ($(MINGW32VERSION),2.95)
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(ADVANCEDOBJS) # $(XPMOBJECTS)   
+  else
+    OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+  endif
+else
+  OBJECTS = $(MSWOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) # $(XPMOBJECTS)
+endif
+
+all:    $(OBJECTS) $(WXLIB) $(ZLIBLIB) $(JPEGLIB) $(PNGLIB)

 $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
 	ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
 	$(RANLIB) $@

+$(ZLIBLIB): $(ZLIBOBJS)
+	ar $(AROPTIONS) $@ $(ZLIBOBJS)
+	$(RANLIB) $@
+
+$(PNGLIB): $(PNGOBJS)
+	ar $(AROPTIONS) $@ $(PNGOBJS)
+	$(RANLIB) $@
+
+$(JPEGLIB): $(JPEGOBJS)
+	ar $(AROPTIONS) $@ $(JPEGOBJS)
+	$(RANLIB) $@
+
 $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h

 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c

 $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-	copy ..\common\dosyacc.c ..\common\y_tab.c
+	$(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c

 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-	copy ..\common\doslex.c ..\common\lex_yy.c
+	$(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c

 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -247,21 +291,22 @@ $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 #	mv y.tab.c $(COMMDIR)/y_tab.c

 clean:
-	-erase *.o
-	-erase *.bak
-	-erase core
-	-erase ..\common\y_tab.c
-	-erase ..\common\lex_yy.c
-	-erase ..\common\*.o
-	-erase ..\common\*.bak
-	-erase ..\generic\*.o
-	-erase ..\generic\*.bak
-	-erase ..\html\*.o
-	-erase ..\png\*.o
-	-erase ..\png\*.bak
-	-erase ..\zlib\*.o
-	-erase ..\zlib\*.bak
-	-erase ..\jpeg\*.o
-	-erase ..\..\lib\libwx.a
+	-$(RM) *.o
+	-$(RM) ole/*.o
+	-$(RM) *.bak
+	-$(RM) core
+	-$(RM) ../common/y_tab.c
+	-$(RM) ../common/lex_yy.c
+	-$(RM) ../common/*.o
+	-$(RM) ../common/*.bak
+	-$(RM) ../generic/*.o
+	-$(RM) ../generic/*.bak
+	-$(RM) ../html/*.o
+	-$(RM) ../png/*.o
+	-$(RM) ../png/*.bak
+	-$(RM) ../zlib/*.o
+	-$(RM) ../zlib/*.bak
+	-$(RM) ../jpeg/*.o
+	-$(RM) ../../lib/libwx.a

 cleanall: clean
--- a/distrib/msw/tmake/makeall.bat
+++ b/distrib/msw/tmake/makeall.bat
@@ -36,20 +36,20 @@ rem 4nt.exe, so I preferred to unroll it.
 rem for %%c in (b32 bcc dos g95 sc vc wat) %TM% -t %c% wxwin.pro -o %WXDIR%\src\msw\makefile.%c%

 echo Generating for Visual C++ 4.0...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t vc wxwin.pro -o makefile.vc
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t vc wxwin.pro -o %WXDIR%\src\msw\makefile.vc
 echo Generating for Borland C++ (32 bits)...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t b32 wxwin.pro -o makefile.b32
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t b32 wxwin.pro -o %WXDIR%\src\msw\makefile.b32
 echo Generating for Visual C++ 1.52...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t dos wxwin.pro -o makefile.dos
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t dos wxwin.pro -o %WXDIR%\src\msw\makefile.dos
 echo Generating for Borland C++ (16 bits)...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t bcc wxwin.pro -o makefile.bcc
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t bcc wxwin.pro -o %WXDIR%\src\msw\makefile.bcc
 echo Generating for Cygwin/Mingw32
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t g95 wxwin.pro -o makefile.g95
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t g95 wxwin.pro -o %WXDIR%\src\msw\makefile.g95
 echo Generating for Symantec C++...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t sc wxwin.pro -o makefile.sc
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t sc wxwin.pro -o %WXDIR%\src\msw\makefile.sc
 echo Generating for Watcom C++...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t wat wxwin.pro -o makefile.wat
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t wat wxwin.pro -o %WXDIR%\src\msw\makefile.wat
 echo Generating for Unix and Configure...
-E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t unx wxwin.pro -o makefile.unx.in
+E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t unx wxwin.pro -o %WXDIR%\Makefile.in

 :end
--- a/distrib/msw/tmake/sc.t
+++ b/distrib/msw/tmake/sc.t
@@ -37,8 +37,11 @@

        next if $wxGeneric{$file} =~ /\b16\b/;

+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= '$(MSWDIR)\\' . $file . " "
+        $project{"WXMSWOBJS"} .= '$(MSWDIR)\\';
+        $project{"WXMSWOBJS"} .= 'ole\\' if $isOleObj;
+        $project{"WXMSWOBJS"} .= $file . " "
    }
 #$}

--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -48,39 +48,42 @@
        $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
    }

+    #! Base
+
+    foreach $file (sort keys %wxBase) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"BASE_OBJS"} .= $fileobj . " ";
+        $project{"BASE_DEPS"} .= $filedep . " ";
+    }
+
    #! Common

    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;

-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXGTK_COMMONOBJS"} .= $file . " ";
-        $project{"WXGTK_COMMONDEPS"} .= $file2 . " "
+        #! 'B' flag means that the file makes part of wxBase too
+        if ( $wxCommon{$file} =~ /\bB\b/ ) {
+            $project{"BASE_OBJS"} .= $fileobj . " ";
+            $project{"BASE_DEPS"} .= $filedep . " ";
        }

-    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bX\b/;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMOTIF_COMMONOBJS"} .= $file . " ";
-        $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " "
+        if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
+            $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXGTK_COMMONDEPS"} .= $filedep . " "
+        }
+        if ( $wxCommon{$file} !~ /\bX\b/ ) {    #! unless not for Motif
+            $project{"WXMOTIF_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXMOTIF_COMMONDEPS"} .= $filedep . " "
        }

-    foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\b(16)\b/;
-
-        #! needs extra files (sql*.h) so not compiled by default.
-        next if $file =~ /^odbc\./;
-
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXMSW_COMMONOBJS"} .= $file . " ";
-        $project{"WXMSW_COMMONDEPS"} .= $file2 . " "
+        #! ODBC needs extra files (sql*.h) so not compiled by default.
+        if ( (file !~ /^odbc\./) && ($wxCommon{$file} !~ /\b(16)\b/) ) {
+            $project{"WXMSW_COMMONOBJS"} .= $fileobj . " ";
+            $project{"WXMSW_COMMONDEPS"} .= $filedep . " "
+        }
    }

    #! GUI
@@ -127,17 +130,24 @@
    }

    foreach $file (sort keys %wxUNIX) {
-        $file2 = $file;
-        $file =~ s/cp?p?$/\o/;
-        $file2 =~ s/cp?p?$/\d/;
-        $project{"WXUNIXOBJS"} .= $file . " ";
-        $project{"WXUNIXDEPS"} .= $file2 . " "
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        #! 'B' flag means that the file makes part of wxBase too
+        if ( $wxUNIX{$file} =~ /\bB\b/ ) {
+            $project{"BASE_OBJS"} .= $fileobj . " ";
+            $project{"BASE_DEPS"} .= $filedep . " "
+        }
+
+        $project{"WXUNIX_OBJS"} .= $fileobj . " ";
+        $project{"WXUNIX_DEPS"} .= $filedep . " "
    }
    
    #! headers
    
    foreach $file (sort keys %wxWXINCLUDE) {
-        $project{"WX_HEADERS"} .= $file . " "
+        $project{"WX_HEADERS"} .= $file . " ";
+        $project{"BASE_HEADERS"} .= $file . " " if $wxWXINCLUDE{$file} =~ /\bB\b/;
    }
    
    foreach $file (sort keys %wxGENERICINCLUDE) {
@@ -214,8 +224,9 @@ VP6 = @top_srcdir@/src/html
 VP7 = @top_srcdir@/src/png
 VP8 = @top_srcdir@/src/jpeg
 VP9 = @top_srcdir@/src/zlib
+VP10 = @top_srcdir@/src/iodbc

-VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9)
+VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9):$(VP10)

 top_srcdir = @top_srcdir@
 prefix = @prefix@
@@ -281,6 +292,7 @@ ZLIBDIR  = $(WXDIR)/src/zlib
 GTKDIR   = $(WXDIR)/src/gtk
 MOTIFDIR = $(WXDIR)/src/motif
 MSWDIR   = $(WXDIR)/src/msw
+ODBCDIR  = $(WXDIR)/src/iodbc
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
@@ -290,11 +302,14 @@ DOCDIR = $(WXDIR)/docs

 ########################## Archive name ###############################

-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)

 ############################## Files ##################################

+BASE_HEADERS = \
+		#$ ExpandList("BASE_HEADERS");
+
 WX_HEADERS = \
 		#$ ExpandList("WX_HEADERS");

@@ -381,17 +396,23 @@ MSW_GUIOBJS = \
 MSW_GUIDEPS = \
 		#$ ExpandList("WXMSW_GUIDEPS");

+BASE_OBJS = \
+		#$ ExpandList("BASE_OBJS");
+
+BASE_DEPS = \
+		#$ ExpandList("BASE_DEPS");
+
 HTMLOBJS = \
 		#$ ExpandList("WXHTMLOBJS");

 HTMLDEPS = \
 		#$ ExpandList("WXHTMLDEPS");

-UNIXOBJS = \
-		#$ ExpandList("WXUNIXOBJS");
+UNIX_OBJS = \
+		#$ ExpandList("WXUNIX_OBJS");

-UNIXDEPS = \
-		#$ ExpandList("WXUNIXDEPS");
+UNIX_DEPS = \
+		#$ ExpandList("WXUNIX_DEPS");

 ZLIBOBJS    = \
 		adler32.o \
@@ -475,16 +496,41 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o

+IODBC_OBJS = \
+		catalog.o \
+		connect.o \
+		dlf.o \
+		dlproc.o \
+		execute.o \
+		fetch.o \
+		hdbc.o \
+		henv.o \
+		herr.o \
+		hstmt.o \
+		info.o \
+		itrace.o \
+		misc.o \
+		prepare.o \
+		result.o

-OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
+GUIOBJS = @GUIOBJS@
+GUIDEPS = @GUIDEPS@
+GUIHEADERS = @GUIHEADERS@
+COMMONOBJS = @COMMONOBJS@
+COMMONDEPS = @COMMONDEPS@
+GENERICOBJS = @GENERICOBJS@
+GENERICDEPS = @GENERICDEPS@
+UNIXOBJS = @UNIXOBJS@
+UNIXDEPS = @UNIXDEPS@
+IODBCOBJS = @IODBCOBJS@

-DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
+OBJECTS = @ALL_OBJECTS@

-HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-	  $(GENERIC_HEADERS) $(WX_HEADERS)
+DEPFILES = @ALL_DEPFILES@

-all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
+HEADERS = @ALL_HEADERS@
+
+all: @WX_ALL@

@WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -495,7 +541,7 @@ all:    $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
+CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -503,15 +549,15 @@ CREATE_LINKS:  ./lib/@WX_TARGET_LIBRARY@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@
 	$(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@
 	
-CREATE_INSTALLED_LINKS:  $(libdir)/@WX_TARGET_LIBRARY@
+CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@
-	$(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK1@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
+	$(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
 	
-$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h

 parser.o:    parser.c lexer.c
 	$(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
@@ -536,7 +582,7 @@ lexer.c:	$(COMMDIR)/lexer.l

 -include $(DEPFILES)

-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -553,7 +599,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 	$(INSTALL) -d $(libdir)/wx/include
 	$(INSTALL) -d $(libdir)/wx/include/wx
 	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
-	$(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
 	
 	$(INSTALL) -d $(datadir)/wx
 	$(INSTALL) -d $(datadir)/wx/afm
@@ -577,8 +623,8 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
 write_message:
 	@echo " "
 	@echo " The installation of wxWindows is finished.  On certain"
-	@echo " platforms (e.g. Linux, Solaris) you'll now have to run"
-	@echo " ldconfig if you installed a shared library."
+	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+	@echo " if you installed a shared library."
 	@echo " "
 	@echo " wxWindows comes with  no guarantees  and doesn't claim"
 	@echo " to be suitable for any purpose."
@@ -586,7 +632,7 @@ write_message:
 	@echo " Read the wxWindows Licence on licencing conditions."
 	@echo " "

-install: preinstall @WX_CREATE_INSTALLED_LINKS@ write_message
+install: preinstall @WX_ALL_INSTALLED@ write_message

 uninstall:
 	@echo " "
@@ -627,6 +673,7 @@ ALL_DIST:
 	mkdir _dist_dir
 	mkdir $(DISTDIR)
 	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
+	cp $(WXDIR)/configure.in $(DISTDIR)
 	cp $(WXDIR)/configure $(DISTDIR)
 	cp $(WXDIR)/config.sub $(DISTDIR)
 	cp $(WXDIR)/config.guess $(DISTDIR)
@@ -666,6 +713,7 @@ ALL_DIST:
 	mkdir $(DISTDIR)/src/png
 	mkdir $(DISTDIR)/src/jpeg
 	mkdir $(DISTDIR)/src/zlib
+	mkdir $(DISTDIR)/src/iodbc
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
 	cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
 	cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -675,9 +723,7 @@ ALL_DIST:
 	cp $(COMMDIR)/*.y $(DISTDIR)/src/common
 	cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
 	cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-	cp $(HTMLDIR)/*.h $(DISTDIR)/src/html
 	cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
-	cp $(UNIXDIR)/*.h $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
 	cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
 	cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -689,6 +735,13 @@ ALL_DIST:
 	cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
 	cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
+	cp $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.c $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.ci $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/*.exp $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/README $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc
+	cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc

 GTK_DIST:
 	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
@@ -753,6 +806,11 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/printing/*.h $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xpm $(DISTDIR)/samples/printing
 	cp $(SAMPDIR)/printing/*.xbm $(DISTDIR)/samples/printing
+	mkdir $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/Makefile.in $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.cpp $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.h $(DISTDIR)/samples/db
+	cp $(SAMPDIR)/db/*.xpm $(DISTDIR)/samples/db
 	mkdir $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/Makefile.in $(DISTDIR)/samples/dialogs
 	cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
@@ -781,6 +839,14 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/dynamic/Makefile.in $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
 	cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
+	mkdir $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/Makefile.in $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.cpp $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.xpm $(DISTDIR)/samples/forty
+	cp $(SAMPDIR)/forty/*.xbm $(DISTDIR)/samples/forty
+	mkdir $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/Makefile.in $(DISTDIR)/samples/fractal
+	cp $(SAMPDIR)/fractal/*.cpp $(DISTDIR)/samples/fractal
 	mkdir $(DISTDIR)/samples/html
 	cp $(SAMPDIR)/html/Makefile.in $(DISTDIR)/samples/html
 	mkdir $(DISTDIR)/samples/html/about
@@ -794,12 +860,13 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/html/help/*.cpp $(DISTDIR)/samples/html/help
 	mkdir $(DISTDIR)/samples/html/help/helpfiles
 	cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
+	mkdir $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/Makefile.in $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.cpp $(DISTDIR)/samples/html/helpview
+	cp $(SAMPDIR)/html/helpview/*.zip $(DISTDIR)/samples/html/helpview
 	mkdir $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-	cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing
 	cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
 	mkdir $(DISTDIR)/samples/html/test
 	cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
@@ -825,6 +892,18 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
 	cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
+	mkdir $(DISTDIR)/samples/internat
+	mkdir $(DISTDIR)/samples/internat/de
+	mkdir $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/Makefile.in $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.cpp $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.xpm $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.txt $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/*.po $(DISTDIR)/samples/internat
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
+	cp $(SAMPDIR)/internat/fr/*.po $(DISTDIR)/samples/internat/fr
+	cp $(SAMPDIR)/internat/de/*.mo $(DISTDIR)/samples/internat/de
 	mkdir $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/Makefile.in $(DISTDIR)/samples/layout
 	cp $(SAMPDIR)/layout/*.cpp $(DISTDIR)/samples/layout
@@ -834,28 +913,54 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
 	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
-	mkdir $(DISTDIR)/samples/listctrl/bitmap
-	cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+	mkdir $(DISTDIR)/samples/listctrl/bitmaps
+	cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
 	mkdir $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
 	cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
+	mkdir $(DISTDIR)/samples/mdi/bitmaps
+	cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps
 	mkdir $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
 	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
-	mkdir $(DISTDIR)/samples/minifram/bitmap
-	cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+	mkdir $(DISTDIR)/samples/minifram/bitmaps
+	cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps
 	mkdir $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+	mkdir $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+	cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest
+	mkdir $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.h $(DISTDIR)/samples/notebook
+	mkdir $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/Makefile.in $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
+	cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+	mkdir $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+	cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+	mkdir $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
+	cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
 	mkdir $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
 	cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist
@@ -867,6 +972,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
 	cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
+	mkdir $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
 	mkdir $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
 	cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
@@ -880,10 +988,9 @@ SAMPLES_DIST:
 	mkdir $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/Makefile.in $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
-	cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
 	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
-	mkdir $(DISTDIR)/samples/toolbar/bitmap
-	cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+	mkdir $(DISTDIR)/samples/toolbar/bitmaps
+	cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
 	mkdir $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
 	cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
@@ -917,24 +1024,33 @@ SAMPLES_DIST:
 UTILS_DIST:
 	mkdir $(DISTDIR)/utils
 	cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
+	
 	mkdir $(DISTDIR)/utils/wxMMedia2
-	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	mkdir $(DISTDIR)/utils/wxMMedia2/lib
+	mkdir $(DISTDIR)/utils/wxMMedia2/sample
+	cp $(UTILSDIR)/wxMMedia2/Makefile.in $(DISTDIR)/utils/wxMMedia2
 	cp $(UTILSDIR)/wxMMedia2/lib/Makefile.in $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.h $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.cpp $(DISTDIR)/utils/wxMMedia2/lib
 	cp $(UTILSDIR)/wxMMedia2/lib/*.def $(DISTDIR)/utils/wxMMedia2/lib
-	mkdir $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/Makefile.in $(DISTDIR)/utils/wxMMedia2/sample
 	cp $(UTILSDIR)/wxMMedia2/sample/*.cpp $(DISTDIR)/utils/wxMMedia2/sample
+	
 	mkdir $(DISTDIR)/utils/glcanvas
+	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/Makefile.in $(DISTDIR)/utils/glcanvas
 	cp $(UTILSDIR)/glcanvas/docs/notes.txt $(DISTDIR)/utils/glcanvas/NOTES.txt
-	mkdir $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/Makefile.in $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
 	
+	mkdir $(DISTDIR)/utils/ogl
+	mkdir $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/Makefile.in $(DISTDIR)/utils/ogl
+	cp $(UTILSDIR)/ogl/src/Makefile.in $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src
+	cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src
+	
 MISC_DIST:
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -41,6 +41,14 @@
        $file =~ s/cp?p?$/obj/;
        $project{"WXMSWOBJS"} .= '$D\\' . $file . " ";
    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= "..\\html\\\$D\\" . $file . " "
+    }
+
 #$}
 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
@@ -112,6 +120,11 @@ $(CPPFLAGS2) /Fo$@ /c /Tc $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<

+{..\msw}.c{..\msw\$D}.obj:
+	cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $<
+<<
+
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
 	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
@@ -134,28 +147,12 @@ COMMONOBJS = \

 MSWOBJS = #$ ExpandList("WXMSWOBJS");

-HTMLOBJS = \
-  ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlhelp.obj \
-  ..\html\$D\htmlhelp_io.obj \
-  ..\html\$D\htmlparser.obj \
-  ..\html\$D\htmltag.obj \
-  ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.obj
+HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
+

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(HTMLOBJS) if wanting wxHTML classes
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)

 # Normal, static library
 all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
@@ -240,7 +237,7 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)
 <<

 # Update the dynamic link library
-$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS) $(WXDIR)\lib\$(WXLIBNAME).lib
+$(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
    $(link) @<<
    $(LINKFLAGS)
    -out:$(WXDIR)\lib\$(WXLIBNAME).dll
@@ -293,7 +290,7 @@ $(CPPFLAGS2) /c $(COMMDIR)\unzip.c /Fo$@

 png:
    cd $(WXDIR)\src\png
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    cd $(WXDIR)\src\msw

 clean_png:
@@ -303,7 +300,7 @@ clean_png:

 zlib:
    cd $(WXDIR)\src\zlib
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    cd $(WXDIR)\src\msw

 clean_zlib:
@@ -313,7 +310,7 @@ clean_zlib:

 jpeg:
    cd $(WXDIR)\src\jpeg
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
    cd $(WXDIR)\src\msw

 clean_jpeg:
@@ -323,7 +320,7 @@ clean_jpeg:

 xpm:
    cd $(WXDIR)\src\xpm
-    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
    cd $(WXDIR)\src\msw

 clean_xpm:
@@ -336,7 +333,7 @@ rcparser:
    nmake -f makefile.vc FINAL=$(FINAL)
    cd $(WXDIR)\src\msw

-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
        -erase $(LIBTARGET)
        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
        -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -27,9 +27,16 @@
    foreach $file (sort keys %wxMSW) {
        next if $wxMSW{$file} =~ /\b16\b/;

-        my $tag = $wxMSW{$file} =~ /\bO\b/ ? "WXOLESRCS" : "WXMSWSRCS";
+        my $tag;
+        if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+        else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
        $project{$tag} .= $file . " "
    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+        $project{"WXHTMLSRCS"} .= $file . " "
+    }
 #$}
 # Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
@@ -125,6 +132,8 @@ SOURCE=.\src\msw\dummy.cpp
 #$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");

 # Begin Source File

--- a/distrib/msw/tmake/vc6dll.t
+++ b/distrib/msw/tmake/vc6dll.t
@@ -0,0 +1,162 @@
+#!#############################################################################
+#! File:    vc6dll.t
+#! Purpose: tmake template file from which wxWinDll.dsp is generated by running
+#!          tmake -t vc6dll wxwin.pro -o wxWinDll.dsp
+#! Author:  Vadim Zeitlin
+#! Created: 13.10.99
+#! Version: $Id$
+#!#############################################################################
+#${
+    #! include the code which parses filelist.txt file and initializes
+    #! %wxCommon, %wxGeneric and %wxMSW hashes.
+    IncludeTemplate("filelist.t");
+
+    #! now transform these hashes into $project tags
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\b(PS|G|16|U)\b/;
+        $project{"WXGENERICSRCS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxCommon) {
+        next if $wxCommon{$file} =~ /\b16\b/;
+
+        my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxMSW) {
+        next if $wxMSW{$file} =~ /\b16\b/;
+
+        my $tag;
+        if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+        else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }
+        $project{$tag} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+        $project{"WXHTMLSRCS"} .= $file . " "
+    }
+#$}
+# Microsoft Developer Studio Project File - Name="wxWinDll" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=wxWinDll - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWinDll.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wxWinDll.mak" CFG="wxWinDll - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "wxWinDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "wxWinDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /machine:I386
+
+!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib lib\png.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\png\png.lib src\xpm\xpm.lib src\zlib\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "wxWinDll - Win32 Release"
+# Name "wxWinDll - Win32 Debug"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\msw\dummydll.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+#$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n");
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\ole\\", "\n# End Source File\n");
+#$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n");
+#$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
+#$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n");
+
+# Begin Source File
+
+SOURCE=.\src\common\y_tab.c
+
+!IF  "$(CFG)" == "wxWinDll - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"
+
+# ADD CPP /W1
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
+# End Target
+# End Project
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -2,11 +2,14 @@
 #! File:    wat.t
 #! Purpose: tmake template file from which makefile.wat is generated by running
 #!          tmake -t wat wxwin.pro -o makefile.wat
+#!          TODO:
+#!            - extended.c, unzip.c must be compiled with $(CC), not $(CCC).
+#!            - extended.c, unzip.c targets must be as per b32.t etc.
+#!            - OLE files not generated correctly (need 'ole/' directory)
 #! Author:  Vadim Zeitlin
 #! Created: 14.07.99
 #! Version: $Id$
 #!#############################################################################
-
 #${
    #! include the code which parses filelist.txt file and initializes
    #! %wxCommon, %wxGeneric and %wxMSW hashes.
@@ -30,8 +33,10 @@
        #! doesn't compile, apparently
        next if $file =~ /^imagjpeg\./;

+        $isCFile = $file =~ /\.c$/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXCOMMONOBJS"} .= $file . " "
+        $project{"WXCOMMONOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
    }

    foreach $file (sort keys %wxMSW) {
@@ -40,23 +45,35 @@

        next if $wxGeneric{$file} =~ /\b16\b/;

+        my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
+        my $isCFile = $file =~ /\.c$/;
        $file =~ s/cp?p?$/obj/;
-        $project{"WXMSWOBJS"} .= $file . " "
+        $project{"WXMSWOBJS"} .= $file . " ";
+        $project{"WXCOBJS"} .= $file . " " if $isCFile;
+        $project{"WXOLEOBJS"} .= $file . " " if $isOleObj
    }
 #$}
+#! an attempt to embed '#' directly in the string somehow didn't work...
+#$ $text = chr(35) . '!/binb/wmake.exe';

 # This file was automatically generated by tmake at #$ Now()
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!

-#! an attempt to embed '#' directly in the string somehow didn't work...
-#$ $text = chr(35) . '!/binb/wmake.exe';
-
 #
 # File:     makefile.wat
 # Author:   Julian Smart
 # Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
+#
+# NOTE: This file is generated from wat.t by tmake, but not all bugs have
+# been removed from this process. If wxWindows doesn't compile,
+# check the following and edit this makefile accordingly:
+#
+# - OLE-related files such as oleutils.cpp should have 'ole\' prepended
+#   to the path.
+# - extended.c, gsocket.c, unzip.c must be compiled using $(CC), not $(CCC).
+#   They may also be wrongly specified as extended.cpp, etc.

 WXDIR = ..\..

@@ -73,8 +90,8 @@ EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib
 GENDIR=$(WXDIR)\src\generic
 COMMDIR=$(WXDIR)\src\common
 XPMDIR=$(WXDIR)\src\xpm
-OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
+OLEDIR=$(MSWDIR)\ole

 DOCDIR = $(WXDIR)\docs

@@ -121,13 +138,22 @@ cleanall:   clean
    foreach (@objs) {
        $text .= $_ . ':     $(';
        s/\.obj$//;
-        if ( $wxMSW{$_} =~ /\bO\b/ ) {
+        if ( $project{"WXOLEOBJS"} =~ /\b\Q$_\E\b/ ) {
            $text .= 'OLEDIR)\\';
        } else {
            $text .= 'MSWDIR)\\';
        }
-        $text .= $_ . ".cpp\n" .
-                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CCC";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
    }
 #$}

@@ -141,8 +167,17 @@ cleanall:   clean
        $text .= $_;
        s/\.obj$//;
        $text .= ':     $(COMMDIR)\\';
-        $text .= $_ . ".cpp\n" .
-                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+        my $suffix, $cc;
+        if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) {
+            $suffix = "c";
+            $cc="CC";
+        }
+        else {
+            $suffix = "cpp";
+            $cc="CCC";
+        }
+        $text .= $_ . ".$suffix\n" .
+                 "  *\$($cc) \$(CPPFLAGS) \$(IFLAGS) \$<" . "\n\n";
    }
 #$}

--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -1,10 +1,11 @@
 src/wxvc.dsp
 src/wxvc.dsw
-src/wxvc6.dsp
-src/wxvc6.dsw
 src/wxvc_dll.dsp
 src/wxvc_dll.dsw

+src/jpeg/jpeg.dsp
+src/jpeg/jpeg.dsw
+
 samples/checklst/ChecklstVC.dsp
 samples/checklst/ChecklstVC.dsw

@@ -136,8 +137,8 @@ utils/dialoged/src/DialogEdVC.dsw
 utils/tex2rtf/src/Tex2RTFVC.dsp
 utils/tex2rtf/src/Tex2RTFVC.dsw

-utils/glcanvas/win/GlcanvasVC.dsp
-utils/glcanvas/win/GlcanvasVC.dsw
+utils/glcanvas/win/Glcanvas*.dsp
+utils/glcanvas/win/Glcanvas*.dsw
 utils/glcanvas/samples/cube/CubeVC.dsp
 utils/glcanvas/samples/cube/CubeVC.dsw
 utils/glcanvas/samples/isosurf/IsosurfVC.dsp
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -0,0 +1,247 @@
+item: Set Variable
+  Variable=MAINDIR
+  Value=%MAINDIR%
+  Flags=00010100
+end
+item: Include Script
+  Pathname=c:\Program Files\WISE\INCLUDE\uninstal.wse
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=GROUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu\Programs
+  Value Name=Programs
+  Flags=00000010
+end
+item: Set Variable
+  Variable=GROUP
+  Value=%GROUPDIR%\%GROUP%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Destination=%GROUP%\wxWindows Manual.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\Docs\Readme.txt
+  Destination=%GROUP%\ReadMe.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Destination=%GROUP%\Dialog Editor Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\ogl.hlp
+  Destination=%GROUP%\Object Graphics Library Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\prop.hlp
+  Destination=%GROUP%\wxProperty Classes Help.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\winhelp\tex2rtf.hlp
+  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
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\docs\msw\install.txt
+  Destination=%GROUP%\Compiling wxWindows.lnk
+  Working Directory=%MAINDIR%
+end
+item: Create Shortcut
+  Source=%MAINDIR%\bin\dialoged.exe
+  Destination=%GROUP%\Dialog Editor.lnk
+  Working Directory=%MAINDIR%
+end
+item: Else Statement
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Dialog Editor
+  Command Line=%MAINDIR%\bin\dialoged.exe
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxWindows Manual
+  Command Line=%MAINDIR%\Docs\Winhelp\Wx.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Compiling wxWindows
+  Command Line=%MAINDIR%\docs\msw\install.txt
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=ReadMe
+  Command Line=%MAINDIR%\Docs\Readme.txt
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=HTML Docs Index
+  Command Line=%MAINDIR%\docs\html\index.htm
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Dialog Editor Help
+  Command Line=%MAINDIR%\docs\winhelp\dialoged.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Object Graphics Library Help
+  Command Line=%MAINDIR%\docs\winhelp\ogl.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=wxProperty Classes Help
+  Command Line=%MAINDIR%\docs\winhelp\prop.hlp
+  Default Directory=%MAINDIR%
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Tex2RTF Help
+  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
+  Description=Updating System Configuration, Please Wait...
+end
+item: Execute Program
+  Pathname=explorer.exe
+  Command Line=%GROUP%
+end
+item: Add to AUTOEXEC.BAT
+  New Text=SET WXWIN=%MAINDIR%
+  Search Text=SET WXWIN
+  Line Number=0
+  Flags=00010110
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Finished
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Finish
+      Text French=&Fin
+      Text German=&Weiter
+      Text Spanish=&Terminar
+      Text Italian=&Fine
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Variable=DISABLED
+      Value=!
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Installation Completed!
+      Text French=Installation termin<69>e !
+      Text German=Die Installation ist abgeschlossen!
+      Text Spanish=<3D>Instalaci<63>n terminada!
+      Text Italian=Installazione completata!
+    end
+    item: Static
+      Rectangle=86 42 256 124
+      Create Flags=01010000000000000000000000000000
+      Text=The %APPTITLE% source files have been successfully installed, with some convenient shortcuts in the "wxWindows 2" program group.
+      Text=
+      Text=You will need to compile the library and any demo files you wish to run: please see docs\msw\install.txt for details.
+      Text=
+      Text=Press the Finish button to exit this installation.
+      Text French=%APPTITLE% est maintenant install<6C>.
+      Text French=
+      Text French=Cliquez sur le bouton Fin pour quitter l'installation.
+      Text German=%APPTITLE% wurde erfolgreich installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.
+      Text Spanish=%APPTITLE% se ha instalado con <20>xito.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Terminar para salir de esta instalaci<63>n.
+      Text Italian=L'installazione %APPTITLE% <20> stata portata a termine con successo.
+      Text Italian=
+      Text Italian=Premere il pulsante Fine per uscire dall'installazione.
+    end
+  end
+end
+item: End Block
+end
--- a/distrib/msw/wisesys.txt
+++ b/distrib/msw/wisesys.txt
@@ -0,0 +1,21 @@
+item: Install File
+  Source=c:\Windows\System\Msvcirt.dll
+  Destination=%SYS32%\Msvcirt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcrt.dll
+  Destination=%SYS32%\Msvcrt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcrt.dll
+  Destination=%SYS%\Msvcrt.dll
+  Flags=0000000000000010
+end
+item: Install File
+  Source=c:\Windows\System\Msvcirt.dll
+  Destination=%SYS%\Msvcirt.dll
+  Flags=0000000000000010
+end
+
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -0,0 +1,592 @@
+Document Type: WSE
+item: Global
+  Version=5.0
+  Title=wxWindows 2.1.10 Installation
+  Flags=00000100
+  Split=1420
+  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+  Japanese Font Name=MS Gothic
+  Japanese Font Size=10
+  Start Gradient=0 0 255
+  End Gradient=0 0 0
+  Windows Flags=00000000000000010010110000001000
+  Log Pathname=%MAINDIR%\INSTALL.LOG
+  Message Font=MS Sans Serif
+  Font Size=8
+  Disk Filename=SETUP
+  Patch Flags=0000000000000001
+  Patch Threshold=85
+  Patch Memory=4000
+  EXE Filename=D:\wx2\wxWindows\deliver\setup.exe
+  FTP Cluster Size=20
+  Variable Name1=_SYS_
+  Variable Default1=C:\WINDOWS\SYSTEM
+  Variable Flags1=00001000
+  Variable Name2=_ODBC16_
+  Variable Default2=C:\WINDOWS\SYSTEM
+  Variable Flags2=00001000
+  Variable Name3=_ODBC32_
+  Variable Default3=C:\WINDOWS\SYSTEM
+  Variable Flags3=00001000
+  Variable Name4=_WISE_
+  Variable Default4=C:\PROGRAM FILES\WISE
+  Variable Flags4=00001000
+end
+item: Open/Close INSTALL.LOG
+  Flags=00000001
+end
+item: Check if File/Dir Exists
+  Pathname=%SYS%
+  Flags=10000100
+end
+item: Set Variable
+  Variable=SYS
+  Value=%WIN%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=APPTITLE
+  Value=wxWindows 2.1.10
+end
+item: Set Variable
+  Variable=GROUP
+  Value=wxWindows 2
+end
+item: Set Variable
+  Variable=DISABLED
+  Value=!
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=wx2
+end
+item: Display Graphic
+  Pathname=D:\wx2\wxWindows\distrib\msw\wxwin01.bmp
+  X Position=16
+  Y Position=16
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=COMMON
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files\Common Files
+  Value Name=CommonFilesDir
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=PROGRAM_FILES
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files
+  Value Name=ProgramFilesDir
+  Flags=00000100
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%PROGRAM_FILES%\%MAINDIR%
+end
+item: Set Variable
+  Variable=EXPLORER
+  Value=1
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=C:\%MAINDIR%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: Set Variable
+  Variable=DOBACKUP
+  Value=B
+end
+item: Set Variable
+  Variable=BRANDING
+  Value=0
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: Read INI Value
+  Variable=NAME
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Name
+end
+item: Read INI Value
+  Variable=COMPANY
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Company
+end
+item: If/While Statement
+  Variable=NAME
+end
+item: Set Variable
+  Variable=DOBRAND
+  Value=1
+end
+item: End Block
+end
+item: End Block
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Welcome
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Welcome!
+      Text French=Bienvenue !
+      Text German=Willkommen!
+      Text Spanish=<3D>Bienvenido!
+      Text Italian=Benvenuti!
+    end
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DISABLED
+      Value=!
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=86 41 256 130
+      Create Flags=01010000000000000000000000000000
+      Text=This installation program will install %APPTITLE%. It will need about 18 MB of hard disk space.
+      Text=
+      Text=Press the Next button to start the installation. You can press the Cancel button now if you do not want to install %APPTITLE% at this time.
+      Text French=Ce programme d'installation va installer %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour d<>marrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.
+      Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen.
+      Text Spanish=Este programa de instalaci<63>n instalar<61> %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Siguiente para iniciar la instalaci<63>n. Puede presionar el bot<6F>n Salir de instalaci<63>n si no desea instalar %APPTITLE% en este momento.
+      Text Italian=Questo programma installer<65> %APPTITLE%.
+      Text Italian=
+      Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione.
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Destination Directory
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select Destination Directory
+      Text French=S<>lectionner le r<>pertoire de destination
+      Text German=Zielverzeichnis w<>hlen
+      Text Spanish=Seleccione el directorio de destino
+      Text Italian=Selezionare Directory di destinazione
+    end
+    item: Static
+      Rectangle=86 42 256 82
+      Create Flags=01010000000000000000000000000000
+      Text=Please select the directory where %APPTITLE% files are to be installed.
+      Text=
+      Text=Important: do not install into a directory with a space in the name, such as Program Files.
+      Text French=Veuillez s<>lectionner le r<>pertoire dans lequel les fichiers %APPTITLE% doivent <20>tre install<6C>s.
+      Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.
+      Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.
+      Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.
+    end
+    item: Static
+      Rectangle=86 98 256 125
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Push Button
+      Rectangle=208 106 253 121
+      Variable=MAINDIR_SAVE
+      Value=%MAINDIR%
+      Destination Dialog=1
+      Action=2
+      Create Flags=01010000000000010000000000000000
+      Text=B&rowse
+      Text French=Parcourir
+      Text German=Durchsuchen
+      Text Spanish=Buscar
+      Text Italian=Sfoglie
+    end
+    item: Static
+      Rectangle=90 109 206 120
+      Create Flags=01010000000000000000000000000000
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+  end
+  item: Dialog
+    Title=Select Destination Directory
+    Title French=S<>lectionner le r<>pertoire de destination
+    Title German=Zielverzeichnis w<>hlen
+    Title Spanish=Seleccione el directorio de destino
+    Title Italian=Selezionare Directory di destinazione
+    Width=221
+    Height=173
+    Font Name=Helv
+    Font Size=8
+    item: Listbox
+      Rectangle=5 5 163 149
+      Variable=MAINDIR
+      Create Flags=01010000100000010000000101000000
+      Flags=0000110000100010
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+    end
+    item: Push Button
+      Rectangle=167 6 212 21
+      Create Flags=01010000000000010000000000000001
+      Text=OK
+      Text French=OK
+      Text German=OK
+      Text Spanish=Aceptar
+      Text Italian=OK
+    end
+    item: Push Button
+      Rectangle=167 25 212 40
+      Variable=MAINDIR
+      Value=%MAINDIR_SAVE%
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Program Manager Group
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Select ProgMan Group
+      Text French=S<>lectionner le groupe du Gestionnaire de programme 
+      Text German=Bestimmung der Programm-Managergruppe
+      Text Spanish=Seleccione grupo del Administrador de programas
+      Text Italian=Selezionare il gruppo ProgMan 
+    end
+    item: Static
+      Rectangle=86 44 256 68
+      Create Flags=01010000000000000000000000000000
+      Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to:
+      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les ic<69>nes de %APPTITLE% :
+      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugef<65>gt werden soll:
+      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:
+      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:
+    end
+    item: Combobox
+      Rectangle=86 69 256 175
+      Variable=GROUP
+      Create Flags=01010000001000010000001100000001
+      Flags=0000000000000001
+      Text=%GROUP%
+      Text French=%GROUP%
+      Text German=%GROUP%
+      Text Spanish=%GROUP%
+      Text Italian=%GROUP%
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Start Installation
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=%APPTITLE% Installation
+    Title French=Installation de %APPTITLE%
+    Title German=Installation von %APPTITLE%
+    Title Spanish=Instalaci<63>n de %APPTITLE%
+    Title Italian=Installazione di %APPTITLE%
+    Width=271
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=150 187 195 202
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suite >
+      Text German=&Weiter >
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+    end
+    item: Push Button
+      Rectangle=105 187 150 202
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=< &Retour
+      Text German=< &Zur<75>ck
+      Text Spanish=< &Atr<74>s
+      Text Italian=< &Indietro
+    end
+    item: Push Button
+      Rectangle=211 187 256 202
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=&Cancel
+      Text French=&Annuler
+      Text German=&Abbrechen
+      Text Spanish=&Cancelar
+      Text Italian=&Annulla
+    end
+    item: Static
+      Rectangle=8 180 256 181
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=86 8 258 42
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=Times New Roman
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+      Text=Ready to Install!
+      Text French=Pr<50>t <20> installer !
+      Text German=Installationsbereit!
+      Text Spanish=<3D>Preparado para la instalaci<63>n!
+      Text Italian=Pronto per l'installazione!
+    end
+    item: Static
+      Rectangle=86 42 256 102
+      Create Flags=01010000000000000000000000000000
+      Text=You are now ready to install %APPTITLE%.
+      Text=
+      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
+      Text French=Vous <20>tes maintenant pr<70>t <20> installer les fichiers %APPTITLE%.
+      Text French=
+      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation <20> nouveau.
+      Text German=Sie k<>nnen %APPTITLE% nun installieren.
+      Text German=
+      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zur<75>ck", um die Installationsinformationen neu einzugeben.
+      Text Spanish=Ya est<73> listo para instalar %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Presione el bot<6F>n Siguiente para comenzar la instalaci<63>n o presione Atr<74>s para volver a ingresar la informaci<63>n para la instalaci<63>n.
+      Text Italian=Ora <20> possibile installare %APPTITLE%.
+      Text Italian=
+      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.
+    end
+  end
+end
+item: If/While Statement
+  Variable=DISPLAY
+  Value=Select Destination Directory
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\BACKUP
+end
+item: End Block
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=DOBACKUP
+  Value=A
+end
+item: Set Variable
+  Variable=BACKUPDIR
+  Value=%BACKUP%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: If/While Statement
+  Variable=DOBRAND
+  Value=1
+end
+item: Edit INI File
+  Pathname=%INST%\CUSTDATA.INI
+  Settings=[Registration]
+  Settings=NAME=%NAME%
+  Settings=COMPANY=%COMPANY%
+  Settings=
+end
+item: End Block
+end
+item: End Block
+end
+item: Open/Close INSTALL.LOG
+end
+item: Check Disk Space
+  Component=COMPONENTS
+end
--- a/distrib/msw/wxwin01.bmp
+++ b/distrib/msw/wxwin01.bmp
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -2,48 +2,62 @@
 rem Zip up an external, generic + Windows distribution of wxWindows 2.0
 set src=%wxwin
 set dest=%src\deliver
+set wise=0
+
+Rem Set this to the required version
+set version=2_1_11
+
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
+if "%1" == "-help" goto usage
+if "%1" == "--help" goto usage
+if "%1" == "/?" goto usage
+if "%1" == "wise" set wise=1
 echo About to archive an external wxWindows distribution:
 echo   From   %src
 echo   To     %dest
+if "%wise" == "1" echo with WISE setup creation.
 echo CTRL-C if this is not correct.
 pause

-erase %dest\wx200*.zip
+rem goto dounzip
+
+erase %dest\wx*.zip
 erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip

+if direxist %dest\wx deltree /Y %dest\wx
+
 cd %src
 echo Zipping...

-zip32 -@ %dest\wx200gen.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest\wx200gen.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200msw.zip < %src\distrib\msw\msw.rsp
-zip32 -@ -u %dest\wx200msw.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200gtk.zip < %src\distrib\msw\gtk.rsp
-zip32 -@ -u %dest\wx200gtk.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200stubs.zip < %src\distrib\msw\stubs.rsp
-zip32 -@ %dest\wx200mot.zip < %src\distrib\msw\motif.rsp
-zip32 -@ -u %dest\wx200mot.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200user.zip < %src\distrib\msw\user.rsp
+zip32 -@ %dest\wx%version%_gen.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest\wx%version%_gen.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_msw.zip < %src\distrib\msw\msw.rsp
+zip32 -@ -u %dest\wx%version%_msw.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
+zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
+zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp

-zip32 -@ %dest\wx200doc.zip < %src\distrib\msw\docsrc.rsp
-zip32 -@ %dest\wx200hlp.zip < %src\distrib\msw\wx_hlp.rsp
-zip32 -@ %dest\wx200htm.zip < %src\distrib\msw\wx_html.rsp
-zip32 -@ %dest\wx200pdf.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ %dest\wx200wrd.zip < %src\distrib\msw\wx_word.rsp
+zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp

 rem VC++ project files
-zip32 -@ %dest\wx200vc.zip < %src\distrib\msw\vc.rsp
+zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp

 rem BC++ project files
-zip32 -@ %dest\wx200bc.zip < %src\distrib\msw\bc.rsp
+zip32 -@ %dest\wx%version%_bc.zip < %src\distrib\msw\bc.rsp

 rem CodeWarrior project files
-zip32 -@ %dest\wx200cw.zip < %src\distrib\msw\cw.rsp
+zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp

 rem OGL 3
 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
@@ -68,14 +82,66 @@ copy %src\docs\readme.txt %dest
 copy %src\docs\motif\makewxmotif %dest
 copy %src\docs\gtk\makewxgtk %dest

+: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
+
+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 ..\wx%version%_gen.zip
+unzip32 -o ..\wx%version%_vc.zip
+unzip32 -o ..\wx%version%_bc.zip
+unzip32 -o ..\wx%version%_hlp.zip
+Rem Need Word file, for Remstar DB classes
+unzip32 -o ..\wx%version%_wrd.zip
+unzip32 -o ..\glcanvas.zip
+unzip32 -o ..\treedraw.zip
+unzip32 -o ..\ogl3.zip
+unzip32 -o ..\jpeg.zip
+unzip32 -o ..\tex2rtf3.zip
+
+rem Now delete a few files that are unnecessary
+erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
+erase /SY Makefile.in
+rem erase /Y docs\pdf\ogl.pdf
+rem deltree /Y docs\html\ogl
+
+rem Now copy some binary files to 'bin'
+if not isdir bin mkdir bin
+copy %src\bin\dialoged.exe bin
+copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
+
+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.
+echo Calling 'makewise' to generate wxwin2.wse...
+call %WXWIN\distrib\msw\makewise.bat
+
+rem Now invoke WISE install on the new wxwin2.wse
+set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
+echo Invoking %wisecmd...
+start /w %wisecmd
+Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
+
 cd %dest

 echo wxWindows archived.
 goto end

 :usage
-echo DOS wxWindows distribution.
-echo Usage: zipdist source destination
-echo e.g. zipdist d:\wx2\wxWindows d:\wx2\wxWindows\deliver
+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.
+echo Usage: zipdist [wise]

 :end
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -1,31 +1,44 @@
 wxWindows Buglist
 -----------------

-wxGTK:
------
+Until the wxWindows bug database is up and running, please add
+entries in this style:

- It is impossible to reposition a window before showing it
-  on screen. Suspected GTK bug.
+BUG NUMBER:
+SHORT DESCRIPTION:
+DETAILS:
+WORKAROUND:
+wxWINDOWS VERSION:
+PLATFORM(S):
+DATE IDENTIFIED:
+IDENTIFIED BY:
+DATE FIXED:
+FIXED BY:

- DnD does only moderately work.
+-------------------------START OF BUGLIST-------------------------

-wxMSW:
------
-
- TODO
-
-wxMotif:
--------
-
- If a popup wxMenu is destroyed after its parent window has been
+BUG NUMBER:             1
+SHORT DESCRIPTION:      Popup menu bug
+DETAILS:
+If a popup wxMenu is destroyed after its parent window has been
 destroyed, we get the message "Object XXX does not have windowed
 ancestor".
-  Workaround: delete the menu before deleting the window on which it
-  was popped up.
 Possible fix: call menu->DestroyMenu() before deleting the window,
 if the window knows about the menu that was last popped up (hard
 to know this with confidence).
+WORKAROUND:
+Delete the menu before deleting the window on which it
+was popped up.
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            wxMotif
+DATE IDENTIFIED:        ?/?/1998
+IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+DATE FIXED:
+FIXED BY:

+BUG NUMBER:             2
+SHORT DESCRIPTION:      Misc. Motif bugs
+DETAILS:
 - In wxGrid, cell highlight is not drawn/erased properly.

 - Setting the size of a hidden window may show that window.
@@ -44,11 +57,29 @@ wxMotif:

 - There are reports that scrolling can cause crashes under Lesstif.
  This is probably a Lesstif bug.
+WORKAROUND:
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            wxMotif
+DATE IDENTIFIED:        ?/?/1999
+IDENTIFIED BY:          Julian Smart
+DATE FIXED:
+FIXED BY:

-General:
--------
-
- Dialog Editor could be more user-friendly. Controls are hard to
+BUG NUMBER:             3
+SHORT DESCRIPTION:      Dialog Editor issues
+DETAILS:
+Dialog Editor could be more user-friendly. Controls are hard to
 size and position accurately. No way of changing tab order
 except by editing .wxr file.
+WORKAROUND:
+wxWINDOWS VERSION:      2.0.1
+PLATFORM(S):            All
+DATE IDENTIFIED:        ?/?/1998
+IDENTIFIED BY:          Julian Smart <julian.smart@ukonline.co.uk>
+DATE FIXED:
+FIXED BY:
+
+
+---------------------------END OF BUGLIST-------------------------
+

--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,22 +1,10 @@
 wxWindows 2 Change Log
 ----------------------

-2.1.0, b?, June 2nd 1999
------------------------
+NOTE: for changes after wxWindows 2.1.0 b4, please see the CVS
+change log.

-wxGTK:
-
-
-wxMSW:
-
-
-wxMotif:
-
-
-General:
-
- Fixed day_of_week bug (Peter Stadel).
- Added Inside(), SetLeft/Right/Top/Bottom, +, += to wxRect.
+Major improvements are listed in readme.txt.

 2.1.0, b4, May 9th 1999
 -----------------------
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,4 +1,121 @@

+7st November '99: wxWindows 2.1.11 released
+
+There is still an unresolved problem with bitmap to image
+conversion on big-endian architectures (such as Solaris),
+where color values get exchanged. I'd need help on this
+one as I have no BE computer.
+
+Enlightment has struck the majority of the developers and
+they have chosen to use the Linux kernel numbering scheme
+for wxWindows from now on. This means that the next stable
+release will be called wxWindows 2.2.X, development snapshots
+will be called 2.1.X.
+
+A lot of discussion has been wasted on how to maintain a
+once released stable version. It was almost universally 
+agreed that only a commercial entity will have the motivation 
+($$$) to do that - so far there is no wxWindows Inc.
+
+Support for GTK 1.0 has been dropped. This version has
+been tested with GTK 1.2.3 and GTK 1.2.6 - it might
+not work with some other versions.
+
+Rewritten the support for multiple-format Drag'n'Drop and
+clipboard under both GTK and MSW. There are probably some
+problems here and there left.
+
+wxListBox and wxChoice can now handle only either void 
+client data (which it will not delete on destruction) or 
+client data of the wxClientData type (which it will delete),
+instead of both at the same time. The same will happen
+to wxComboBox some time. Also, wxListBox can now sort its
+items.
+
+Many build fixes for various platforms have been applied,
+try again, poor AIX, HP-UX and *BSD users, but don't reckon
+with immediate success. Actually, when using GNU compilers,
+your chances are quite good.
+
+My rewrite of the wxWindows underlying GTK widget
+has turned scrolling including subwindows from barely
+functional to pretty and fast. I also added scrolling
+of foreign windows to wxScrolledWindow.
+
+Setting size hints for the window manager might work now.
+
+wxSocket and Co. have been improved up to the point of
+calling it a rewrite. It works on wxMSW now too and
+seems pretty stable, but testing is still welcome.
+
+The ODBC classes contributed by Remstar Inc. have been
+overhauled (incl the sample) and have been tested with
+all relevant SQL databases (even DBase). For that reason
+I have reawakened the iODBC code from wxGTK 2.0 so you
+can now use wxODBC from wxMSW and wxGTK.
+
+Several printing things fixed. More work needs to be done
+here..
+
+HTML widget and the wxWindows' help system based upon
+it have been reorganized and improved for easier use
+from Python and C++. Also HTML printing has been added.
+
+wxSpinCtrl added. Like a wxSpinButton and a wxTextCtrl.
+
+Changed the beaviour of the popular new wxFileDialog to
+not forget the once typed file name when changing the
+directory.
+
+Implemented the wxSIMPLE_BORDER flag (simple black line
+without shadow affect).
+
+Michael is writing a complete rewrite of the antiquated
+wxGrid. This is still work-in-progress and might not make
+it into wxWindows 2.2, we'll see. Help would be welcome
+to make that happen.
+
+Made wxMenu code lose less memory, also added wxMenu::Delete().
+
+Added code to send wxActivateEvent to MDI windows.
+
+Vadim added configure things to compile wxWindows without any
+GUI library. This is probably work in progress. He'll also add
+a wxFontEnumerator class and has enhanced wxFont to make use
+of char-encodings.
+
+wxSlider, wxWindow, wxScrollBar now emit the correct events
+for scrolling (like page up, line up etc) instead of just
+"thumb-track" as before.
+
+Corrected Reparent() code, including the special case for
+wxToolBar (as the toolbar sits in a different window than
+normal windows).
+
+Corrected key accelerator code for toplevel child windows
+and added support for more key combinations - pretty much
+all, actually.
+
+Corrected cursor handling in a number of special cases.
+
+wxGLCanvas now waits until all expose events have been sent
+and then emits its own redraw event. Also removed flicker
+for wxGLCanvas and in some other places.
+
+A handler to read PCX file (in most variants) has been added.
+
+A number of problems with compressed and socket streams have
+been solved.
+
+Changed behavour of wxTextStream to make use of deliminators
+and default to space as the standard C++ stream do.
+
+Changes to tab traversal code to better reflect MSW code.
+
+Corrected problems with wxGenericValidator and certain controls.
+
+Made default button action work in more cases.
+
 28th August '99: Ninth wxGTK 2.1 snapshot released

 As the old makefile system didn't work, I trashed it and wrote
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -65,7 +65,7 @@ cd ..
 * The most simple errors
 ------------------------

-configure reports, that you don't have GTK 1.X installed although you are 
+configure reports, that you don't have GTK 1.2 installed although you are 
 very sure you have. Well, you have installed it, but you also have another 
 version of the GTK installed, which you may need to remove including other 
 versions of glib (and its headers). Also, look for the PATH variable and check 
@@ -90,7 +90,7 @@ program - or due to using a broken compiler (and its optimisation) such as GCC 2

 Now create your super-application myfoo.app and compile anywhere with

-g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo

 * General
 -----------------------
@@ -111,15 +111,13 @@ YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect, but I tried...
 -----------------------

 wxWindows/GTK requires the GTK+ library to be installed on your system. It has to 
-be a stable version, preferebly version 1.2.3. You can use GTK 1.0 in connection 
-with wxWindows, albeit without Drag'n'Drop. wxWindows does work with the 1.1.X 
-versions of the GTK+ library.
+be a stable version, preferebly version 1.2.3.

 You can get the newest version of the GTK+ from the GTK homepage at:

  http://www.gtk.org
  
-We also mirror GTK+ 1.0.6 at my ftp site. You'll find information about downloading 
+We also mirror GTK+ 1.2.3 at my ftp site. You'll find information about downloading 
 at my homepage.
  
 * Additional libraries
@@ -145,7 +143,7 @@ make install
 ldconfig
 exit
  
-NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
+NB: DO NOT COMPILE WXGTK WITH GCC 2.7 AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
 START-UP! Just always use egcs and be happy.

 * Building wxGTK on OS/2
@@ -153,11 +151,11 @@ START-UP! Just always use egcs and be happy.

 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
-make the installation work (better) to me (Robert Roebling).
+make to me (Robert Roebling) or the wxWindows mailing list.

-You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3), 
-gtk+ (?), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
-korn shell (5.2.13), Autoconf (?),  GNU file utilities (3.6), 
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
+korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6), 
 GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
 sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).

@@ -165,11 +163,17 @@ Open an OS/2 prompt and switch to the directory above.
 First set some global environment variables we need:

 SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
+SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__
 SET OSTYPE=OS2X              
 SET COMSPEC=sh

 Notice you can choose whatever you want, if you don't like OS2X.

+After running configure, you'll have to apply to modifications manually
+to the created Makefile:
+- Replace all ":" with ";" in the VPATH variable
+- Replace "ley.yy.c" with "lexyy.c"
+
 * Building wxGTK on SGI
 --------------------------

@@ -241,12 +245,12 @@ toolkit. You must do this by running configure with either of:

 The following options handle the kind of library you want to build.

-	--disable-threads       Compile without thread support. Threads
-	                        support is also required for the
-				socket code to work.
+	--disable-threads       Compile without thread support.

 	--disable-shared        Do not create shared libraries.

+	--enable-static         Create static libraries.
+
 	--disable-optimise	Do not optimise the code. Can
 	                        sometimes be useful for debugging
 				and is required on some architectures
@@ -272,7 +276,7 @@ The following options handle the kind of library you want to build.
 				
 	--enable-permissive     Enable compilation without creation of
 	                        giving erros as soon as you compile with
-				Solaris ANSI-defying headers...
+				Solaris' ANSI-defying headers...
 				
 	--enable-mem_tracing    Add built-in memory tracing.
 				
@@ -307,7 +311,13 @@ are
 	
 	--without-libjpeg	Disables JPEG image format code.
 	
-{	--without-odbc          Disables ODBC code. Not yet. }
+	--disable-pnm		Disables PNM image format code.
+	
+	--disable-gif		Disables GIF image format code.
+	
+	--disable-pcx		Disables PCX image format code.
+	
+	--without-odbc          Disables ODBC code.
 	
        --disable-resources     Disables the use of *.wxr type
 	                        resources.
@@ -402,20 +412,9 @@ to sitch to tmake.

 2) The other way creates a project within the source code 
 directories of wxWindows. For this endeavour, you'll need
-the usual number of GNU tools, at least
-
-GNU automake version 1.4
-GNU autoheader version 2.14
-GNU autoconf version 2.14
-GNU libtool version 1.3
-
-and quite possibly 
-
-GNU make
-GNU C++
-
-and if you have all this then you probably know enough to
-go ahead yourself :-)
+GNU autoconf version 2.14 and add an entry to your Makefile.in
+to the bottom of the configure.in script and run autoconf
+and configure before you can type make.

 ----------------------

--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,10 +1,17 @@

-  Welcome to wxWindows/Gtk 2.1 snapshot 9,
+   Welcome to wxWindows/Gtk 2.1.11

 you have downloaded version 2.1 of the GTK+ 1.2 port of 
-the wxWindows GUI library. This is a developers release
-and is it not suited for production development. Beware
-that major changes can happen before a final release.
+the wxWindows GUI library. Although this is not yet the
+final stable release wxGTK 2.2, the current version has
+been tested carefully on many systems and has been found
+to work better than any other previous version.
+
+Nonetheless, beware that major changes can happen before 
+a final release.
+
+wxWindows no longer supports GTK 1.0 (as did some early
+snapshots) so that you will need GTK 1.2 when using it.

 Beginning with snapshot 9, wxWindows uses a completely
 new make file system on Unix which no longer uses the
@@ -15,18 +22,17 @@ More information is available from my homepage at:

  http://wesley.informatik.uni-freiburg.de/~wxxt
  
-and about the wxWindows project as a whole (and the
-Windows and Motif ports in particular) can be found
-at Julian Smart's homepage at:
+and about the wxWindows project as a whole (and the MSW
+and Motif ports in particular) can be found at Julian's 
+homepage at:

  http://web.ukonline.co.uk/julian.smart/wxwin
  
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
-many systems (when using GTK 1.0 or when not using Linux
-read the INSTALL.txt):
+many systems:

-./configure
+./configure --with-gtk
 make
 su <type root password>
 make install
@@ -35,24 +41,24 @@ exit

 When you run into problems, please read the INSTALL.txt and 
 follow those instructions. If you still don't have any success,
-please send a bug report to one of our mailing lists (see
-my homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND 
-YOUR PROBLEM, SUCH AS YOUR VERSION OF GTK, WXGTK, WHAT
-DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know 
-this has no effect, but I tried...
+please send a bug report to one of our mailing list, INCLUDING 
+A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR 
+VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR 
+WAS REPORTED. I know this has no effect, but I tried...

 The library produced by the install process will be called 
-libwx_gtk.a (static) and libwx_gtk-2.1.so.0.0.0 (shared) so that 
-once a binary incompatible version of wxWindows/Gtk comes out 
-we'll augment the library version number to avoid linking problems.
+libwx_gtk.a (static) and libwx_gtk-2.1.so.11.0.0 (shared) so 
+that once a binary incompatible version of wxWindows/Gtk comes 
+out we'll augment the library version number to avoid linking 
+problems.

 Please send problems concerning installation, feature requests, 
 bug reports or comments to the wxWindows users list. Information 
 on how to subscribe is available from my homepage.

-wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
-crash your harddisk or destroy your monitor. It doesn't claim to be
-suitable for any special or general purpose.
+wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
+might crash your harddisk or destroy your monitor. It doesn't 
+claim to be suitable for any special or general purpose.

  Regards,

--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
@@ -1,16 +1,10 @@

 -------------------- High priority ---------------------

-Finalise DnD API.
- 
 Fix bug that thread sample reports about non-finished threads.

-Added wxExpandedImageList to wxTreeControl.
-
 More testing of Unicode support.

-Make wxSockets work on all platform.
-
 Add ID based i18n system as a replacement for the
  unelegant gettext system.
  
@@ -20,8 +14,6 @@ Add TIFF handler. Someone? (Hint, hint).

 Improve, update translations. Install *.mo files somewehere.

-Sleep, eat, walk, study, shave, read, play piano and wash less.
-
 -------------------- Medium priority ---------------------

 Show accelerator control labels and actually implement them
--- a/docs/html/icons/no.gif
+++ b/docs/html/icons/no.gif
--- a/docs/html/icons/somewhat.gif
+++ b/docs/html/icons/somewhat.gif
--- a/docs/html/icons/yes.gif
+++ b/docs/html/icons/yes.gif
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -134,7 +134,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 </td>

 <td align=center>
-<a href="../winhelp/proplist.hlp">Propert List Classes</a>
+<a href="../winhelp/proplist.hlp">Property List Classes</a>
 </td>

 <td align=center>
@@ -190,6 +190,8 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 supported platforms (currently Windows and GTK only).
 <li><a href="../../samples/config">config</a>: demonstrates use of wxConfig, which
 defaults to wxRegConfig on WIN32, wxIniConfig on WIN16, and wxFileConfig on other platforms.
+<li><a href="../../samples/console">console</a>: demonstrates a console application using
+console-mode (no-GUI) compilation of wxWindows.
 <li><a href="../../samples/controls">controls</a>: sample showing a variety of controls, including
 wxNotebook.
 <li><a href="../../samples/db">db</a>: wxDB ODBC sample.
@@ -204,21 +206,34 @@ For printing-related dialogs, see the printing sample.
 using wxFrame.
 <li><a href="../../samples/docvwmdi">docvwmdi</a>: : demonstrates use of the document view classes,
 using wxMDIParentFrame, wxMDIChildFrame.
+<li><a href="../../samples/drawing">drawing</a>: tests device context drawing.
 <li><a href="../../samples/dynamic">dynamic</a>: shows how to connect events to member functions
 dynamically.
 <li><a href="../../samples/forty">forty</a>: a great little card game by Chris Breeze. A
 fully-fledged application!
+<li><a href="../../samples/font">font</a>: tests fonts, font enumerator, font encodings.
 <li><a href="../../samples/fractal">fractal</a>: fractal mountains by Andrew Davison.
 <li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class.
 <li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
 <li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
 applications and also as a help facility.
+  <ul>
+  <li><a href="../../samples/html/about">about</a>: shows use of a wxHTML widget inside an About box.
+  <li><a href="../../samples/html/help">help</a>: shows use of wxHtmlHelpController to display wxHTML help.
+  <li><a href="../../samples/html/helpview">helpview</a>: a stand-alone wxHTML help viewer.
+  <li><a href="../../samples/html/printing">printing</a>: shows how easy it is to preview and print HTML files.
+  <li><a href="../../samples/html/test">test</a>: general wxHTML test application.
+  <li><a href="../../samples/html/virtual">virtual</a>: demonstrates the virtual file system feature.
+  <li><a href="../../samples/html/widget">widget</a>: demonstrates the use of controls in HTML pages.
+  <li><a href="../../samples/html/zip">zip</a>: shows how help files can be packaged in zip archives.
+  </ul>
 <li><a href="../../samples/image">image</a>: shows off the cross-platform wxImage class.
 <li><a href="../../samples/internat">internat</a>: use of wxWindows' internationalization support.
 <li><a href="../../samples/joytest">joytest</a>: tests the wxJoystick class (currently Windows and GTK only).
 <li><a href="../../samples/layout">layout</a>: shows the constraint layout system in action.
 <li><a href="../../samples/listctrl">listctrl</a>: demonstrates the wxListCtrl (implemented natively on
 WIN32, and using a generic version on other platforms).
+<li><a href="../../samples/menu">menu</a>: tests menus.
 <li><a href="../../samples/mdi">mdi</a>: shows off the MDI (Multiple Document Interface) classes. On Windows, the regular MDI
 scheme is used whereby child windows have full sizing and moving rights within the main
 window. On other platforms, tabbed windows are used, where the children are always maximized.
@@ -231,6 +246,8 @@ platforms that don't support it, a normal-sized title bar is displayed.
 small a wxWindows application as you can get.
 <li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWindows can load a standard Windows
 dialog resource, translating the controls into wxWindows controls (Windows only).
+<li><a href="../../samples/nettest">nettest</a>: wxDialUpManager demo.
+<li><a href="../../samples/newgrid">newgrid</a>: demonstrates the new wxGrid implementation, by Michael Bedward.
 <li><a href="../../samples/notebook">notebook</a>: shows the wxNotebook (tabbed window) control.
 <li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
 Excel to be present).
@@ -244,6 +261,9 @@ Excel to be present).
 facilities.
 <li><a href="../../samples/sashtest">sashtest</a>: demonstrates use of the wxSashWindow class to allow
 the user to resize subwindows.
+<li><a href="../../samples/scroll">scroll</a>: demonstrates wxScrolledWindow.
+<li><a href="../../samples/scrollsub">scrollsub</a>: demonstrates the use of wxScrolledWindow to scroll
+an embedded window.
 <li><a href="../../samples/splitter">splitter</a>: demonstrates the wxSplitterWindow class.
 <li><a href="../../samples/tab">tab</a>: demonstrates the generic tab window class. You should
 normally use wxNotebook instead, but the generic code is sometimes useful, for example for
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -0,0 +1,90 @@
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="Author" content="Vadim Zeitlin">
+</head>
+<body>
+
+You will find below the list of all supported platforms for different ports of wxWindows 2.x (wxMSW/wxGTK/wxMotif ports
+only). The cross icon in the third column doesn't mean that the platform is not supported, but just that wxWindows hasn't
+been tested on it recently.
+<p>
+If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list!
+We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX,
+other flavours of BSD, ...
+<p>
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+
+<tr>
+<td bgcolor="#660000" colspan=5> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> wxWindows 2 Platforms </font> </td>
+</tr>
+
+<tr>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Platform </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Compiler </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Status </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Tested by </font> </td>
+<td bgcolor="#DEDEDE" align=center valign=top> <font face="Arial, Lucida Sans, Helvetica" color="#000000"> Remarks </font> </td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=6>Win32 (Windows 9x/NT)</td>
+     <td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
+<tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Myngw32</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td>Cross compilation from Linux works as well</td>
+<tr> <td>Cygwin</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Watcom C++ 10</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Symantec C++</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=2>Win16 (Windows 3.1)</td>
+     <td>Visual C++ 1.52</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td>
+     <td rowspan=2 valign=center>Some features are missing (OLE related classes, threads, ...)</td>
+<tr> <td>Borland C++ 4.0</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=4>Linux</td>
+     <td>wxGTK with gcc 2.7.2</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxGTK with egcs 1.1.1</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ, RR</td><td><br></td>
+<tr> <td>wxGTK with gcc 2.95</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxMotif with egcs 1.1.1</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td>with <a href=http://www.lesstif.org>LessTif</a> 0.87</td>
+</tr>
+
+<tr>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
+     <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=3>Solaris</td>
+     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxMotif with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#F0F0F0" align=center valign=center rowspan=2>AIX</td>
+     <td>wxGTK with AIX CC</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>wxMotif with AIX CC</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+<tr>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=2>HP-UX</td>
+     <td>wxGTK with HP CC A.10.22</td><td align=center><IMG SRC="icons/somewhat.gif" ALT=Unknown></td><td><br></td>
+     <td>special extra compiler options must be manually added, see the docs for details</td>
+<tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+</tr>
+
+</table>
+
+<br>
+
+<hr>
+Contact <A HREF="mailto:zeitlin@dptmaths.ens-cachan.fr">me</A> with
+any comments/suggestions.
+
+</body>
+</html>
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -0,0 +1,205 @@
+<HTML>
+<HEAD>
+  <TITLE>wxWindows Roadmap</TITLE>
+</HEAD>
+
+<BODY>
+
+<a name="top"></a>
+
+<font face="Arial, Lucida Sans, Helvetica">
+
+<table width=100% border=4 cellpadding=5 cellspacing=0>
+<tr>
+<td bgcolor="#660000">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+wxWindows Roadmap
+</font>
+</td>
+</tr>
+</table>
+
+<P>
+
+<CENTER>
+<a href="#schedule">Schedule</a> | <a href="#todo">To-Do List</a>
+</CENTER>
+
+<P>
+
+This page represents current thinking about where wxWindows is going in the near, 
+medium and long-term. It also serves as a schedule for new releases so
+that both developers and users can know what to expect when, at least approximately.<P>
+
+We are adopting the Linux kernel style of numbering system where odd minor version numbers are development
+versions, and even numbers are stable versions. For example, 2.1.x are development releases,
+and the next 'stable' or final release of it would be 2.2.<P>
+
+Bug-fix patches to the stable release (if made) then become point
+releases of 2.2 (2.2.x) while development continues with wild abandon
+on 2.3.x until the end of the next development cycle when it is
+released as 2.4.<P>
+
+Development versions that end up on the FTP site or CD-ROM, as opposed to remaining
+in the CVS archive, are semi-stable -- i.e. they are checked for compilation and
+run-time problems, but not as thoroughly as the stable versions.<P>
+
+Note that since the wxWindows effort is voluntary, these are not hard-and-fast deadlines:
+but we will endeavour to follow them as closely as possible.<P>
+
+Note also that the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
+its own development path but is due to merge with the main code base in November/December.
+Also, minor snapshot releases for specific platforms may be
+available at dates convenient to the developers.<P>
+
+<CENTER>
+<HR> <FONT SIZE=+2><I><B><a name="schedule">Schedule</a></B></I></FONT> <HR>
+</CENTER>
+<P>
+
+<H4>Release 2.1.11</H4>
+
+Release date: November 7th, 1999<P>
+
+<ul>
+<li>Split wxWindows into base and GUI libraries. Most, but not all makefiles
+are expected to support this: for the rest, the makefiles will build a valid
+combined base/GUI library for GUI applications only.
+<li>wxWizard (beta).
+<li>wxDialUpManager and wxPhoneDialer.
+<li>wxFontEnumerator.
+<li>Preliminary support for different font encodings
+<li>wxPostEvent function
+<li>New wxGrid.
+<li>wxSocket working.
+<li>Full support for fonts in different encodings.
+<li>Tested multithreading support (wxThread).
+<li>wxHTML printing.
+<li>Better i18n support (i.e. more translations).
+</ul>
+
+<P>
+
+<H4>Release 2.2 (stable)</H4>
+
+Release date: December 19th, 1999.<P>
+
+<ul>
+<li>Miscellaneous fixes and small enhancements.
+</ul>
+
+<P>
+
+<H4>Release 2.3</H4>
+
+Release date: March 5th, 2000
+
+<ul>
+<li>Miscellaneous fixes and small enhancements.
+<li>wxDateTime class in beta.
+<li>Context sensitive help.
+<li>More i18n issues: dates, times, ...
+<li>Regular expressions support.
+</ul>
+
+<P>
+
+<H4>Release 2.4 (stable)</H4>
+
+Release date: May 7th, 2000.
+
+<ul>
+<li>Unicode compilation starting to work in wxGTK and wxMSW.
+<li>wxDateTime class.
+</ul>
+
+<P>
+
+<CENTER>
+<HR> <FONT SIZE=+2><I><B><a name="todo">To-Do List</a></B></I></FONT> <HR>
+</CENTER>
+
+<P>
+
+Developers: please feel free to add to these, and delete them when they are done.
+
+<P>
+
+<B><I>General</I></B><P>
+
+<ul>
+<li>wxHTML printing. When finished, this will allow an application to generate
+printed reports with very little effort.
+<li>wxSocket.
+<li>Split library into several, for base (classes and functions usable by console and GUI
+applications), console (classes and functions usable by console application only)
+and GUI (classes and functions usable by GUI application only).
+<li>Extend and unify drag and drop handling (e.g. we need to specify multiple drop targets
+that can handle multiple formats).
+<li>Expand the number of controls that can be specified in a WXR file;
+add constraint specification to WXR syntax and Dialog Editor; add multilanguage support to WXR.
+May be we'd better change the format completely and replace WXR with XML
+(providing conversion utility for old files)?
+<li>Context sensitive help: we need to have wxHelpEvent which would be
+generated when the help for a given control is requested and a standard
+handler for it in wxWindow which would invoke the default help system with the
+correct help id.
+<li>Rewrite Dialog Editor.
+<li>Modem-oriented classes: wxDialUpManager for dialing up the ISP and
+determining if there is a connection to Internet on the machine and
+wxPhoneDialer for dialing arbitrary phone numbers and otherwise communicating
+with the modem.
+<li>wxImage handlers in separate .h and .cpp files.
+<li>PCX writing code.
+<li>GIF animation code.
+<li>Tidying of timer code, addition of wxChrono class.
+<li>Debug wxPostScriptDC further.
+<li>wxDateTime class.
+<li>Regular expressions support.
+<li>Expansion of wxHTML to support further tags, and frames.
+<li>MGL port (see Backroom/Future Ports page).
+<li>Rotated text support.
+<li>FreeType support.
+<li>Support for 'skins', perhaps using a set of alternative control and window classes
+written generically in wxWindows.
+<li>Serial and parallel port support.
+<li>Modem and telephony support.
+<li>Book, tutorial.
+<li>More examples.
+<li>Bug tracking system.
+</ul>
+
+<P>
+
+<B><I>wxMSW</I></B><P>
+
+<ul>
+<li>Windows CE port.
+<li>Cure bug whereby in a panel within another panel, all buttons become
+default buttons (heavy black border).
+<li>Write a RC->WXR converter.
+</ul>
+
+<P>
+
+<B><I>wxGTK</I></B><P>
+
+<ul>
+<li>GNOME/KDE integration libraries.
+</ul>
+
+<P>
+
+<B><I>wxMotif</I></B><P>
+
+<ul>
+<li>Fix menu accelerators
+<li>Fix refresh problems
+<li>Allow wxSystemSettings to be configurable, perhaps via a control
+panel application.
+</ul>
+
+
+</BODY>
+</HTML>
+
--- a/docs/html/standard.htm
+++ b/docs/html/standard.htm
@@ -24,7 +24,7 @@ wxWindows Programmer Style Guide
 by <A HREF=mailto:zeitlin@dptmaths.ens-cachan.fr>Vadim Zeitlin</A><P>

 This guide is intended for people who are (or intending to start) writing code
-for <A HREF="http://web.ukonline.co.uk/julian.smart/wxwin/" target=_top>wxWindows</A> class library.
+for <A HREF="http://www.wxwindows.org" target=_top>wxWindows</A> class library.

 <P>
 The guide is separated into two parts: the first one addresses the general
@@ -35,7 +35,7 @@ its goal it to make wxWindows as uniform as possible without imposing too
 many restrictions on the programmer.
 <P>
 Acknowledgements: This guide is partly based on <A
-HREF=http://www.mozilla.org/docs/tplist/catBuild/portable-cpp.html target=_top>
+HREF="http://www.mozilla.org/hacking/portable-cpp.html" target=_top>
 C++ portability guide</A> by David Williams.

 <P>
@@ -50,6 +50,7 @@ C++ portability guide</A> by David Williams.
    <LI><A HREF="#no_stl">Don't use STL</A></LI>
    <LI><A HREF="#no_fordecl">Don't declare variables inside <TT>for()</TT></A></LI>
    <LI><A HREF="#no_nestedclasses">Don't use nested classes</A></LI>
+    <LI><A HREF="#no_ternarywithobjects">Use ternary operator ?: carefully</A></LI>
  </OL>
  <BR>
  <LI>General recommendations</LI>
@@ -58,8 +59,8 @@ C++ portability guide</A> by David Williams.
    <LI><A HREF="#no_warnings">Turn on all warnings and eradicate them</A></LI>
    <LI><A HREF="#no_assume_sizeof">Don't rely on <TT>sizeof(int) == 2</TT>...</A></LI>
    <LI><A HREF="#no_assignment_in_if">No assignments in conditional expressions</A></LI>
-    <LI><A HREF="#no_comment_code">Use <TT>#if 0</TT> rather than comments to temporarily
-                    disable blocks of code</A></LI>
+    <LI><A HREF="#no_comment_code">Use <TT>#if 0</TT> rather than comments to temporarily disable blocks of code</A></LI>
+    <LI><A HREF="#no_overloaded_virtuals">Avoid overloaded virtual functions</A></LI>
    <LI><A HREF="#no_extra_semicolon">Don't use extra semi-colons on top level</A></LI>
  </OL>
  <BR>
@@ -75,10 +76,8 @@ C++ portability guide</A> by David Williams.
  <LI>Style choices</LI>
  <OL>
    <LI><A HREF="#naming_conv">Naming conventions: use <TT>m_</TT> for members</A></LI>
-    <LI><A HREF="#no_void_param">Don't use <TT>void</TT> for functions without
-                    arguments</A></LI>
-    <LI><A HREF="#no_const_int">Don't use <TT>const</TT> for non pointer/reference
-                    arguments</A></LI>
+    <LI><A HREF="#no_void_param">Don't use <TT>void</TT> for functions without arguments</A></LI>
+    <LI><A HREF="#no_const_int">Don't use <TT>const</TT> for non pointer/reference arguments</A></LI>
  </OL>
 </UL>

@@ -108,6 +107,7 @@ C++ portability guide</A> by David Williams.
    <LI><A HREF="#wxdllexport">Use WXDLLEXPORT with all classes/functions in
                               wxMSW/common code</A></LI>
    <LI><A HREF="#set_get">Use Set/Get prefixes for accessors</A></LI>
+    <LI><A HREF="#constants">wxNAMING_CONSTANTS</A></LI>
  </OL>

  <BR>
@@ -331,6 +331,25 @@ you can try the following:
 <P>A nice side effect is that you don't need to recompile all the files
 including the header if you change the PrivateLibClass declaration (it's
 an example of a more general interface/implementation separation idea).
+
+  <P><LI><A NAME="no_ternarywithobjects"></A><B>Use ternary operator ?: carefully</B></LI><P>
+  The ternary operator <TT>?:</TT> shouldn't be used with objects (i.e. if any
+of its operands are objects) because some compilers (notable Borland C++) fail
+to compile such code.
+<P><U>Workaround</U>: use <TT>if/else</TT> instead.
+<PRE>
+    wxString s1, s2;
+
+    // Borland C++ won't compile the line below
+    wxString s = s1.Len() < s2.Len() ? s1 : s2;
+
+    // but any C++ compiler will compile this
+    wxString s;
+    if ( s1.Len() < s2.Len() )
+        s = s1;
+    else
+        s = s2;
+</PRE>
 </OL>

  <BR>
@@ -423,7 +442,7 @@ sizes are different. A small table illustrates it quite well:
 Although close to the heart of many C programmers (I plead guilty), code like
 classical <TT>if ( (c = getchar()) != EOF )</TT> is bad because it prevents you
 from enabling "assignment in conditional expression" warning (see also
-<A HREF="#no_warnings">above</A>) warning which is helpful to detect common
+<A HREF="#no_warnings">above</A>) which is helpful to detect common
 mistypes like <TT>if ( x = 2 )</TT> instead of <TT>if ( x == 2 )</TT>.

    <P><LI><A NAME="no_comment_code"></A><B>Use <TT>#if 0</TT> rather than comments to temporarily
@@ -443,6 +462,70 @@ instead of
 The reason is simple: if there are any <TT>/* ... */</TT> comments inside
 <TT>...</TT> the second version will, of course, miserably fail.

+    <P><LI><A NAME="no_overloaded_virtuals"></A><B>Avoid overloaded virtual functions</B></LI><P>
+
+You should avoid having overloaded virtual methods in a base class because if
+any of them is overriden in a derived class, then all others must be overriden
+as well or it would be impossible to call them on an object of derived class.
+
+For example, the following code:
+
+<PRE>
+    class Base
+    {
+    public:
+        virtual void Read(wxFile& file);
+        virtual void Read(const wxString& filename);
+    };
+
+    class Derived : public Base
+    {
+    public:
+        virtual void Read(wxFile& file) { ... }
+    };
+
+    ...
+
+    Derived d;
+    d.Read("some_filename");    // compile error here!
+</PRE>
+
+will fail to compile because the base class function taking <TT>filename</TT>
+is hidden by the virtual function overriden in the derived class (this is
+known as [virtual] function name hiding problem in C++).
+
+<P>
+The standard solution to this problem in wxWindows (where we have such
+situations quite often) is to make both <TT>Read()</TT> functions not virtual
+and introduce a single virtual function <TT>DoRead()</TT>. Usually, it makes
+sense because the function taking a filename is (again, usually) implemented
+in terms of the function reading from a file anyhow (but making only this
+functions not virtual won't solve the above problem!).
+<P>
+So, the above declarations should be written as:
+<PRE>
+    class Base
+    {
+    public:
+        void Read(wxFile& file);
+        void Read(const wxString& filename);
+
+    protected:
+        virtual void DoRead(wxFile& file);
+    };
+
+    class Derived : public Base
+    {
+    protected:
+        virtual void DoRead(wxFile& file) { ... }
+    };
+</PRE>
+
+This technique is widely used in many of wxWindows classes - for example,
+<TT>wxWindow</TT> has more than a dozen of <TT>DoXXX()</TT> functions which
+allows to have many overloaded versions of commonly used methods such as
+<TT>SetSize()</TT>
+
    <P><LI><A NAME="no_extra_semicolon"></A><B>Don't use extra semi-colons on top level</B></LI><P>
 Some compilers don't pay any attention to extra semicolons on top level, as in
 <PRE>
@@ -742,6 +825,25 @@ case you should put them inside <TT>common/cmndata.cpp</TT> file.
 There is a convention in wxWindows to prefix the accessors (i.e. any simple, in
 general, inline function which does nothing else except changing or returning
 the value of a member variable) with either <TT>Set</TT> or <TT>Get</TT>.
+
+    <P><LI><A NAME="constants"></LI><B>wxNAMING_CONSTANTS</B><P>
+The constants in wxWindows code should be defined using <TT>enum</TT> C++
+keyword (and not with <TT>#define</TT> or <TT>static const int</TT>). They
+should be declared in the global scope (and not inside class declaration) and
+their names should start with a <TT>wx</TT> prefix. Finally, the constants
+should be in all capital letters (except the first 2) to make it easier to
+distinguish them from the variables with underscores separating the words.
+
+<P>For example, file-related constants should be declared like this:
+<pre>
+enum
+{
+    wxFILEOPEN_READ,
+    wxFILEOPEN_WRITE,
+    wxFILEOPEN_READWRITE
+};
+</pre>
+
  </OL>

  <P><LI>Miscellaneous</LI><P>
@@ -764,7 +866,7 @@ stubs for not (yet) implemented functions which silently return incorrect
 values - otherwise, a person using a not implemented function has no idea that
 it is, in fact, not implemented.
 <P>As all debugging macros only do something useful if the symbol
-<TT>__DEBUG__</TT> is defined, you should compile your programs in debug mode to profit
+<TT>__WXDEBUG__</TT> is defined, you should compile your programs in debug mode to profit
 from them.
  </OL>
 </UL>
--- a/docs/latex/wx/accel.tex
+++ b/docs/latex/wx/accel.tex
@@ -137,6 +137,10 @@ Loads the accelerator table from a Windows resource (Windows only).

 \docparam{resource}{Name of a Windows accelerator.}

+\pythonnote{The wxPython constructor accepts a list of
+wxAcceleratorEntry objects, or 3-tuples consisting of flags, keyCode,
+and cmd values like you would construct wxAcceleratorEntry objects with.}
+
 \membersection{wxAcceleratorTable::\destruct{wxAcceleratorTable}}

 \func{}{\destruct{wxAcceleratorTable}}{\void}
--- a/docs/latex/wx/arrstrng.tex
+++ b/docs/latex/wx/arrstrng.tex
@@ -6,8 +6,8 @@ wxArrayString is an efficient container for storing
 are added to it (so it is as easy to use as a linked list), but the access
 time to the elements is constant, instead of being linear in number of
 elements as in the case of linked lists. It is also very size efficient and
-doesn't take more space than a C array {\it wxString[]} type. wxArrayString
-uses its knowledge of internals of wxString class to achieve this.
+doesn't take more space than a C array {\it wxString[]} type (wxArrayString
+uses its knowledge of internals of wxString class to achieve this).

 This class is used in the same way as other dynamic \helpref{arrays}{wxarray},
 except that no {\it WX\_DEFINE\_ARRAY} declaration is needed for it. When a
@@ -26,8 +26,18 @@ array elements may be modified in place like this
    array.Last().MakeUpper();
 \end{verbatim}

-Finally, none of the methods of this class is virtual including its
-destructor, so this class should not be derived from.
+There is also a varian of wxArrayString called wxSortedArrayString which has
+exactly the same methods as wxArrayString, but which always keeps the string
+in it in (alphabetical) order. wxSortedArrayString uses binary search in its 
+\helpref{Index}{wxarraystringindex} function (insteadf of linear search for
+wxArrayString::Index) which makes it much more efficient if you add strings to
+the array rarely (because, of course, you have to pay for Index() efficiency
+by having Add() be slower) but search for them often. Several methods should
+not be used with sorted array (basicly, all which break the order of items)
+which is mentioned in their description.
+
+Final word: none of the methods of wxArrayString is virtual including its
+destructor, so this class should not be used as a base class.

 \wxheading{Derived from}

@@ -54,6 +64,9 @@ functions.

 Default and copy constructors.

+Note that when an array is assigned to a sorted array, its contents is
+automatically sorted during construction.
+
 \membersection{wxArrayString::\destruct{wxArrayString}}\label{wxarraystringdtor}

 \func{}{\destruct{wxArrayString}}{}
@@ -69,7 +82,7 @@ Assignment operator.

 \membersection{wxArrayString::operator[]}\label{wxarraystringoperatorindex}

-\func{wxString\&}{operatorp[]}{\param{size\_t }{nIndex}}
+\func{wxString\&}{operator[]}{\param{size\_t }{nIndex}}

 Return the array element at position {\it nIndex}. An assert failure will
 result from an attempt to access an element beyond the end of array in debug
@@ -79,9 +92,15 @@ This is the operator version of \helpref{Item}{wxarraystringitem} method.

 \membersection{wxArrayString::Add}\label{wxarraystringadd}

-\func{void}{Add}{\param{const wxString\& }{str}}
+\func{size\_t}{Add}{\param{const wxString\& }{str}}

-Appends a new item to the array.
+Appends a new item to the array and return the index of th new item in the
+array.
+
+{\bf Warning:} For sorted arrays, the index of the inserted item will not be,
+in general, equal to \helpref{GetCount()}{wxarraystringgetcount} - 1 because
+the item is inserted at the correct position to keep the array sorted and not
+appended.

 See also: \helpref{Insert}{wxarraystringinsert}

@@ -136,6 +155,10 @@ Search the element in the array, starting from the beginning if
 {\it bFromEnd} is FALSE or from end otherwise. If {\it bCase}, comparison is
 case sensitive (default), otherwise the case is ignored.

+This function uses linear search for wxArrayString and binary search for
+wxSortedArrayString, but it ignores the {\it bCase} and {\it bFromEnd} 
+parameters in the latter case.
+
 Returns index of the first item matched or wxNOT\_FOUND if there is no match.

 \membersection{wxArrayString::Insert}\label{wxarraystringinsert}
@@ -152,6 +175,10 @@ Insert("foo", 0);
 If {\it nIndex} is equal to {\it GetCount() + 1} this function behaves as 
 \helpref{Add}{wxarraystringadd}.

+{\bf Warning:} this function should not be used with sorted array because it
+could break the order of items and, for example, subsequent calls to 
+\helpref{Index()}{wxarraystringindex} would not work then!
+
 \membersection{wxArrayString::IsEmpty}\label{wxarraystringisempty}

 \func{}{IsEmpty}{}
@@ -211,6 +238,10 @@ See also: \helpref{Alloc}{wxarraystringalloc}, \helpref{Dynamic array memory man
 Sorts the array in alphabetical order or in reverse alphabetical order if
 {\it reverseOrder} is TRUE.

+{\bf Warning:} this function should not be used with sorted array because it
+could break the order of items and, for example, subsequent calls to 
+\helpref{Index()}{wxarraystringindex} would not work then!
+
 See also: \helpref{Sort}{wxarraystringsortcallback}

 \membersection{wxArrayString::Sort (user defined)}\label{wxarraystringsortcallback}
@@ -245,5 +276,9 @@ array.Add("four");
 array.Sort(CompareStringLen);
 \end{verbatim}

+{\bf Warning:} this function should not be used with sorted array because it
+could break the order of items and, for example, subsequent calls to 
+\helpref{Index()}{wxarraystringindex} would not work then!
+
 See also: \helpref{Sort}{wxarraystringsort}

--- a/docs/latex/wx/bitmap.tex
+++ b/docs/latex/wx/bitmap.tex
@@ -143,7 +143,7 @@ Under X, {\it type} defaults to wxBITMAP\_TYPE\_XPM.
 \pythonnote{Constructors supported by wxPython are:\par
 \indented{2cm}{\begin{twocollist}
 \twocolitem{\bf{wxBitmap(name, flag)}}{Loads a bitmap from a file}
-\twocolitem{\bf{wxBitmap(data, type, width, height, depth=1)}}{Creates
+\twocolitem{\bf{wxBitmapFromData(data, type, width, height, depth=1)}}{Creates
 a bitmap from the given data, which can be of arbitrary type.}
 \twocolitem{\bf{wxNoRefBitmap(name, flag)}}{This one won't own the
 reference, so Python won't call the destructor, this is good for toolbars
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -1,16 +1,26 @@
 \section{\class{wxBitmapDataObject}}\label{wxbitmapdataobject}

-wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It can be
-used without change to paste data into the \helpref{wxClipboard}{wxclipboard}
-or a \helpref{wxDropSource}{wxdropsource}. A user may wish to derive a new class
-from this class for providing a bitmap on-demand in order to minimize memory consumption
-when offering data in several formats, such as a bitmap and GIF.
+wxBitmapDataObject is a specialization of wxDataObject for bitmap data. It can
+be used without change to paste data into the
+\helpref{wxClipboard}{wxclipboard} or a \helpref{wxDropSource}{wxdropsource}. A
+user may wish to derive a new class from this class for providing a bitmap
+on-demand in order to minimize memory consumption when offering data in several
+formats, such as a bitmap and GIF.

-In order to offer bitmap data on-demand \helpref{GetSize}{wxbitmapdataobjectgetsize} 
-and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.
+\pythonnote{If you wish to create a derived wxBitmapDataObject class in
+wxPython you should derive the class from wxPyBitmapDataObject
+in order to get Python-aware capabilities for the various virtual
+methods.}
+
+\wxheading{Virtual functions to override}
+
+This class may be used as is, but
+\helpref{GetBitmap}{wxbitmapdataobjectgetbitmap} may be overridden to increase
+efficiency.

 \wxheading{Derived from}

+\helpref{wxDataObjectSimple}{wxdataobjectsimple}\\
 \helpref{wxDataObject}{wxdataobject}

 \wxheading{Include files}
@@ -19,66 +29,19 @@ and \helpref{WriteData}{wxbitmapdataobjectwritedata} will have to be overridden.

 \wxheading{See also}

+\helpref{Clipboard and drag and drop overview}{wxdndoverview},
+\helpref{wxDataObject}{wxdataobject},
+\helpref{wxDataObjectSimple}{wxdataobjectsimple},
+\helpref{wxFileDataObject}{wxfiledataobject},
+\helpref{wxTextDataObject}{wxtextdataobject},
 \helpref{wxDataObject}{wxdataobject}

-\latexignore{\rtfignore{\wxheading{Members}}}
+\func{}{wxBitmapDataObject}{\param{const wxBitmap\& }{bitmap = wxNullBitmap}}

-\membersection{wxBitmapDataObject::wxBitmapDataObject}\label{wxbitmapdataobjectwxbitmapdataobject}
+Constructor, optionally passing a bitmap (otherwise use
+\helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later)

-\func{}{wxBitmapDataObject}{\void}
-
-Default constructor. Call \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later
-or override \helpref{WriteData}{wxbitmapdataobjectwritedata} and 
-\helpref{GetSize}{wxbitmapdataobjectgetsize} for providing data on-demand.
-
-\func{}{wxBitmapDataObject}{\param{const wxBitmap\& }{bitmap}}
-
-Constructor, passing a bitmap.
-
-\membersection{wxBitmapDataObject::GetSize}\label{wxbitmapdataobjectgetsize}
-
-\constfunc{virtual size\_t}{GetSize}{\void}
-
-Returns the data size. By default, returns the size of the bitmap data
-set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
-This can be overridden to provide size data on-demand. Note that you'd
-have to call the inherited GetSize method as this is the only way
-to get to know the transfer size of the bitmap in a platform dependent
-way - a bitmap has different size under GTK and Windows. In practice, 
-this would look like this:
-
-\begin{verbatim}
-size_t MyBitmapDataObject::GetSize()
-{
-  // Get bitmap from global container. This container
-  // should be able to "produce" data in all formats
-  // offered by the application but store it only in
-  // one format to reduce memory consumption.
-
-  wxBitmap my_bitmap = my_global_container->GetBitmap();
-  
-  // temporarily set bitmap
-  
-  SetBitmap( my_bitmap );
-
-  size_t ret = wxBitmapDataObject::GetSize();
-  
-  // unset bitmap again
-  
-  SetBitmap( wxNullBitmap );
-
-  retrun ret;
-}
-\end{verbatim}
-
-TODO: Offer a nicer way to do this. Maybe by providing a platform
-dependent function in this class like 
-
-\begin{verbatim}
-size_t GetBitmapSize( const wxBitmap &bitmap )
-\end{verbatim}
-
-\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgettext}
+\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgetbitmap}

 \constfunc{virtual wxBitmap}{GetBitmap}{\void}

@@ -91,26 +54,7 @@ the \helpref{wxClipboard}{wxclipboard}.

 \func{virtual void}{SetBitmap}{\param{const wxBitmap\& }{bitmap}}

-Sets the bitmap associated with the data object. This method is called
-internally when retrieving data from the \helpref{wxClipboard}{wxclipboard}
-and may be used to paste data to the clipboard directly (instead of
-on-demand).
-
-\membersection{wxBitmapDataObject::WriteData}\label{wxbitmapdataobjectwritedata}
-
-\constfunc{virtual void}{WriteData}{\param{void}{*dest} }
-
-Write the data owned by this class to {\it dest}. By default, this
-calls \helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} with the bitmap
-set in the constructor or using \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap}.
-This can be overridden to provide bitmap data on-demand; in this case
-\helpref{WriteBitmap}{wxbitmapdataobjectwritebitmap} must be called from
-within th overriding WriteData() method.
-
-\membersection{wxBitmapDataObject::WriteBitmap}\label{wxbitmapdataobjectwritebitmap}
-
-\constfunc{void}{WriteBitmap}{\param{const wxBitmap\& }{bitmap}\param{void}{*dest} }
-
-Writes the the bitmap {\it bitmap} to {\it dest}. This method must be called
-from \helpref{WriteData}{wxbitmapdataobjectwritedata}.
+Sets the bitmap associated with the data object. This method is called when the
+data object receives data. Usually there will be no reason to override this
+function.

--- a/docs/latex/wx/body.tex
+++ b/docs/latex/wx/body.tex
@@ -190,14 +190,22 @@ Metrowerks CodeWarrior.

 \section{Availability and location of wxWindows}

-wxWindows is currently available from the Artificial Intelligence
-Applications Institute by anonymous FTP and World Wide Web:
+wxWindows is available by anonymous FTP and World Wide Web:

 \begin{verbatim}
  ftp://www.remstar.com/pub/wxwin
  http://www.wxwindows.org
 \end{verbatim}

+You can also buy a CD-ROM using the form on the Web site, or by contacting:
+
+Julian Smart\\
+12 North Street West\\
+Uppingham\\
+Rutland\\
+LE15 9SG\\
+julian.smart@ukonline.co.uk
+
 \section{Acknowledgments}

 Thanks are due to AIAI for being willing to release the original version of
@@ -212,7 +220,7 @@ Dunn, Hermann Dunkel, Jos van Eijndhoven, Tom Felici, Thomas Fettig, Matthew Fla
 Wolfram Gloger, Norbert Grotz, Stefan Gunter, Bill Hale, Patrick Halke, Stefan Hammes, Guillaume Helle, Harco de Hilster, Cord Hockemeyer, Markus 
 Holzem, Olaf Klein, Leif Jensen, Bart Jourquin, Guilhem Lavaux, Jan Lessner, Nicholas Liebmann, Torsten Liermann, Per Lindqvist, Thomas Runge, Tatu
 M\"{a}nnist\"{o}, Scott Maxwell, Thomas Myers, Oliver Niedung, Hernan Otero, Ian Perrigo, Timothy Peters, Giordano Pezzoli, Harri Pasanen, Thomaso Paoletti, 
-Garrett Potts, Marcel Rasche, Robert Roebling, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, Paul Shirley, Stein Somers, Petr Smilauer, Neil Smith, 
+Garrett Potts, Marcel Rasche, Robert Roebling, Dino Scaringella, Jobst Schmalenbach, Arthur Seaton, Paul Shirley, Vaclav Slavik, Stein Somers, Petr Smilauer, Neil Smith, 
 Kari Syst\"{a}, Arthur Tetzlaff-Deas, Jonathan Tonberg, Jyrki Tuomi, Janos Vegh, Andrea Venturoli, Vadim Zeitlin, Xiaokun Zhu, Edward Zimmermann.

 `Graphplace', the basis for the wxGraphLayout library, is copyright Dr. Jos
--- a/docs/latex/wx/boxsizer.tex
+++ b/docs/latex/wx/boxsizer.tex
@@ -16,8 +16,8 @@ the buttons shall be centred as the width of the dialog changes.
 It is the unique feature of a box sizer, that it can grow in both directions (height and
 width) but can distribute its growth in the main direction (horizontal for a row) {\it unevenly}
 among its children. In our example case, the vertical sizer is supposed to propagate all its
-height changes to only the text area, not to the button area. This is determined by the
-{\it option} parameter when adding a window (or another sizer) to a sizer. It is interpreted
+height changes to only the text area, not to the button area. This is determined by the {\it option} parameter
+when adding a window (or another sizer) to a sizer. It is interpreted
 as a weight factor, i.e. it can be zero, indicating that the window may not be resized
 at all, or above zero. If several windows have a value above zero, the value is interpreted
 relative to the sum of all weight factors of the sizer, so when adding two windows with
@@ -77,14 +77,12 @@ MyDialog::MyDialog(wxFrame *parent, wxWindowID id, const wxString &title ) :

  topsizer->Fit( this );            // set size to minimum size as calculated by the sizer
  topsizer->SetSizeHints( this );   // set size hints to honour mininum size
-  
 }
 \end{verbatim}

-
 \wxheading{Derived from}

-\helpref{wxSizer}{wxsizer}
+\helpref{wxSizer}{wxsizer}\\
 \helpref{wxObject}{wxobject}

 \membersection{wxBoxSizer::wxBoxSizer}\label{wxboxsizerwxboxsizer}
--- a/docs/latex/wx/category.tex
+++ b/docs/latex/wx/category.tex
@@ -359,10 +359,11 @@ The older classes are as follows:

 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxDataObject}{wxdataobject}}{Data object class}
+\twocolitem{\helpref{wxDataFormat}{wxdataformat}}{Represents a data format}
 \twocolitem{\helpref{wxTextDataObject}{wxtextdataobject}}{Text data object class}
 \twocolitem{\helpref{wxFileDataObject}{wxtextdataobject}}{File data object class}
 \twocolitem{\helpref{wxBitmapDataObject}{wxbitmapdataobject}}{Bitmap data object class}
-\twocolitem{\helpref{wxPrivateDataObject}{wxprivatedataobject}}{Private data object class}
+\twocolitem{\helpref{wxCustomDataObject}{wxcustomdataobject}}{Custom data object class}
 \twocolitem{\helpref{wxClipboard}{wxclipboard}}{Clipboard class}
 \twocolitem{\helpref{wxDropTarget}{wxdroptarget}}{Drop target class}
 \twocolitem{\helpref{wxFileDropTarget}{wxfiledroptarget}}{File drop target class}
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -9,15 +9,15 @@
 \input array.tex
 \input arrstrng.tex
 \input autoobj.tex
+\input bitmap.tex
+\input bbutton.tex
+\input bmpdatob.tex
 \input boxsizer.tex
+\input brush.tex
 \input busycurs.tex
 \input busyinfo.tex
 \input button.tex
 \input strmbfrd.tex
-\input bitmap.tex
-\input bbutton.tex
-\input bmpdatob.tex
-\input brush.tex
 \input calclevt.tex
 \input checkbox.tex
 \input checklst.tex
@@ -37,9 +37,13 @@
 \input control.tex
 \input critsect.tex
 \input crtslock.tex
+\input custdobj.tex
 \input cursor.tex
 \input database.tex
+\input dataform.tex
 \input dataobj.tex
+\input dobjcomp.tex
+\input dobjsmpl.tex
 \input datstrm.tex
 \input date.tex
 \input dc.tex
@@ -77,7 +81,9 @@
 \input focusevt.tex
 \input font.tex
 \input fontdlg.tex
+\input fontenum.tex
 \input fontlist.tex
+\input fontmap.tex
 \input frame.tex
 \input fsfile.tex
 \input ftp.tex
@@ -90,9 +96,14 @@
 \input htcell.tex
 \input htcolor.tex
 \input htcontnr.tex
+\input htdcrend.tex
+\input hteasypr.tex
 \input htfilter.tex
 \input hthelpct.tex
+\input hthlpdat.tex
+\input hthlpfrm.tex
 \input htparser.tex
+\input htprint.tex
 \input httag.tex
 \input httaghnd.tex
 \input httagmod.tex
@@ -156,7 +167,6 @@
 \input postscpt.tex
 \input prevwin.tex
 \input print.tex
-\input prvdatob.tex
 \input prvtdrpt.tex
 \input process.tex
 \input progdlg.tex
@@ -186,7 +196,6 @@
 \input slider.tex
 \input sckaddr.tex
 \input socket.tex
-%\input gsocket.tex
 \input splitevt.tex
 \input strmsock.tex
 \input spinbutt.tex
--- a/docs/latex/wx/clipbrd.tex
+++ b/docs/latex/wx/clipbrd.tex
@@ -6,8 +6,8 @@ clipboard class from wxWindows 1.xx, which has the same name but a different imp
 To use the clipboard, you call member functions of the global {\bf wxTheClipboard} object.

 Call \helpref{wxClipboard::Open}{wxclipboardopen} to get ownership of the clipboard. If this operation returns TRUE, you
-now own the clipboard. Call \helpref{wxClipboard::AddData}{wxclipboardadddata} to put data
-on the clipboard (one or more times), or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
+now own the clipboard. Call \helpref{wxClipboard::SetData}{wxclipboardsetdata} to put data
+on the clipboard, or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
 retrieve data from the clipboard. Call \helpref{wxClipboard::Close}{wxclipboardclose} to close
 the clipboard and relinquish ownership. You should keep the clipboard open only momentarily.

@@ -19,17 +19,17 @@ For example:
  {
    // This data objects are held by the clipboard, 
    // so do not delete them in the app.
-    wxTheClipboard->AddData( new wxTextDataObject("Some text") );
+    wxTheClipboard->SetData( new wxTextDataObject("Some text") );
    wxTheClipboard->Close();
  }

  // Read some text
  if (wxTheClipboard->Open())
  {
-    if (wxTheClipboard->IsSupported( "STRING" ))
+    if (wxTheClipboard->IsSupported( wxDF_TEXT ))
    {
      wxTextDataObject data;
-      wxTheClipboard->GetData( &data );
+      wxTheClipboard->GetData( data );
      wxMessageBox( data.GetText() );
    }  
    wxTheClipboard->Close();
@@ -62,13 +62,6 @@ Constructor.

 Destructor.

-\membersection{wxClipboard::AddData}\label{wxclipboardadddata}
-
-\func{bool}{AddData}{\param{wxDataObject*}{ data}}
-
-Call this function to add a data object to the clipboard. This function can be called several times
-to put different formats on the clipboard.
-
 \membersection{wxClipboard::Clear}\label{wxclipboardclear}

 \func{void}{Clear}{\void}
@@ -83,14 +76,14 @@ Call this function to close the clipboard, having opened it with \helpref{wxClip

 \membersection{wxClipboard::GetData}\label{wxclipboardgetdata}

-\func{bool}{GetData}{\param{wxDataObject*}{ data}}
+\func{bool}{GetData}{\param{wxDataObject\&}{ data}}

 Call this function to fill {\it data} with data on the clipboard, if available in the required
 format. Returns TRUE on success.

 \membersection{wxClipboard::IsSupported}\label{wxclipboardissupported}

-\func{bool}{IsSupported}{\param{wxDataFormat}{ format}}
+\func{bool}{IsSupported}{\param{const wxDataFormat\&}{ format}}

 Returns TRUE if the format of the given data object is available on the clipboard.

--- a/docs/latex/wx/conditn.tex
+++ b/docs/latex/wx/conditn.tex
@@ -1,6 +1,6 @@
 \section{\class{wxCondition}}\label{wxcondition}

-TODO
+Condition class for code protection in multithreaded applications.

 \wxheading{Derived from}

@@ -62,4 +62,3 @@ Waits until a signal is raised or the timeout has elapsed.

 The second form returns if the signal was raised, or FALSE if there was a timeout.

-
--- a/docs/latex/wx/critsect.tex
+++ b/docs/latex/wx/critsect.tex
@@ -1,6 +1,6 @@
 \section{\class{wxCriticalSection}}\label{wxcriticalsection}

-A critical section object is used exactly for the same purpose as 
+A critical section object is used for the same exactly purpose as 
 \helpref{mutexes}{wxMutex}. The only difference is that under Windows platform
 critical sections are only visible inside one process, while mutexes may be
 shared between processes, so using critical sections is slightly more
--- a/docs/latex/wx/custdobj.tex
+++ b/docs/latex/wx/custdobj.tex
@@ -0,0 +1,107 @@
+\section{\class{wxCustomDataObject}}\label{wxcustomdataobject}
+
+wxCustomDataObject is a specialization of
+\helpref{wxDataObjectSimple}{wxdataobjectsimple} for some
+application-specific data in arbitrary (either custom or one of the standard
+ones). The only restriction is that it is supposed that this data can be
+copied bitwise (i.e. with {\tt memcpy()}), so it would be a bad idea to make
+it contain a C++ object (though C struct is fine).
+
+By default, wxCustomDataObject stores the data inside in a buffer. To put the
+data into the buffer you may use either
+\helpref{SetData}{wxcustomdataobjectsetdata} or
+\helpref{TakeData}{wxcustomdataobjecttakedata} depending on whether you want
+the object to make a copy of data or not.
+
+If you already store the data in another place, it may be more convenient and
+efficient to provide the data on-demand which is possible too if you override
+the virtual functions mentioned below.
+
+\wxheading{Virtual functions to override}
+
+This class may be used as is, but if you don't want store the data inside the
+object but provide it on demand instead, you should override
+\helpref{GetSize}{wxcustomdataobjectgetsize},
+\helpref{GetData}{wxcustomdataobjectgetdata} and
+\helpref{SetData}{wxcustomdataobjectsetdata} (or may be only the first two or
+only the last one if you only allow reading/writing the data)
+
+\wxheading{Derived from}
+
+\helpref{wxDataObjectSimple}{wxdataobjectsimple}\\
+\helpref{wxDataObject}{wxdataobject}
+
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
+\wxheading{See also}
+
+\helpref{wxDataObject}{wxdataobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxCustomDataObject::wxCustomDataObject}\label{wxcustomdataobjectwxcustomdataobject}
+
+\func{}{wxCustomDataObject}{\param{const wxDataFormat\& }{format = wxFormatInvalid}}
+
+The constructor accepts a {\it format} argument which specifies the (single)
+format supported by this object. If it isn't set here,
+\helpref{SetFormat}{wxdataobjectsimplesetformat} should be used.
+
+\membersection{wxCustomDataObject::\destruct{wxCustomDataObject}}\label{wxcustomdataobjectdtor}
+
+\func{}{\destruct{wxCustomDataObject}}{\void}
+
+The destructor will free the data hold by the object. Notice that although it
+calls a virtual \helpref{Free()}{wxcustomdataobjectfree} function, the base
+class version will always be called (C++ doesn't allow calling virtual
+functions from constructors or destructors), so if you override {\tt Free()}, you
+should override the destructor in your class as well (which would probably
+just call the derived class' version of {\tt Free()}).
+
+\membersection{wxCustomDataObject::Alloc}\label{wxcustomdataobjectalloc}
+
+\func{virtual void *}{Alloc}{\param{size\_t }{size}}
+
+This function is called to allocate {\it size} bytes of memory from SetData().
+The default version just uses the operator new.
+
+\membersection{wxCustomDataObject::Free}\label{wxcustomdataobjectfree}
+
+\pythonnote{This method expects a string in wxPython.  You can pass
+nearly any object by pickling it first.}
+
+\func{virtual void}{Free}{\void}
+
+This function is called when the data is freed, you may override it to anything
+you want (or may be nothing at all). The default version calls operator
+delete$[]$ on the data.
+
+\membersection{wxCustomDataObject::GetSize}\label{wxcustomdataobjectgetsize}
+
+\constfunc{virtual size\_t}{GetSize}{\void}
+
+Returns the data size in bytes.
+
+\membersection{wxCustomDataObject::GetData}\label{wxcustomdataobjectgetdata}
+
+\constfunc{virtual void *}{GetData}{\void}
+
+Returns a pointer to the data.
+
+\membersection{wxCustomDataObject::SetData}\label{wxcustomdataobjectsetdata}
+
+\func{virtual void}{SetData}{
+ \param{size\_t }{size}, \param{const void }{*data}}
+
+Set the data. The data object will make an internal copy.
+
+\membersection{wxCustomDataObject::TakeData}\label{wxcustomdataobjecttakedata}
+
+\func{virtual void}{TakeData}{
+ \param{size\_t }{size}, \param{const void }{*data}}
+
+Like \helpref{SetData}{wxcustomdataobjectsetdata}, but doesn't copy the data -
+instead the object takes ownership of the pointer.
+
--- a/docs/latex/wx/dataform.tex
+++ b/docs/latex/wx/dataform.tex
@@ -0,0 +1,116 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        dataform.tex
+%% Purpose:     wxDataFormat documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     03.11.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) Vadim Zeitlin
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxDataFormat}}\label{wxdataformat}
+
+A wxDataFormat is an encapsulation of a platform-specific format handle which
+is used by the system for the clipboard and drag and drop operations. The
+applications are usually only interested in, for example, pasting data from the
+clipboard only if the data is in a format the program understands and a data
+format is something which uniquely identifies this format.
+
+On the system level, a data format is usually just a number ({\tt CLIPFORMAT}
+under Windows or {\tt Atom} under X11, for example) and the standard formats
+are, indeed, just numbers which can be implicitly converted to wxDataFormat.
+The standard formats are:
+
+\begin{twocollist}\itemsep=1cm
+\twocolitem{wxDF\_INVALID}{An invalid format - used as default argument for
+functions taking a wxDataFormat argument sometimes}
+\twocolitem{wxDF\_TEXT}{Text format (wxString)}
+\twocolitem{wxDF\_BITMAP}{A bitmap (wxBitmap)}
+\twocolitem{wxDF\_METAFILE}{A metafile (wxMetafile, Windows only)}
+\twocolitem{wxDF\_FILENAME}{A list of filenames}
+\end{twocollist}
+
+As mentioned above, these standard formats may be passed to any function taking
+wxDataFormat argument because wxDataFormat has an implicit conversion from
+them (or, to be precise from the type {\tt wxDataFormat::NativeFormat} which is
+the type used by the underlying platform for data formats).
+
+Aside the standard formats, the application may also use custom formats which
+are identified by their names (strings) and not numeric identifiers. Although
+internally custom format must be created (or {\it registered}) first, you
+shouldn't care about it because it is done automatically the first time the
+wxDataFormat object corresponding to a given format name is created. The only
+implication of this is that you should avoid having global wxDataFormat objects
+with non-default constructor because their constructors are executed before the
+program has time to perform all necessary initialisations and so an attempt to
+do clipboard format registration at this time will usually lead to a crash!
+
+\wxheading{Virtual functions to override}
+
+None, this class doesn't have any.
+
+\wxheading{Derived from}
+
+None
+
+\wxheading{See also}
+
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
+\helpref{DnD sample}{samplednd}, 
+\helpref{wxDataObject}{wxdataobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxDataFormat::wxDataFormat}\label{wxdataformatwxdataformatdef}
+
+\func{}{wxDataFormat}{\param{NativeFormat}{ format = wxDF\_INVALID}}
+
+Constructs a data format object for one of the standard data formats or an
+empty data object (use \helpref{SetType}{wxdataformatsettype} or 
+\helpref{SetId}{wxdataformatsetid} later in this case)
+
+\membersection{wxDataFormat::wxDataFormat}\label{wxdataformatwxdataformat}
+
+\func{}{wxDataFormat}{\param{const wxChar }{*format}}
+
+Constructs a data format object for a custom format identified by its name 
+{\it format}.
+
+\membersection{wxDataFormat::operator $==$}\label{wxdataformatoperatoreq}
+
+\constfunc{bool}{operator $==$}{\param{const wxDataFormat\&}{ format}}
+
+Returns TRUE if the formats are equal.
+
+\membersection{wxDataFormat::operator $!=$}\label{wxdataformatoperatorneq}
+
+\constfunc{bool}{operator $!=$}{\param{const wxDataFormat\&}{ format}}
+
+Returns TRUE if the formats are different.
+
+\membersection{wxDataFormat::GetId}\label{wxdataformatgetid}
+
+\constfunc{wxString}{GetId}{\void}
+
+Returns the name of a custom format (this function will fail for a standard
+format).
+
+\membersection{wxDataFormat::GetType}\label{wxdataformatgettype}
+
+\constfunc{NativeFormat}{GetType}{\void}
+
+Returns the platform-specific number identifying the format.
+
+\membersection{wxDataFormat::SetId}\label{wxdataformatsetid}
+
+\func{void}{SetId}{\param{const wxChar }{*format}}
+
+Sets the format to be the custom format identified by the given name.
+
+\membersection{wxDataFormat::SetType}\label{wxdataformatsettype}
+
+\func{void}{SetType}{\param{NativeFormat}{ format}}
+
+Sets the format to the given value, which should be one of wxDF\_XXX constants.
+
--- a/docs/latex/wx/dataobj.tex
+++ b/docs/latex/wx/dataobj.tex
@@ -1,47 +1,121 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        dataobj.tex
+%% Purpose:     wxDataObject documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     18.10.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) wxWindows team
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \section{\class{wxDataObject}}\label{wxdataobject}

 A wxDataObject represents data that can be copied to or from the clipboard, or
-dragged and dropped.
+dragged and dropped. The important thing about wxDataObject is that this is a
+'smart' piece of data unlike usual 'dumb' data containers such as memory
+buffers or files. Being 'smart' here means that the data object itself should
+know what data formats it supports and how to render itself in each of
+supported formats.

-There are several predefined data object classes, such as \helpref{wxFileDataObject}{wxfiledataobject}, 
-\helpref{wxTextDataObject}{wxtextdataobject}, and \helpref{wxBitmapDataObject}{wxbitmapdataobject} which
-can be used without change or can be altered (by deriving a new class from them) in order to deliver
-data and data size on-demand. There is no need to ever use wxDataObject itself or derive directly from it.
+A supported format, incidentally, is exactly the format in which the data can
+be requested from a data object or from which the data object may be set. In
+the general case, an object may support different formats on 'input' and
+'output', i.e. it may be able to render itself in a given format but not be
+created from data on this format or vice versa. wxDataObject defines an
+enumeration type

-You may also derive your own data object classes from \helpref{wxPrivateDataObject}{wxprivatedataobject}
-for user-defined types. The format of user-defined data is given as mime-type string literal, 
-such as "application/word" or "image/png". These strings are used as they are under Unix (so 
-far only GTK) to identify a format and are translated into their Windows equivalent under 
-Win32 (using the OLE IDataObject for data exchange to and from the clipboard and for Drag'n'Drop).
-Note that the format string translation under Windows is not yet finnished.
+\begin{verbatim}
+enum Direction
+{
+    Get  = 0x01,    // format is supported by GetDataHere()
+    Set  = 0x02     // format is supported by SetData()
+};
+\end{verbatim}

-As mentioned above, data may be placed into the \helpref{wxClipboard}{wxclipboard}
-or a \helpref{wxDropSource}{wxdropsource} instance either directly or on-demand. 
-As long as only one format is offerred, putting data directly into the clipboard may 
-be sufficient. But imagine that you paste a large piece of text to the clipboard and 
-offer it in "text/plain", "text/rtf", "text/html", "application/word" and your own 
-format for internal use - here offering data on-demand is required to minimize memory 
-consumption. This would generally get implemented using a central object that
-contains clipboard information in the format with the maximum of information. Note
-that neither the GTK data transfer mechanisms for the clipboard and Drag'n'Drop
-nor the OLE data transfer copies any data until another application actually
-requests the data. This is in contrast to the "feel" offered to the user of a
-program who would normally think that the data resides in the clipboard after
-having pressed "Copy" - in reality it is only declared to be available.
+which allows to distinguish between them. See
+\helpref{wxDataFormat}{wxdataformat} documentation for more about formats.

-Let's assume that you have written an HTML editor and want it to paste contents
-in the formats "text/plain" and "text/html" to the clipboard. For offering
-data on-demand in "text/plain" you would derive your class from \helpref{wxTextDataObject}{wxtextdataobject}
-and for offering data on-demand in "text/html" you would derive your own class from
-\helpref{wxPrivateDataObject}{wxprivatedataobject} and set its ID string
-identifying the format to "text/html" using \helpref{wxPrivateDataObject::SetId}{wxprivatedataobjectsetid}.
-In your two derived classed you'd then have a pointer or reference to the central
-data container and you'd override the methods returning the size of the
-available data and the WriteData() methods in both classes.
+Not surprizingly, being 'smart' comes at a price of added complexity. This is
+reasonable for the situations when you really need to support multiple formats,
+but may be annoying if you only want to do something simple like cut and paste
+text.
+
+To provide a solution for both cases, wxWindows has two predefined classes
+which derive from wxDataObject: \helpref{wxDataObjectSimple}{wxdataobjectsimple} and
+\helpref{wxDataObjectComposite}{wxdataobjectcomposite}.
+\helpref{wxDataObjectSimple}{wxdataobjectsimple} is
+the simplest wxDataObject possible and only holds data in a single format (such
+as HTML or text) and \helpref{wxDataObjectComposite}{wxdataobjectcomposite} is
+the simplest way to implement wxDataObject which does support multiple formats
+because it achievs this by simply holding several wxDataObjectSimple objects.
+
+So, you have several solutions when you need a wxDataObject class (and you need
+one as soon as you want to transfer data via the clipboard or drag and drop):
+
+\begin{twocollist}\itemsep=1cm
+\twocolitem{{\bf 0. Use one of built-in classes}}{You may use wxTextDataObject,
+wxBitmapDataObject or wxFileDataObject in the simplest cases when you only need
+to support one format and your data is either text, bitmap or list of files.}
+\twocolitem{{\bf 1. Use wxDataObjectSimple}}{Deriving from wxDataObjectSimple is the simplest
+solution for custom data - you will only support one format and so probably
+won't be able to communicate with other programs, but data transfer will work
+in your program (or between different copies of it).}
+\twocolitem{{\bf 2. Use wxDataObjectComposite}}{This is a simple but powerful
+solution which allows you to support any number of formats (either
+standard or custom if you combine it with the previous solution).}
+\twocolitem{{\bf 3. Use wxDataObject directly}}{This is the solution for
+maximal flexibility and efficiency, but it also is the most difficult to
+implement.}
+\end{twocollist}
+
+Please note that the easiest way to use drag and drop and the clipboard with
+multiple formats is by using wxDataObjectComposite, but it is not the most
+efficient one as each wxDataObjectSimple would contain the whole data in its
+respective formars. Now imagine that you want to paste 200 pages of text in
+your proprietary format, as well as Word, RTF, HTML, Unicode and plain text to
+the clipboard and even today's computers are in trouble. For this case, you
+will have to derive from wxDataObject directly and make it enumerate its
+formats and provide the data in the requested format on demand.
+
+Note that neither the GTK data transfer mechanisms for the clipboard and
+drag and drop, neither does the OLE data transfer copy any data until another application
+actually requests the data. This is in contrast to the 'feel' offered to the
+user of a program who would normally think that the data resides in the
+clipboard after having pressed 'Copy' - in reality it is only declared to be
+available.
+
+There are several predefined data object classes derived from
+wxDataObjectSimple: \helpref{wxFileDataObject}{wxfiledataobject},
+\helpref{wxTextDataObject}{wxtextdataobject} and
+\helpref{wxBitmapDataObject}{wxbitmapdataobject} which can be used without
+change.
+
+You may also derive your own data object classes from 
+\helpref{wxCustomDataObject}{wxcustomdataobject} for user-defined types. The
+format of user-defined data is given as mime-type string literal, such as
+"application/word" or "image/png". These strings are used as they are under
+Unix (so far only GTK) to identify a format and are translated into their
+Windows equivalent under Win32 (using the OLE IDataObject for data exchange to
+and from the clipboard and for drag and drop). Note that the format string
+translation under Windows is not yet finished.
+
+\pythonnote{At this time this class is directly usable from wxPython.
+Derive a class from \helpref{wxPyDataObjectSimple}{wxdataobjectsimple}
+instead.}
+
+\wxheading{Virtual functions to override}
+
+Each class derived directly from wxDataObject must override and implement all
+of its functions which are pure virtual in the base class.
+
+The data objects which only render their data or only set it (i.e. work in
+only one direction), should return 0 from
+\helpref{GetFormatCount}{wxdataobjectgetformatcount}.

 \wxheading{Derived from}

-\helpref{wxObject}{wxobject}
+None

 \wxheading{Include files}

@@ -49,13 +123,16 @@ available data and the WriteData() methods in both classes.

 \wxheading{See also}

+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
+\helpref{DnD sample}{samplednd}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 
 \helpref{wxTextDataObject}{wxtextdataobject}, 
 \helpref{wxBitmapDataObject}{wxbitmapdataobject}, 
-\helpref{wxPrivateDataObject}{wxprivatedataobject}, 
-\helpref{Drag and drop overview}{wxdndoverview}, \helpref{wxDropTarget}{wxdroptarget}, 
+\helpref{wxCustomDataObject}{wxcustomdataobject}, 
+\helpref{wxDropTarget}{wxdroptarget}, 
 \helpref{wxDropSource}{wxdropsource}, 
-\helpref{wxTextDropTarget}{wxtextdroptarget}, \helpref{wxFileDropTarget}{wxfiledroptarget}
+\helpref{wxTextDropTarget}{wxtextdroptarget}, 
+\helpref{wxFileDropTarget}{wxfiledroptarget}

 \latexignore{\rtfignore{\wxheading{Members}}}

@@ -71,18 +148,46 @@ Constructor.

 Destructor.

-\membersection{wxDataObject::WriteData}\label{wxdataobjectwritedata}
+\membersection{wxDataObject::GetAllFormats}\label{wxdataobjectgetallformats}

-\constfunc{virtual void}{WriteData}{\param{void}{*dest} }
+\constfunc{virtual void}{GetAllFormats}{ \param{wxDataFormat *}{formats}, \param{Direction}{ dir = Get}}

-Write the data owned by this class to {\it dest}. This method is a pure
-virtual function and must be overridden.
+Copy all supported formats in the given direction to the array pointed to by
+{\it formats}. There is enough space for GetFormatCount(dir) formats in it.

-\membersection{wxDataObject::GetSize}\label{wxdataobjectgetdatasize}
+\membersection{wxDataObject::GetDataHere}\label{wxdataobjectgetdatahere}

-\constfunc{virtual size\_t}{GetSize}{\void}
+\constfunc{virtual bool}{GetDataHere}{\param{const wxDataFormat\&}{ format}, \param{void }{*buf} }

-Returns the data size. This method is a pure
-virtual function and must be overridden.
+The method will write the data of the format {\it format} in the buffer {\it
+buf} and return TRUE on success, FALSE on failure.

+\membersection{wxDataObject::GetDataSize}\label{wxdataobjectgetdatasize}
+
+\constfunc{virtual size\_t}{GetDataSize}{\param{const wxDataFormat\&}{ format} }
+
+Returns the data size of the given format {\it format}.
+
+\membersection{wxDataObject::GetFormatCount}\label{wxdataobjectgetformatcount}
+
+\constfunc{virtual size\_t}{GetFormatCount}{\param{Direction}{ dir = Get}}
+
+Returns the number of available formats for rendering or setting the data.
+
+\membersection{wxDataObject::GetPreferredFormat}\label{wxdataobjectgetpreferredformat}
+
+\constfunc{virtual wxDataFormat}{GetPreferredFormat}{\param{Direction}{ dir = Get}}
+
+Returns the preferred format for either rendering the data (if {\it dir} is {\tt Get},
+its default value) or for setting it. Usually this will be the
+native format of the wxDataObject.
+
+\membersection{wxDataObject::SetData}\label{wxdataobjectsetdata}
+
+\func{virtual bool}{SetData}{ \param{const wxDataFormat\&}{ format}, \param{size\_t}{ len}, \param{const void }{*buf} }
+
+Set the data in the format {\it format} of the length {\it len} provided in the
+buffer {\it buf}.
+
+Returns TRUE on success, FALSE on failure.

--- a/docs/latex/wx/datstrm.tex
+++ b/docs/latex/wx/datstrm.tex
@@ -31,6 +31,10 @@ For example:

 See also \helpref{wxDataOutputStream}{wxdataoutputstream}. 

+\wxheading{Derived from}
+
+None
+
 \wxheading{Include files}

 <wx/datstrm.h>
@@ -114,6 +118,10 @@ usage and caveats.

 See also \helpref{wxDataInputStream}{wxdatainputstream}. 

+\wxheading{Derived from}
+
+None
+
 \latexignore{\rtfignore{\wxheading{Members}}}

 \membersection{wxDataOutputStream::wxDataOutputStream}\label{wxdataoutputstreamconstr}
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -418,6 +418,9 @@ Gets the current pen (see \helpref{wxDC::SetPen}{wxdcsetpen}).
 Sets {\it colour} to the colour at the specified location. Windows only; an X implementation
 is being worked on. Not available for wxPostScriptDC or wxMetafileDC.

+\pythonnote{For wxPython the wxColour value is returned and is not
+required as a parameter.}
+
 \membersection{wxDC::GetSize}\label{wxdcgetsize}

 \func{void}{GetSize}{\param{long *}{width}, \param{long *}{height}}
--- a/docs/latex/wx/dobjcomp.tex
+++ b/docs/latex/wx/dobjcomp.tex
@@ -0,0 +1,65 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        dobjcomp.tex
+%% Purpose:     wxDataObjectComposite documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     02.11.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) Vadim Zeitlin
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxDataObjectComposite}}\label{wxdataobjectcomposite}
+
+wxDataObjectComposite is the simplest 
+\helpref{wxDataObject}{wxdataobject} derivation which may be sued to support
+multiple formats. It contains several 
+\helpref{wxDataObjectSimple}{wxdataobjectsimple} objects and supports any
+format supported by at least one of them. Only one of these data objects is
+{\it preferred} (the first one if not explicitly changed by using the second
+parameter of \helpref{Add}{wxdataobjectcompositeadd}) and its format determines
+the preferred format of the composite data object as well.
+
+See \helpref{wxDataObject}{wxdataobject} documentation for the reasons why you
+might prefer to use wxDataObject directly instead of wxDataObjectComposite for
+efficiency reasons.
+
+\wxheading{Virtual functions to override}
+
+None, this class should be used directly.
+
+\wxheading{Derived from}
+
+\helpref{wxDataObject}{wxdataobject}
+
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
+\wxheading{See also}
+
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
+\helpref{wxDataObject}{wxdataobject}, 
+\helpref{wxDataObjectSimple}{wxdataobjectsimple}, 
+\helpref{wxFileDataObject}{wxfiledataobject}, 
+\helpref{wxTextDataObject}{wxtextdataobject}, 
+\helpref{wxBitmapDataObject}{wxbitmapdataobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxDataObjectComposite::wxDataObjectComposite}\label{wxdataobjectcompositewxdataobjectcomposite}
+
+\func{}{wxDataObjectComposite}{\void}
+
+The default constructor.
+
+\membersection{wxDataObjectComposite::Add}\label{wxdataobjectcompositeadd}
+
+\func{void}{Add}{
+    \param{wxDataObjectSimple }{*dataObject},
+    \param{bool }{preferred = FALSE}}
+
+Adds the {\it dataObject} to the list of supported objects and it becomes the
+preferred object if {\it preferred} is TRUE.
+
+
--- a/docs/latex/wx/dobjsmpl.tex
+++ b/docs/latex/wx/dobjsmpl.tex
@@ -0,0 +1,102 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        dobjsmpl.tex
+%% Purpose:     wxDataObjectSimple documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     02.11.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) Vadim Zeitlin
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxDataObjectSimple}}\label{wxdataobjectsimple}
+
+This is the simplest possible implementation of
+\helpref{wxDataObject}{wxdataobject} class. The data object of (a class derived
+from) this class only supports one format, so the number of virtual functions
+to be implemented is reduced.
+
+Notice that this is still an abstract base class and cannot be used but should
+be derived from.
+
+\pythonnote{If you wish to create a derived wxDataObjectSimple class in
+wxPython you should derive the class from wxPyDataObjectSimple
+in order to get Python-aware capabilities for the various virtual
+methods.}
+
+\wxheading{Virtual functions to override}
+
+The objects supporting rendering the data must override
+\helpref{GetDataSize}{wxdataobjectsimplegetdatasize} and
+\helpref{GetDataHere}{wxdataobjectsimplegetdatahere} while the objects which
+may be set must override \helpref{SetData}{wxdataobjectsimplesetdata}. Of
+course, the objects supporting both operations must override all threee
+methods.
+
+\wxheading{Derived from}
+
+\helpref{wxDataObject}{wxdataobject}
+
+\wxheading{Include files}
+
+<wx/dataobj.h>
+
+\wxheading{See also}
+
+\helpref{Clipboard and drag and drop overview}{wxdndoverview},
+\helpref{DnD sample}{samplednd},
+\helpref{wxFileDataObject}{wxfiledataobject},
+\helpref{wxTextDataObject}{wxtextdataobject},
+\helpref{wxBitmapDataObject}{wxbitmapdataobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxDataObjectSimple::wxDataObjectSimple}\label{wxdataobjectsimplewxdataobjectsimple}
+
+\func{}{wxDataObjectSimple}{\param{const wxDataFormat\&}{ format = wxFormatInvalid}}
+
+Constructor accepts the supported format (none by default) which may also be
+set later with \helpref{SetFormat}{wxdataobjectsimplesetformat}.
+
+\membersection{wxDataObjectSimple::GetFormat}\label{wxdataobjectsimplegetformat}
+
+\constfunc{const wxDataFormat\&}{GetFormat}{\void}
+
+Returns the (one and only one) format supported by this object. It is supposed
+that the format is supported in both directions.
+
+\membersection{wxDataObjectSimple::SetFormat}\label{wxdataobjectsimplesetformat}
+
+\func{void}{SetFormat}{\param{const wxDataFormat\&}{ format}}
+
+Sets the supported format.
+
+\membersection{wxDataObjectSimple::GetDataSize}\label{wxdataobjectsimplegetdatasize}
+
+\constfunc{virtual size\_t}{GetDataSize}{\void}
+
+Gets the size of our data. Must be implemented in the derived class if the
+object supports rendering its data.
+
+\membersection{wxDataObjectSimple::GetDataHere}\label{wxdataobjectsimplegetdatahere}
+
+\constfunc{virtual bool}{GetDataHere}{\param{void }{*buf}}
+
+Copy the data to the buffer, return TRUE on success. Must be implemented in the
+derived class if the object supports rendering its data.
+
+\pythonnote{When implementing this method in wxPython, no additional
+parameters are required and the data should be returned from the
+method as a string.}
+
+\membersection{wxDataObjectSimple::SetData}\label{wxdataobjectsimplesetdata}
+
+\func{virtual bool}{SetData}{\param{size\_t }{len}, \param{const void }{*buf}}
+
+Copy the data from the buffer, return TRUE on success. Must be implemented in
+the derived class if the object supports setting its data.
+
+\pythonnote{When implementing this method in wxPython, the data comes
+as a single string parameter rather than the two shown here.}
+
+
--- a/docs/latex/wx/docmanag.tex
+++ b/docs/latex/wx/docmanag.tex
@@ -58,6 +58,12 @@ A list of all documents.

 Stores the flags passed to the constructor.

+\membersection{wxDocManager::m\_lastDirectory}
+
+The directory last selected by the user when opening a file.
+
+\member{wxFileHistory*}{m\_fileHistory}
+
 \membersection{wxDocManager::m\_templates}

 \member{wxList}{mnTemplates}
@@ -222,6 +228,12 @@ Returns a reference to the list of documents.

 Returns a pointer to file history.

+\membersection{wxDocManager::GetLastDirectory}\label{wxdocmanagergetlastdirectory}
+
+\constfunc{wxString}{GetLastDirectory}{\void}
+
+Returns the directory last selected by the user when opening a file. Initially empty.
+
 \membersection{wxDocManager::GetMaxDocsOpen}

 \func{int}{GetMaxDocsOpen}{\void}
@@ -351,6 +363,12 @@ displaying a list of valid views. This function is used in wxDocManager::CreateV
 The dialog normally won't appear because the array of templates only contains
 those relevant to the document in question, and often there will only be one such.

+\membersection{wxDocManager::SetLastDirectory}\label{wxdocmanagersetlastdirectory}
+
+\func{void}{SetLastDirectory}{\param{const wxString\&}{ dir}}
+
+Sets the directory to be displayed to the user when opening a file. Initially this is empty.
+
 \membersection{wxDocManager::SetMaxDocsOpen}

 \func{void}{SetMaxDocsOpen}{\param{int}{ n}}
--- a/docs/latex/wx/dropsrc.tex
+++ b/docs/latex/wx/dropsrc.tex
@@ -44,14 +44,6 @@ call \helpref{wxDropSource::SetData}{wxdropsourcesetdata} later.

 {\it win} is required by wxGTK and therefore should always be set.

-\func{}{wxDropSource}{\param{wxDataObject\& }{data}, \param{wxWindow*}{ win = NULL}}
-
-\wxheading{Parameters}
-
-\docparam{data}{A reference to the \helpref{data object}{wxdataobject} associated with the drop source.}
-
-\docparam{win}{Only used by wxGTK. TODO}
-
 \membersection{wxDropSource::\destruct{wxDropSource}}\label{wxdropsourcedtor}

 \func{virtual }{\destruct{wxDropSource}}{\void}
@@ -64,16 +56,15 @@ Sets the data \helpref{data object}{wxdataobject} associated with the drop sourc

 \membersection{wxDropSource::DoDragDrop}\label{wxdropsourcedodragdrop}

-\func{virtual wxDragResult}{DoDragDrop}{\param{bool }{bAllowMove = FALSE}}
+\func{virtual wxDragResult}{DoDragDrop}{\param{bool }{allowMove = FALSE}}

 Do it (call this in response to a mouse button press, for example).

-If {\bf bAllowMove} is FALSE, data can only be copied. Under GTK, data
-is always copied.
+If {\bf allowMove} is FALSE, data can only be copied.

 \membersection{wxDropSource::GiveFeedback}\label{wxdropsourcegivefeedback}

-\func{virtual bool}{GiveFeedback}{\param{wxDragResult }{effect}, \param{bool }{bScrolling}}
+\func{virtual bool}{GiveFeedback}{\param{wxDragResult }{effect}, \param{bool }{scrolling}}

 Overridable: you may give some custom UI feedback during the drag and drop operation
 in this function. It is called on each mouse move, so your implementation must not be too
@@ -81,12 +72,12 @@ slow.

 \wxheading{Parameters}

-\docparam{effect}{The effect to implement. One of wxDragCopy, wxDragMove. MSW only. }
+\docparam{effect}{The effect to implement. One of wxDragCopy, wxDragMove and wxDragNone. }

-\docparam{bScrolling}{TRUE if the window is scrolling. MSW only. }
+\docparam{scrolling}{TRUE if the window is scrolling. MSW only. }

 \wxheading{Return value}

 Return FALSE if you want default feedback, or TRUE if you implement your own
-feedback.
+feedback. The return values is ignored under GTK.

--- a/docs/latex/wx/droptrgt.tex
+++ b/docs/latex/wx/droptrgt.tex
@@ -43,11 +43,15 @@ Override this to indicate how many formats you support.

 Override this to indicate what kind of data you support.

-\membersection{wxDropTarget::OnEnter}\label{wxdroptargetonenter}
+\membersection{wxDropTarget::OnData}\label{wxdroptargetondata}

-\func{virtual void}{OnEnter}{\void}
+\func{virtual wxDragResult}{OnData}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxDragResult}{ def}}

-Called when the mouse enters the drop target.
+Called after OnDrop() returns TRUE: you will usually just call
+GetData() from here and, probably, also refresh something to update the
+new data and, finally, return the code indicating how did the operation
+complete (returning default value in case of success and wxDragError on
+failure is usually ok).

 \membersection{wxDropTarget::OnDrop}\label{wxdroptargetondrop}

@@ -69,6 +73,12 @@ Called when the user drops a data object on the target. Return FALSE to veto the

 Return TRUE to accept the data, FALSE to veto the operation.

+\membersection{wxDropTarget::OnEnter}\label{wxdroptargetonenter}
+
+\func{virtual void}{OnEnter}{\void}
+
+Called when the mouse enters the drop target.
+
 \membersection{wxDropTarget::OnLeave}\label{wxdroptargetonleave}

 \func{virtual void}{OnLeave}{\void}
--- a/docs/latex/wx/evthand.tex
+++ b/docs/latex/wx/evthand.tex
@@ -118,9 +118,9 @@ Gets the pointer to the next handler in the chain.

 \wxheading{See also}

+\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxEvtHandler::GetPreviousHandler}{wxevthandlergetprevioushandler},\rtfsp
 \helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
-\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxWindow::PushEventHandler}{wxwindowpusheventhandler},\rtfsp
 \helpref{wxWindow::PopEventHandler}{wxwindowpopeventhandler}

@@ -132,9 +132,9 @@ Gets the pointer to the previous handler in the chain.

 \wxheading{See also}

-\helpref{wxEvtHandler::GetPreviousHandler}{wxevthandlergetprevioushandler},\rtfsp
-\helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
 \helpref{wxEvtHandler::SetPreviousHandler}{wxevthandlersetprevioushandler},\rtfsp
+\helpref{wxEvtHandler::GetNextHandler}{wxevthandlergetnexthandler},\rtfsp
+\helpref{wxEvtHandler::SetNextHandler}{wxevthandlersetnexthandler},\rtfsp
 \helpref{wxWindow::PushEventHandler}{wxwindowpusheventhandler},\rtfsp
 \helpref{wxWindow::PopEventHandler}{wxwindowpopeventhandler}

--- a/docs/latex/wx/fildatob.tex
+++ b/docs/latex/wx/fildatob.tex
@@ -1,9 +1,24 @@
 \section{\class{wxFileDataObject}}\label{wxfiledataobject}

-wxFileDataObject is a specialization of wxDataObject for file names.
+wxFileDataObject is a specialization of \helpref{wxDataObject}{wxdataobject} 
+for file names. The program works with it just as if it were a list of file
+names (absolutep aths always), but internally it uses the same format as
+Explorer and other compatible programs under Windows or GNOME/KDE filemanager
+under Unix which makes it possible to receive files from them using this
+class.
+
+{\bf Warning:} Under all non-Windows platforms this class is currently
+"input-only", i.e. you can receieve the files from another application, but
+copying (or dragging) file(s) from a wxWindows application is not currently
+supported.
+
+\wxheading{Virtual functions to override}
+
+None.

 \wxheading{Derived from}

+\helpref{wxDataObjectSimple}{wxdataobjectsimple}\\
 \helpref{wxDataObject}{wxdataobject}

 \wxheading{Include files}
@@ -12,31 +27,29 @@ wxFileDataObject is a specialization of wxDataObject for file names.

 \wxheading{See also}

+\helpref{wxDataObject}{wxdataobject}, 
+\helpref{wxDataObjectSimple}{wxdataobjectsimple}, 
+\helpref{wxTextDataObject}{wxtextdataobject}, 
+\helpref{wxBitmapDataObject}{wxbitmapdataobject}
 \helpref{wxDataObject}{wxdataobject}

 \latexignore{\rtfignore{\wxheading{Members}}}

-\membersection{wxFileDataObject::wxFileDataObject}\label{wxfiledataobjectwxfiledataobject}
+\membersection{wxFileDataObject}\label{wxfiledataobjectwxfiledataobject}

 \func{}{wxFileDataObject}{\void}

 Constructor.

-\membersection{wxFileDataObject::GetFormat}\label{wxfiledataobjectgetformat}
-
-\constfunc{virtual wxDataFormat}{GetFormat}{\void}
-
-Returns wxDF\_FILENAME.
-
 \membersection{wxFileDataObject::AddFile}\label{wxfiledataobjectaddfile}

 \func{virtual void}{AddFile}{\param{const wxString\& }{file}}

-Adds a filename to the data object.
+{\bf MSW only:} adds a file to the file list represented by this data object.

-\membersection{wxFileDataObject::GetFiles}\label{wxfiledataobjectgetfiles}
+\membersection{wxFileDataObject::GetFilenames}\label{wxfiledataobjectgetfilenames}

-\constfunc{virtual wxString}{GetFiles}{\void}
+\constfunc{const wxArrayString\& }{GetFilenames}{\void}

-Returns files as a zero-separated list.
+Returns the \helpref{array}{wxarraystring} of file names.

--- a/docs/latex/wx/filedlg.tex
+++ b/docs/latex/wx/filedlg.tex
@@ -26,17 +26,12 @@ If path is ``", the current directory will be used. If filename is ``",
 no default filename will be supplied. The wildcard determines what files
 are displayed in the file selector, and file extension supplies a type
 extension for the required filename. Flags may be a combination of wxOPEN,
-wxSAVE, wxOVERWRITE\_PROMPT, wxHIDE\_READONLY, or 0. They are only significant
-at present in Windows.
+wxSAVE, wxOVERWRITE\_PROMPT, wxHIDE\_READONLY, or 0.

 Both the X and Windows versions implement a wildcard filter. Typing a
 filename containing wildcards (*, ?) in the filename text item, and
 clicking on Ok, will result in only those files matching the pattern being
-displayed. In the X version, supplying no default name will result in the
-wildcard filter being inserted in the filename text item; the filter is
-ignored if a default name is supplied.
-
-Under Windows (only), the wildcard may be a specification for multiple
+displayed. The wildcard may be a specification for multiple
 types of file with a description for each, such as:

 \begin{verbatim}
@@ -69,10 +64,10 @@ Constructor. Use \helpref{wxFileDialog::ShowModal}{wxfiledialogshowmodal} to sho

 \twocolwidtha{5cm}
 \begin{twocollist}
-\twocolitem{{\bf wxOPEN}}{This is an open dialog (Windows only).}
-\twocolitem{{\bf wxSAVE}}{This is a save dialog (Windows only).}
-\twocolitem{{\bf wxHIDE\_READONLY}}{Hide read-only files (Windows only).}
-\twocolitem{{\bf wxOVERWRITE\_PROMPT}}{Prompt for a conformation if a file will be overridden (Windows only).}
+\twocolitem{{\bf wxOPEN}}{This is an open dialog.}
+\twocolitem{{\bf wxSAVE}}{This is a save dialog.}
+\twocolitem{{\bf wxHIDE\_READONLY}}{Hide read-only files.}
+\twocolitem{{\bf wxOVERWRITE\_PROMPT}}{Prompt for a conformation if a file will be overridden.}
 \end{twocollist}%
 }

--- a/docs/latex/wx/filesys.tex
+++ b/docs/latex/wx/filesys.tex
@@ -5,9 +5,9 @@

 \section{\class{wxFileSystem}}\label{wxfilesystem}

-This class provides interface for opening files on different
+This class provides an interface for opening files on different
 file systems. It can handle absolute and/or local filenames.
-It uses system of \helpref{handlers}{wxfilesystemhandler} to
+It uses a system of \helpref{handlers}{wxfilesystemhandler} to
 provide access to user-defined virtual file systems.

 \wxheading{Derived from}
@@ -28,6 +28,25 @@ wxObject

 Constructor. 

+\membersection{wxFileSystem::AddHandler}\label{wxfilesystemaddhandler}
+
+\func{static void}{AddHandler}{\param{wxFileSystemHandler }{*handler}}
+
+This static function adds new handler into the list of handlers.
+The \helpref{handlers}{wxfilesystemhandler} provide access to virtual FS.
+
+\wxheading{Note}
+
+You can call:
+
+\begin{verbatim}
+wxFileSystem::AddHandler(new My_FS_Handler);
+\end{verbatim}
+
+This is because (a) AddHandler is a static method, and (b) the handlers
+are deleted in wxFileSystem's destructor so that you don't have to
+care about it.
+
 \membersection{wxFileSystem::ChangePathTo}\label{wxfilesystemchangepathto}

 \func{void}{ChangePathTo}{\param{const wxString\& }{location}, \param{bool }{is\_dir = FALSE}}
@@ -66,6 +85,22 @@ f = fs -> OpenFile("hello.htm"); // opens file 'subdir/folder/hello.htm' !!

 Returns actual path (set by \helpref{ChangePathTo}{wxfilesystemchangepathto}).

+
+\membersection{wxFileSystem::FindFirst}\label{wxfilesystemfindfirst}
+
+\func{wxString}{FindFirst}{\param{const wxString\& }{wildcard}, \param{int }{flags = 0}}
+
+Works like \helpref{wxFindFirstFile}{wxfindfirstfile}. Returns name of the first
+filename (withing filesystem's current path) that matches {\it wildcard}. {\it flags} may be one of
+wxFILE (only files), wxDIR (only directories) or 0 (both).
+
+\membersection{wxFileSystem::FindNext}\label{wxfilesystemfindnext}
+
+\func{wxString}{FindNext}{\void}
+
+Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
+
+
 \membersection{wxFileSystem::OpenFile}\label{wxfilesystemopenfile}

 \func{wxFSFile*}{OpenFile}{\param{const wxString\& }{location}}
@@ -75,22 +110,3 @@ or NULL if failed. It first tries to open the file in relative scope
 (based on value passed to ChangePathTo() method) and then as an
 absolute path.

-\membersection{wxFileSystem::AddHandler}\label{wxfilesystemaddhandler}
-
-\func{static void}{AddHandler}{\param{wxFileSystemHandler }{*handler}}
-
-This static function adds new handler into the list of handlers.
-The \helpref{handlers}{wxfilesystemhandler} provide access to virtual FS.
-
-\wxheading{Note}
-
-You can call:
-
-\begin{verbatim}
-wxFileSystem::AddHandler(new My_FS_Handler);
-\end{verbatim}
-
-This is because (a) AddHandler is a static method, and (b) the handlers
-are deleted in wxFileSystem's destructor so that you don't have to
-care about it.
-
--- a/docs/latex/wx/filesysh.tex
+++ b/docs/latex/wx/filesysh.tex
@@ -5,11 +5,11 @@

 \section{\class{wxFileSystemHandler}}\label{wxfilesystemhandler}

-wxFileSystemHandler (or derived classes to be exact) is used
-to access virtual file systems. It's public interface consists
-from two methods: \helpref{CanOpen}{wxfilesystemhandlercanopen}
+Classes derived from wxFileSystemHandler are used
+to access virtual file systems. Its public interface consists
+of two methods: \helpref{CanOpen}{wxfilesystemhandlercanopen} 
 and \helpref{OpenFile}{wxfilesystemhandleropenfile}. 
-It provides additional protected methods to simplify process
+It provides additional protected methods to simplify the process
 of opening the file: GetProtocol, GetLeftLocation, GetRightLocation,
 GetAnchor, GetMimeTypeFromExt.

@@ -18,13 +18,11 @@ are constructed.

 \wxheading{Notes}

-\begin{itemize}
+\begin{itemize}\itemsep=0pt
 \item The handlers are shared by all instances of wxFileSystem.
-
 \item wxHTML library provides handlers for local files and HTTP or FTP protocol
-
 \item The {\it location} parameter passed to OpenFile or CanOpen methods
-is always {\bf absolute} path. You don't need to check the FS's current path!
+is always an {\bf absolute} path. You don't need to check the FS's current path.
 \end{itemize}

 \wxheading{Derived from}
@@ -47,8 +45,8 @@ Constructor.

 \func{virtual bool}{CanOpen}{\param{const wxString\& }{location}}

-Returns TRUE if the handler is able to open this file (this function doesn't
-check whether the file exists or not, it only checks if it knows the protocol).
+Returns TRUE if the handler is able to open this file. This function doesn't
+check whether the file exists or not, it only checks if it knows the protocol.
 Example:

 \begin{verbatim}
@@ -58,7 +56,70 @@ bool MyHand::CanOpen(const wxString& location)
 }
 \end{verbatim}

-Must be overwriten in derived handlers.
+Must be overridden in derived handlers.
+
+\membersection{wxFileSystemHandler::GetAnchor}\label{wxfilesystemhandlergetanchor}
+
+\constfunc{wxString}{GetAnchor}{\param{const wxString\& }{location}}
+
+Returns the anchor if present in the location.
+See \helpref{wxFSFile}{wxfsfilegetanchor} for details.
+
+Example: GetAnchor("index.htm\#chapter2") == "chapter2"
+
+{\bf Note:} the anchor is NOT part of the left location.
+
+\membersection{wxFileSystemHandler::GetLeftLocation}\label{wxfilesystemhandlergetleftlocation}
+
+\constfunc{wxString}{GetLeftLocation}{\param{const wxString\& }{location}}
+
+Returns the left location string extracted from {\it location}. 
+
+Example: GetLeftLocation("file:myzipfile.zip\#zip:index.htm") == "file:myzipfile.zip"
+
+\membersection{wxFileSystemHandler::GetMimeTypeFromExt}\label{wxfilesystemhandlergetmimetypefromext}
+
+\func{wxString}{GetMimeTypeFromExt}{\param{const wxString\& }{location}}
+
+Returns the MIME type based on {\bf extension} of {\it location}. (While wxFSFile::GetMimeType
+returns real MIME type - either extension-based or queried from HTTP.)
+
+Example : GetMimeTypeFromExt("index.htm") == "text/html"
+
+\membersection{wxFileSystemHandler::GetProtocol}\label{wxfilesystemhandlergetprotocol}
+
+\constfunc{wxString}{GetProtocol}{\param{const wxString\& }{location}}
+
+Returns the protocol string extracted from {\it location}. 
+
+Example: GetProtocol("file:myzipfile.zip\#zip:index.htm") == "zip"
+
+\membersection{wxFileSystemHandler::GetRightLocation}\label{wxfilesystemhandlergetrightlocation}
+
+\constfunc{wxString}{GetRightLocation}{\param{const wxString\& }{location}}
+
+Returns the right location string extracted from {\it location}. 
+
+Example : GetRightLocation("file:myzipfile.zip\#zip:index.htm") == "index.htm"
+
+\membersection{wxFileSystemHandler::FindFirst}\label{wxfilesystemhandlerfindfirst}
+
+\func{virtual wxString}{FindFirst}{\param{const wxString\& }{wildcard}, \param{int }{flags = 0}}
+
+Works like \helpref{wxFindFirstFile}{wxfindfirstfile}. Returns name of the first
+filename (withing filesystem's current path) that matches {\it wildcard}. {\it flags} may be one of
+wxFILE (only files), wxDIR (only directories) or 0 (both).
+
+This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} returns TRUE.
+
+\membersection{wxFileSystemHandler::FindNext}\label{wxfilesystemhandlerfindnext}
+
+\func{virtual wxString}{FindNext}{\void}
+
+Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
+
+This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} returns TRUE and FindFirst
+returned a non-empty string.

 \membersection{wxFileSystemHandler::OpenFile}\label{wxfilesystemhandleropenfile}

@@ -66,56 +127,12 @@ Must be overwriten in derived handlers.

 Opens the file and returns wxFSFile pointer or NULL if failed.

-Must be overwriten in derived handlers.
+Must be overridden in derived handlers.

 \wxheading{Parameters}

 \docparam{fs}{Parent FS (the FS from that OpenFile was called). See ZIP handler
-for details how to use it.}
+for details of how to use it.}

 \docparam{location}{The {\bf absolute} location of file.}

-\membersection{wxFileSystemHandler::GetProtocol}\label{wxfilesystemhandlergetprotocol}
-
-\constfunc{wxString}{GetProtocol}{\param{const wxString\& }{location}}
-
-Returns protocol string extracted from {\it location}. 
-
-Example: GetProtocol("file:myzipfile.zip\#zip:index.htm") == "zip"
-
-\membersection{wxFileSystemHandler::GetLeftLocation}\label{wxfilesystemhandlergetleftlocation}
-
-\constfunc{wxString}{GetLeftLocation}{\param{const wxString\& }{location}}
-
-Returns left location string extracted from {\it location}. 
-
-Example: GetLeftLocation("file:myzipfile.zip\#zip:index.htm") == "file:myzipfile.zip"
-
-\membersection{wxFileSystemHandler::GetAnchor}\label{wxfilesystemhandlergetanchor}
-
-\constfunc{wxString}{GetAnchor}{\param{const wxString\& }{location}}
-
-Returns anchor if present in the location.
-See \helpref{wxFSFile}{wxfsfilegetanchor} for details.
-
-Example : GetAnchor("index.htm\#chapter2") == "chapter2"
-
-{\bf Note:} anchor is NOT part of left location.
-
-\membersection{wxFileSystemHandler::GetRightLocation}\label{wxfilesystemhandlergetrightlocation}
-
-\constfunc{wxString}{GetRightLocation}{\param{const wxString\& }{location}}
-
-Returns right location string extracted from {\it location}. 
-
-Example : GetRightLocation("file:myzipfile.zip\#zip:index.htm") == "index.htm"
-
-\membersection{wxFileSystemHandler::GetMimeTypeFromExt}\label{wxfilesystemhandlergetmimetypefromext}
-
-\func{wxString}{GetMimeTypeFromExt}{\param{const wxString\& }{location}}
-
-Returns MIME type based on {\bf extension} of {\it location}. (While wxFSFile::GetMimeType
-returns real MIME type - either extension-based or queried from HTTP)
-
-Example : GetMimeTypeFromExt("index.htm") == "text/html"
-
--- a/docs/latex/wx/filetype.tex
+++ b/docs/latex/wx/filetype.tex
@@ -1,6 +1,6 @@
 \section{\class{wxFileType}}\label{wxfiletype}

-This class holds information about a given "file type". File type is the same as
+This class holds information about a given {\it file type}. File type is the same as
 MIME type under Unix, but under Windows it corresponds more to an extension than
 to MIME type (in fact, several extensions may correspond to a file type). This
 object may be created in several different ways: the program might know the file
@@ -13,14 +13,14 @@ will be returned if the corresponding information couldn't be found.
 The objects of this class are never created by the application code but are
 returned by \helpref{wxMimeTypesManager::GetFileTypeFromMimeType}{wxmimetypesmanagergetfiletypefrommimetype} and 
 \helpref{wxMimeTypesManager::GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension} methods.
-But it's your responsability to delete the returned pointer when you're done
+But it's your responsibility to delete the returned pointer when you're done
 with it!

 % TODO describe MIME types better than this...
-A brief remainder about what the MIME types are (see the RFC 1341 for more
-information): basicly, it is just a pair category/type (for example,
-"text/plain") where the category is a basic indication of what a file is
-(examples of categories are "application", "image", "text", "binary"...) and
+A brief reminder about what the MIME types are (see the RFC 1341 for more
+information): basically, it is just a pair category/type (for example,
+"text/plain") where the category is a basic indication of what a file is.
+Examples of categories are "application", "image", "text", "binary", and
 type is a precise definition of the document format: "plain" in the example
 above means just ASCII text without any formatting, while "text/html" is the
 HTML document source.
@@ -31,7 +31,7 @@ typically correspond to the extension ".txt", but may as well be associated with

 \wxheading{Derived from}

-No base class.
+None

 \wxheading{Include files}

--- a/docs/latex/wx/fltinstr.tex
+++ b/docs/latex/wx/fltinstr.tex
@@ -3,6 +3,10 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxFilterInputStream}}\label{wxfilterinputstream}

+A filter stream has the capability of a normal stream but it can be placed on top
+of another stream. So, for example, it can uncompress, uncrypt the datas which are read
+from another stream and pass it to the requester.
+
 \wxheading{Derived from}

 \helpref{wxInputStream}{wxinputstream}\\
@@ -24,8 +28,5 @@ differs and it is documented below.

 \func{}{wxFilterInputStream}{\param{wxInputStream\&}{ stream}}

-Initializes a "filter" stream. A filter stream has the capability of a normal
-stream but it can be placed on the top of another stream. So, for example, it
-can uncompress, uncrypt the datas which are read from another stream and pass it
-to the requester.
+Initializes a "filter" stream.

--- a/docs/latex/wx/fltoutst.tex
+++ b/docs/latex/wx/fltoutst.tex
@@ -3,6 +3,11 @@
 % -----------------------------------------------------------------------------
 \section{\class{wxFilterOutputStream}}\label{wxfilteroutputstream}

+A filter stream has the capability of a normal
+stream but it can be placed on top of another stream. So, for example, it
+can compress, encrypt the data which are passed to it and write them to another
+stream.
+
 \wxheading{Derived from}

 \helpref{wxOutputStream}{wxoutputstream}\\
@@ -24,8 +29,5 @@ differs and it is documented below.

 \func{}{wxFilterOutputStream}{\param{wxOutputStream\&}{ stream}}

-Initializes a "filter" stream. A filter stream has the capability of a normal
-stream but it can be placed on the top of another stream. So, for example, it
-can compress, crypt the datas which are passed to it and write them to another
-stream.
+Initializes a "filter" stream.

--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -41,9 +41,11 @@ wxSWISS\_FONT}
 Default constructor.

 \func{}{wxFont}{\param{int}{ pointSize}, \param{int}{ family}, \param{int}{ style}, \param{int}{ weight},
- \param{const bool}{ underline = FALSE}, \param{const wxString\& }{faceName = ""}}
+ \param{const bool}{ underline = FALSE}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}

-Creates a font object.
+Creates a font object (see \helpref{font encoding
+overview}{wxfontencodingoverview} for the meaning of the last parameter).

 \wxheading{Parameters}

@@ -70,6 +72,22 @@ Creates a font object.
 \docparam{faceName}{An optional string specifying the actual typeface to be used. If the empty string,
 a default typeface will chosen based on the family.}

+\docparam{encoding}{An encoding which may be one of
+\twocolwidtha{5cm}
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf wxFONTENCODING\_SYSTEM}}{Default system encoding.}
+\twocolitem{{\bf wxFONTENCODING\_DEFAULT}}{Default application encoding: this
+is the encoding set by calls to 
+\helpref{SetDefaultEncoding}{wxfontsetdefaultencoding} and which may be set to,
+say, KOI8 to create all fonts by default with KOI8 encoding. Initially, the
+default application encoding is the same as default system encoding.}
+\twocolitem{{\bf wxFONTENCODING\_ISO8859\_1...15}}{ISO8859 encodings.}
+\twocolitem{{\bf wxFONTENCODING\_KOI8}}{The standard russian encoding for Internet.}
+\twocolitem{{\bf wxFONTENCODING\_CP1250...1252}}{Windows encodings similar to ISO8859 (but not identical).}
+\end{twocollist}
+If the specified encoding isn't available, no font is created.
+}
+
 \wxheading{Remarks}

 If the desired font does not exist, the closest match will be chosen.
@@ -89,13 +107,24 @@ Destructor.
 \wxheading{Remarks}

 The destructor may not delete the underlying font object of the native windowing
-system, since wxBrush uses a reference counting system for efficiency.
+system, since wxFont uses a reference counting system for efficiency.

 Although all remaining fonts are deleted when the application exits,
 the application should try to clean up all fonts itself. This is because
 wxWindows cannot know if a pointer to the font object is stored in an
 application data structure, and there is a risk of double deletion.

+\membersection{wxFont::GetDefaultEncoding}\label{wxfontgetdefaultencoding}
+
+\func{static wxFontEncoding}{GetDefaultEncoding}{\void}
+
+Returns the current applications default encoding.
+
+\wxheading{See also}
+
+\helpref{Font encoding overview}{wxfontencodingoverview}, 
+\helpref{SetDefaultEncoding}{wxfontsetdefaultencoding}
+
 \membersection{wxFont::GetFaceName}\label{wxfontgetfacename}

 \constfunc{wxString}{GetFaceName}{\void}
@@ -167,6 +196,17 @@ weight identifiers.

 \helpref{wxFont::SetWeight}{wxfontsetweight}

+\membersection{wxFont::SetDefaultEncoding}\label{wxfontsetdefaultencoding}
+
+\func{static void}{SetDefaultEncoding}{\param{wxFontEncoding }{encoding}}
+
+Sets the default font encoding.
+
+\wxheading{See also}
+
+\helpref{Font encoding overview}{wxfontencodingoverview}, 
+\helpref{GetDefaultEncoding}{wxfontgetdefaultencoding}
+
 \membersection{wxFont::SetFaceName}\label{wxfontsetfacename}

 \func{void}{SetFaceName}{\param{const wxString\& }{faceName}}
--- a/docs/latex/wx/fontenum.tex
+++ b/docs/latex/wx/fontenum.tex
@@ -0,0 +1,111 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        fontenum.tex
+%% Purpose:     wxFontEnumerator documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     03.11.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) Vadim Zeitlin
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxFontEnumerator}}\label{wxfontenumerator}
+
+wxFontEnumerator enumerates either all available fonts on the system or only
+the ones with given attributes - either only fixed-width (suited for use in
+programs such as terminal emulators and the like) or the fonts available in
+the given \helpref{encoding}{wxfontencodingoverview}.
+
+To do this, you just have to call one of EnumerateXXX() functions - either 
+\helpref{EnumerateFacenames}{wxfontenumeratorenumeratefacenames} or 
+\helpref{EnumerateEncodings}{wxfontenumeratorenumerateencodings} and the
+corresponding callback ( 
+\helpref{OnFacename}{wxFontEnumeratoronfacename} or
+\helpref{OnFontEncoding}{wxfontenumeratoronfontencoding}) will be called
+repeatedly until either all fonts (satisfying the specified criteria) are
+exhausted or the callback returns FALSE.
+
+\wxheading{Virtual functions to override}
+
+Either \helpref{OnFacename}{wxfontenumeratoronfacename} or 
+\helpref{OnFontEncoding}{wxfontenumeratoronfontencoding} should be overridden
+depending on whether you plan to call 
+\helpref{EnumerateFacenames}{wxfontenumeratorenumeratefacenames} or 
+\helpref{EnumerateEncodings}{wxfontenumeratorenumerateencodings}. Of course,
+if you call both of them, you should override both functions.
+
+\wxheading{Derived from}
+
+None
+
+\wxheading{Include files}
+
+<wx/fontenum.h>
+
+\wxheading{See also}
+
+\helpref{Font encoding overview}{wxfontencodingoverview}, 
+\helpref{Font sample}{samplefont}, 
+\helpref{wxFont}{wxfont}, 
+\helpref{wxFontMapper}{wxfontmapper}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxFontEnumerator::EnumerateFacenames}\label{wxfontenumeratorenumeratefacenames}
+
+\func{virtual bool}{EnumerateFacenames}{
+    \param{wxFontEncoding }{encoding = wxFONTENCODING\_SYSTEM},
+    \param{bool }{fixedWidthOnly = FALSE}}
+
+Call \helpref{OnFacename}{wxfontenumeratoronfacename} for each font which
+supports given encoding (only if it is not wxFONTENCODING\_SYSTEM) and is of
+fixed width (if {\it fixedWidthOnly} is TRUE).
+
+Calling this function with default arguments will result in enumerating all
+fonts available on the system.
+
+\membersection{wxFontEnumerator::EnumerateEncodings}\label{wxfontenumeratorenumerateencodings}
+
+\func{virtual bool}{EnumerateEncodings}{\param{const wxString\& }{font = ""}}
+
+Call \helpref{OnFontEncoding}{wxfontenumeratoronfontencoding} for each
+encoding supported by the given font - or for each encoding supported by at
+least some font if {\it font} is not specified.
+
+
+\membersection{wxFontEnumerator::GetEncodings}\label{wxfontenumeratorgetencodings}
+
+\func{wxArrayString*}{GetEncodings}{\void}
+
+Return array of strings containing all encodings found by 
+\helpref{EnumerateEncodings}{wxfontenumeratorenumerateencodings}. This is convenience function. It is 
+based on default implementation of \helpref{OnFontEncoding}{wxfontenumeratoronfontencoding} so don't expect
+it to work if you overwrite that method.
+
+\membersection{wxFontEnumerator::GetFacenames}\label{wxfontenumeratorgetfacenames}
+
+\func{wxArrayString*}{GetFacenames}{\void}
+
+Return array of strings containing all facenames found by 
+\helpref{EnumerateFacenames}{wxfontenumeratorenumeratefacenames}. This is convenience function. It is 
+based on default implementation of \helpref{OnFacename}{wxfontenumeratoronfacename} so don't expect
+it to work if you overwrite that method.
+
+
+\membersection{wxFontEnumerator::OnFacename}\label{wxfontenumeratoronfacename}
+
+\func{virtual bool}{OnFacename}{\param{const wxString\& }{font}}
+
+Called by \helpref{EnumerateFacenames}{wxfontenumeratorenumeratefacenames} for
+each match. Return TRUE to continue enumeration or FALSE to stop it.
+
+\membersection{wxFontEnumerator::OnFontEncoding}\label{wxfontenumeratoronfontencoding}
+
+\func{virtual bool}{OnFontEncoding}{
+ \param{const wxString\& }{font},
+ \param{const wxString\& }{encoding}
+}
+
+Called by \helpref{EnumerateEncodings}{wxfontenumeratorenumerateencodings} for
+each match. Return TRUE to continue enumeration or FALSE to stop it.
+
--- a/docs/latex/wx/fontmap.tex
+++ b/docs/latex/wx/fontmap.tex
@@ -0,0 +1,15 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Name:        fontmap.tex
+%% Purpose:     wxFontMapper documentation
+%% Author:      Vadim Zeitlin
+%% Modified by:
+%% Created:     03.11.99
+%% RCS-ID:      $Id$
+%% Copyright:   (c) Vadim Zeitlin
+%% Licence:     wxWindows licence
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{\class{wxFontMapper}}\label{wxfontmapper}
+
+TODO.
+
--- a/docs/latex/wx/forward.gif
+++ b/docs/latex/wx/forward.gif
--- a/docs/latex/wx/fsfile.tex
+++ b/docs/latex/wx/fsfile.tex
@@ -5,8 +5,8 @@

 \section{\class{wxFSFile}}\label{wxfsfile}

-This class represents single file opened by \helpref{wxFileSystem}{wxfilesystem}.
-It provides more information than wx's input stream 
+This class represents a single file opened by \helpref{wxFileSystem}{wxfilesystem}.
+It provides more information than wxWindow's input stream 
 (stream, filename, mime type, anchor).

 {\bf Note:} Any pointer returned by wxFSFile's member is valid
@@ -67,39 +67,6 @@ class wxMyFSFile : public wxFSFile
 };
 \end{verbatim}

-\membersection{wxFSFile::GetStream}\label{wxfsfilegetstream}
-
-\constfunc{wxInputStream*}{GetStream}{\void}
-
-Returns pointer to the stream. You can use the returned
-stream to directly access data. You may suppose
-that the stream provide Seek and GetSize functionality
-(even in case of HTTP protocol which doesn't provide
-this by default. wxHtml is using local cache to workaround
-this and to speed up connection)
-
-\membersection{wxFSFile::GetMimeType}\label{wxfsfilegetmimetype}
-
-\constfunc{const wxString\&}{GetMimeType}{\void}
-
-Returns MIME type of the content of this file. It is either
-extension-based (see wxMimeTypesManager) or extracted from
-HTTP protocol Content-Type header.
-
-\membersection{wxFSFile::GetLocation}\label{wxfsfilegetlocation}
-
-\constfunc{const wxString\&}{GetLocation}{\void}
-
-Returns full location of the file, including path and protocol. 
-Examples : 
-
-\begin{verbatim}
-http://www.wxwindows.org
-http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/archive.zip#zip:info.txt
-file:/home/vasek/index.htm
-relative-file.htm
-\end{verbatim}
-
 \membersection{wxFSFile::GetAnchor}\label{wxfsfilegetanchor}

 \constfunc{const wxString\&}{GetAnchor}{\void}
@@ -119,3 +86,36 @@ But it may have some meaning with other files
 (for example myanim.avi\#200 may refer to position in animation
 or reality.wrl\#MyView may refer to predefined view in VRML)

+\membersection{wxFSFile::GetLocation}\label{wxfsfilegetlocation}
+
+\constfunc{const wxString\&}{GetLocation}{\void}
+
+Returns full location of the file, including path and protocol. 
+Examples : 
+
+\begin{verbatim}
+http://www.wxwindows.org
+http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/archive.zip#zip:info.txt
+file:/home/vasek/index.htm
+relative-file.htm
+\end{verbatim}
+
+\membersection{wxFSFile::GetMimeType}\label{wxfsfilegetmimetype}
+
+\constfunc{const wxString\&}{GetMimeType}{\void}
+
+Returns MIME type of the content of this file. It is either
+extension-based (see wxMimeTypesManager) or extracted from
+HTTP protocol Content-Type header.
+
+\membersection{wxFSFile::GetStream}\label{wxfsfilegetstream}
+
+\constfunc{wxInputStream*}{GetStream}{\void}
+
+Returns pointer to the stream. You can use the returned
+stream to directly access data. You may suppose
+that the stream provide Seek and GetSize functionality
+(even in case of HTTP protocol which doesn't provide
+this by default. wxHtml is using local cache to workaround
+this and to speed up connection)
+
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -31,7 +31,8 @@ slashes.

 \func{bool}{wxFileExists}{\param{const wxString\& }{filename}}

-Returns TRUE if the file exists.
+Returns TRUE if the file exists. It also returns TRUE if the file is
+a directory.

 \membersection{::wxFileNameFromPath}

@@ -80,6 +81,17 @@ See \helpref{wxFindFirstFile}{wxfindfirstfile} for an example.

 Returns the Windows directory under Windows; on other platforms returns the empty string.

+\membersection{::wxInitAllImageHandlers}\label{wxinitallimagehandlers}
+
+\func{void}{wxInitAllImageHandlers}{\void}
+
+Adds some common image format handlers, which, depending on wxWindows
+configuration, can be handlers for BMP (loading) (always installed), GIF
+(loading), PCX (loading), PNM (loading and saving as raw
+rgb), PNG (loading and saving), JPEG (loading and saving), file formats.
+
+See also: \helpref{wxImage}{wximage} \helpref{wxImageHandler}{wximagehandler}
+
 \membersection{::wxIsAbsolutePath}

 \func{bool}{wxIsAbsolutePath}{\param{const wxString\& }{filename}}
@@ -408,8 +420,7 @@ the front when the dialog box is popped up.

 \membersection{::wxCreateFileTipProvider}\label{wxcreatefiletipprovider}

-\func{wxTipProvider *}{wxCreateFileTipProvider}{
-    \param{const wxString\& }{filename},
+\func{wxTipProvider *}{wxCreateFileTipProvider}{\param{const wxString\& }{filename},
 \param{size\_t }{currentTip}}

 This function creates a \helpref{wxTipProvider}{wxtipprovider} which may be
@@ -633,8 +644,7 @@ The symbols are not shown when the generic function is used.

 \membersection{::wxShowTip}\label{wxshowtip}

-\func{bool}{wxShowTip}{
-    \param{wxWindow *}{parent},
+\func{bool}{wxShowTip}{\param{wxWindow *}{parent},
 \param{wxTipProvider *}{tipProvider},
 \param{bool }{showAtStartup = TRUE}}

@@ -643,8 +653,7 @@ This function shows a "startup tip" to the user.
 \docparam{parent}{The parent window for the modal dialog}

 \docparam{tipProvider}{An object which is used to get the text of the tips.
-    It may be created with 
-    \helpref{wxCreateFileTipProvider}{wxcreatefiletipprovider} function.}
+It may be created with the \helpref{wxCreateFileTipProvider}{wxcreatefiletipprovider} function.}

 \docparam{showAtStartup}{Should be TRUE if startup tips are shown, FALSE
 otherwise. This is used as the initial value for "Show tips at startup"
@@ -1046,6 +1055,17 @@ Gets the physical size of the display in pixels.

 <wx/gdicmn.h>

+\membersection{::wxEnableTopLevelWindows}\label{wxenabletoplevelwindows}
+
+\func{void}{wxEnableTopLevelWindow}{\param{bool}{ enable = TRUE}}
+
+This function enables or disables all top level windows. It is used by
+\helpref{::wxSafeYield}{wxsafeyield}.
+
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxEntry}\label{wxentry}

 This initializes wxWindows in a platform-dependent way. Use this if you
@@ -1089,18 +1109,6 @@ int CTheApp::ExitInstance()

 <wx/app.h>

-\membersection{::wxError}\label{wxerror}
-
-\func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Internal Error"}}
-
-Displays {\it msg} and continues. This writes to standard error under
-Unix, and pops up a message box under Windows. Used for internal
-wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.
-
-\wxheading{Include files}
-
-<wx/utils.h>
-
 \membersection{::wxEndBusyCursor}\label{wxendbusycursor}

 \func{void}{wxEndBusyCursor}{\void}
@@ -1114,6 +1122,18 @@ See also \helpref{wxIsBusy}{wxisbusy}, \helpref{wxBusyCursor}{wxbusycursor}.

 <wx/utils.h>

+\membersection{::wxError}\label{wxerror}
+
+\func{void}{wxError}{\param{const wxString\& }{msg}, \param{const wxString\& }{title = "wxWindows Internal Error"}}
+
+Displays {\it msg} and continues. This writes to standard error under
+Unix, and pops up a message box under Windows. Used for internal
+wxWindows errors. See also \helpref{wxFatalError}{wxfatalerror}.
+
+\wxheading{Include files}
+
+<wx/utils.h>
+
 \membersection{::wxExecute}\label{wxexecute}

 \func{long}{wxExecute}{\param{const wxString\& }{command}, \param{bool }{sync = FALSE}, \param{wxProcess *}{callback = NULL}}
@@ -1453,6 +1473,25 @@ Now obsolete: use \helpref{wxWindow::Close}{wxwindowclose} instead.

 <wx/utils.h>

+\membersection{::wxPostEvent}\label{wxpostevent}
+
+\func{void}{wxPostEvent}{\param{wxEvtHandler *}{dest}, \param{wxEvent\& }{event}}
+
+This function posts the event to the specified {\it dest} object. The
+difference between sending an event and posting it is that in the first case
+the event is processed before the function returns (in wxWindows, event sending
+is done with \helpref{ProcessEvent}{wxevthandlerprocessevent} function), but in
+the second, the function returns immediately and the event will be processed
+sometime later - usually during the next even loop iteration.
+
+Note that a copy of the {\it event} is made by the function, so the original
+copy can be deleted as soon as function returns. This function can also be used
+to send events between different threads safely.
+
+\wxheading{Include files}
+
+<wx/app.h>
+
 \membersection{::wxSafeYield}\label{wxsafeyield}

 \func{bool}{wxSafeYield}{\param{wxWindow*}{ win = NULL}}
@@ -1468,18 +1507,6 @@ Returns the result of the call to \helpref{::wxYield}{wxyield}.

 <wx/utils.h>

-\membersection{::wxEnableTopLevelWindows}\label{wxenabletoplevelwindows}
-
-\func{void}{wxEnableTopLevelWindow}{\param{bool}{ enable = TRUE}}
-
-This function enables or disables all top level windows. It is used by
-\helpref{::wxSafeYield}{wxsafeyield}.
-
-\wxheading{Include files}
-
-<wx/utils.h>
-
-
 \membersection{::wxSetDisplayName}\label{wxsetdisplayname}

 \func{void}{wxSetDisplayName}{\param{const wxString\& }{displayName}}
@@ -1655,7 +1682,7 @@ function.

 \wxheading{Include files}

-<wx/utils.h>
+<wx/app.h> or <wx/utils.h>

 \section{Macros}\label{macros}

@@ -1917,6 +1944,23 @@ base classes.

 <wx/object.h>

+\membersection{wxBITMAP}\label{wxbitmapmacro}
+
+\func{}{wxBITMAP}{bitmapName}
+
+This macro loads a bitmap from either application resources (on the platforms
+for which they exist, i.e. Windows and OS2) or from an XPM file. It allows to
+avoid using {\tt #ifdef}s when creating bitmaps.
+
+\wxheading{See also}
+
+\helpref{Bitmaps and icons overview}{wxbitmapoverview}, 
+\helpref{wxICON}{wxiconmacro}
+
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \membersection{WXDEBUG\_NEW}\label{debugnew}

 \func{}{WXDEBUG\_NEW}{arg}
@@ -1964,6 +2008,23 @@ Example:

 \helpref{RTTI overview}{runtimeclassoverview}

+\membersection{wxICON}\label{wxiconmacro}
+
+\func{}{wxICON}{iconName}
+
+This macro loads an icon from either application resources (on the platforms
+for which they exist, i.e. Windows and OS2) or from an XPM file. It allows to
+avoid using {\tt #ifdef}s when creating icons.
+
+\wxheading{See also}
+
+\helpref{Bitmaps and icons overview}{wxbitmapoverview}, 
+\helpref{wxBITMAP}{wxbitmapmacro}
+
+\wxheading{Include files}
+
+<wx/gdicmn.h>
+
 \membersection{WXTRACE}\label{trace}

 \wxheading{Include files}
--- a/docs/latex/wx/htcell.tex
+++ b/docs/latex/wx/htcell.tex
@@ -6,7 +6,7 @@
 \section{\class{wxHtmlCell}}\label{wxhtmlcell}

 Internal data structure. It represents fragments of parsed HTML
-page, so-called {\bf cell} - a word, picture, table, horizontal line and so on.
+page, the so-called {\bf cell} - a word, picture, table, horizontal line and so on.
 It is used by \helpref{wxHtmlWindow}{wxhtmlwindow} and 
 \helpref{wxHtmlWinParser}{wxhtmlwinparser} to represent HTML page in memory.

@@ -31,111 +31,22 @@ wxObject

 Constructor.

-\membersection{wxHtmlCell::SetParent}\label{wxhtmlcellsetparent}
+\membersection{wxHtmlCell::AdjustPagebreak}\label{wxhtmlcelladjustpagebreak}

-\func{void}{SetParent}{\param{wxHtmlContainerCell }{*p}}
+\func{virtual bool}{AdjustPagebreak}{\param{int * }{pagebreak}}

-Sets parent container of this cell. This is called from
-\helpref{wxHtmlContainerCell::InsertCell}{wxhtmlcontainercellinsertcell}.
+This method is used to adjust pagebreak position. The parameter is
+variable that contains y-coordinate of page break (= horizontal line that
+should not be crossed by words, images etc.). If this cell cannot be divided
+into two pieces (each one on another page) then it moves the pagebreak
+few pixels up.

-\membersection{wxHtmlCell::GetParent}\label{wxhtmlcellgetparent}
+Returns TRUE if pagebreak was modified, FALSE otherwise

-\constfunc{wxHtmlContainerCell*}{GetParent}{\void}
-
-Returns pointer to parent container.
-
-\membersection{wxHtmlCell::GetPosX}\label{wxhtmlcellgetposx}
-
-\constfunc{int}{GetPosX}{\void}
-
-Returns X position within parent (the value is relative to parent's
-upper left corner). The returned value is meaningful only if
-parent's \helpref{Layout}{wxhtmlcelllayout} was called before!
-
-\membersection{wxHtmlCell::GetPosY}\label{wxhtmlcellgetposy}
-
-\constfunc{int}{GetPosY}{\void}
-
-Returns Y position within parent (the value is relative to parent's
-upper left corner). The returned value is meaningful only if
-parent's \helpref{Layout}{wxhtmlcelllayout} was called before!
-
-\membersection{wxHtmlCell::GetWidth}\label{wxhtmlcellgetwidth}
-
-\constfunc{int}{GetWidth}{\void}
-
-Returns width of the cell (m_Width member).
-
-\membersection{wxHtmlCell::GetHeight}\label{wxhtmlcellgetheight}
-
-\constfunc{int}{GetHeight}{\void}
-
-Returns height of the cell (m_Height member).
-
-\membersection{wxHtmlCell::GetDescent}\label{wxhtmlcellgetdescent}
-
-\constfunc{int}{GetDescent}{\void}
-
-Returns descent value of the cell (m_Descent member). See explanation:
-
-\image{}{descent.bmp}
-
-\membersection{wxHtmlCell::GetLink}\label{wxhtmlcellgetlink}
-
-\constfunc{virtual wxString}{GetLink}{\param{int }{x = 0}, \param{int }{y = 0}}
-
-Returns hypertext link if associated with this cell or empty string otherwise.
-(Note : this makes sense only for visible tags).
-
-\wxheading{Parameters}
-
-\docparam{x,y}{Coordinates of position where the user pressed mouse button.
-These coordinates are used e.g. by COLORMAP. Values are relative to the
-upper left corner of THIS cell (i.e. from 0 to m_Width or m_Height)}
-
-\membersection{wxHtmlCell::GetNext}\label{wxhtmlcellgetnext}
-
-\constfunc{wxHtmlCell*}{GetNext}{\void}
-
-Returns pointer to the next cell in list (see htmlcell.h if you're
-interested in details).
-
-\membersection{wxHtmlCell::SetPos}\label{wxhtmlcellsetpos}
-
-\func{void}{SetPos}{\param{int }{x}, \param{int }{y}}
-
-Sets cell's position within parent container.
-
-\membersection{wxHtmlCell::SetLink}\label{wxhtmlcellsetlink}
-
-\func{void}{SetLink}{\param{const wxString\& }{link}}
-
-Sets the hypertext link asocciated with this cell. (Default value
-is wxEmptyString (no link))
-
-\membersection{wxHtmlCell::SetNext}\label{wxhtmlcellsetnext}
-
-\func{void}{SetNext}{\param{wxHtmlCell }{*cell}}
-
-Sets the next cell in the list. This shouldn't be called by user - it is
-to be used only by \helpref{wxHtmlContainerCell::InsertCell}{wxhtmlcontainercellinsertcell}
-
-\membersection{wxHtmlCell::Layout}\label{wxhtmlcelllayout}
-
-\func{virtual void}{Layout}{\param{int }{w}}
-
-This method performs 2 actions:
-
-\begin{enumerate}
-\item adjusts cell's width according to the fact that maximal possible width is {\it w}.
-(this has sense when working with horizontal lines, tables etc.)
-\item prepares layout (=fill-in m\_PosX, m\_PosY (and sometimes m\_Height) members)
-based on actual width {\it w}
-\end{enumerate}
-
-It must be called before displaying cells structure because
-m\_PosX and m\_PosY are undefined (or invalid)
-before calling Layout.
+Usage: 
+\begin{verbatim}
+while (container->AdjustPagebreak(&p)) {}
+\end{verbatim}

 \membersection{wxHtmlCell::Draw}\label{wxhtmlcelldraw}

@@ -195,13 +106,92 @@ HTML_COND_ISANCHOR condition)

 \wxheading{Defined conditions}

-\begin{twocollist}
+\begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf HTML_COND_ISANCHOR}}{Finds particular anchor. 
 {\it param} is pointer to wxString with name of the anchor.}
 \twocolitem{{\bf HTML_COND_USER}}{User-defined conditions start
-from this number}
+from this number.}
 \end{twocollist}

+\membersection{wxHtmlCell::GetDescent}\label{wxhtmlcellgetdescent}
+
+\constfunc{int}{GetDescent}{\void}
+
+Returns descent value of the cell (m_Descent member). See explanation:
+
+\image{}{descent.bmp}
+
+\membersection{wxHtmlCell::GetHeight}\label{wxhtmlcellgetheight}
+
+\constfunc{int}{GetHeight}{\void}
+
+Returns height of the cell (m_Height member).
+
+\membersection{wxHtmlCell::GetLink}\label{wxhtmlcellgetlink}
+
+\constfunc{virtual wxString}{GetLink}{\param{int }{x = 0}, \param{int }{y = 0}}
+
+Returns hypertext link if associated with this cell or empty string otherwise.
+(Note: this makes sense only for visible tags).
+
+\wxheading{Parameters}
+
+\docparam{x,y}{Coordinates of position where the user pressed mouse button.
+These coordinates are used e.g. by COLORMAP. Values are relative to the
+upper left corner of THIS cell (i.e. from 0 to m_Width or m_Height)}
+
+\membersection{wxHtmlCell::GetNext}\label{wxhtmlcellgetnext}
+
+\constfunc{wxHtmlCell*}{GetNext}{\void}
+
+Returns pointer to the next cell in list (see htmlcell.h if you're
+interested in details).
+
+\membersection{wxHtmlCell::GetParent}\label{wxhtmlcellgetparent}
+
+\constfunc{wxHtmlContainerCell*}{GetParent}{\void}
+
+Returns pointer to parent container.
+
+\membersection{wxHtmlCell::GetPosX}\label{wxhtmlcellgetposx}
+
+\constfunc{int}{GetPosX}{\void}
+
+Returns X position within parent (the value is relative to parent's
+upper left corner). The returned value is meaningful only if
+parent's \helpref{Layout}{wxhtmlcelllayout} was called before!
+
+\membersection{wxHtmlCell::GetPosY}\label{wxhtmlcellgetposy}
+
+\constfunc{int}{GetPosY}{\void}
+
+Returns Y position within parent (the value is relative to parent's
+upper left corner). The returned value is meaningful only if
+parent's \helpref{Layout}{wxhtmlcelllayout} was called before!
+
+\membersection{wxHtmlCell::GetWidth}\label{wxhtmlcellgetwidth}
+
+\constfunc{int}{GetWidth}{\void}
+
+Returns width of the cell (m_Width member).
+
+\membersection{wxHtmlCell::Layout}\label{wxhtmlcelllayout}
+
+\func{virtual void}{Layout}{\param{int }{w}}
+
+This method performs 2 actions:
+
+\begin{enumerate}\itemsep=0pt
+\item adjusts cell's width according to the fact that maximal possible width is {\it w}.
+(this has sense when working with horizontal lines, tables etc.)
+\item prepares layout (=fill-in m\_PosX, m\_PosY (and sometimes m\_Height) members)
+based on actual width {\it w}
+\end{enumerate}
+
+It must be called before displaying cells structure because
+m\_PosX and m\_PosY are undefined (or invalid)
+before calling Layout.
+
 \membersection{wxHtmlCell::OnMouseClick}\label{wxhtmlcellonmouseclick}

 \func{virtual void}{OnMouseClick}{\param{wxWindow* }{parent}, \param{int }{x}, \param{int }{y}, \param{bool }{left}, \param{bool }{middle}, \param{bool }{right}}
@@ -224,3 +214,30 @@ key events or whatsoever) you should use wxHtmlBinderCell instead.
 \docparam{left, middle, right}{boolean flags for mouse buttons. TRUE if the left/middle/right
 button is pressed, FALSE otherwise}

+\membersection{wxHtmlCell::SetLink}\label{wxhtmlcellsetlink}
+
+\func{void}{SetLink}{\param{const wxString\& }{link}}
+
+Sets the hypertext link asocciated with this cell. (Default value
+is wxEmptyString (no link))
+
+\membersection{wxHtmlCell::SetNext}\label{wxhtmlcellsetnext}
+
+\func{void}{SetNext}{\param{wxHtmlCell }{*cell}}
+
+Sets the next cell in the list. This shouldn't be called by user - it is
+to be used only by \helpref{wxHtmlContainerCell::InsertCell}{wxhtmlcontainercellinsertcell}
+
+\membersection{wxHtmlCell::SetParent}\label{wxhtmlcellsetparent}
+
+\func{void}{SetParent}{\param{wxHtmlContainerCell }{*p}}
+
+Sets parent container of this cell. This is called from
+\helpref{wxHtmlContainerCell::InsertCell}{wxhtmlcontainercellinsertcell}.
+
+\membersection{wxHtmlCell::SetPos}\label{wxhtmlcellsetpos}
+
+\func{void}{SetPos}{\param{int }{x}, \param{int }{y}}
+
+Sets the cell's position within parent container.
+
--- a/docs/latex/wx/htcolor.tex
+++ b/docs/latex/wx/htcolor.tex
@@ -25,10 +25,9 @@ Constructor.

 \docparam{flags}{Can be one of following:

-\begin{twocollist}
+\begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf HTML\_CLR\_FOREGROUND}}{change color of text}
 \twocolitem{{\bf HTML\_CLR\_BACKGROUND}}{change background color}
-
 \end{twocollist}
 }

--- a/docs/latex/wx/htcontnr.tex
+++ b/docs/latex/wx/htcontnr.tex
@@ -5,7 +5,7 @@

 \section{\class{wxHtmlContainerCell}}\label{wxhtmlcontainercell}

-wxHtmlContainerCell class an implementation of a cell that may
+The wxHtmlContainerCell class is an implementation of a cell that may
 contain more cells in it. It is heavily used in the wxHTML layout algorithm.

 \wxheading{Derived from}
@@ -25,96 +25,29 @@ contain more cells in it. It is heavily used in the wxHTML layout algorithm.
 Constructor. {\it parent} is pointer to parent container or NULL.


-\membersection{wxHtmlContainerCell::InsertCell}\label{wxhtmlcontainercellinsertcell}
-
-\func{void}{InsertCell}{\param{wxHtmlCell }{*cell}}
-
-Inserts new cell into the container.
-
-\membersection{wxHtmlContainerCell::SetAlignHor}\label{wxhtmlcontainercellsetalignhor}
-
-\func{void}{SetAlignHor}{\param{int }{al}}
-
-Sets container's {\it horizontal alignment}. During \helpref{Layout}{wxhtmlcelllayout}
-each line is aligned according to {\it al} value.
-
-\wxheading{Parameters}
-
-\docparam{al}{new horizontal alignment. May be one of these values:
-
-\begin{twocollist}
-\twocolitem{{\bf HTML\_ALIGN\_LEFT}}{lines are left-aligned (default)}
-\twocolitem{{\bf HTML\_ALIGN\_CENTER\_H}}{lines are centered}
-\twocolitem{{\bf HTML\_ALIGN\_RIGHT}}{lines are right-aligned}
-\end{twocollist}
-}
-
-
 \membersection{wxHtmlContainerCell::GetAlignHor}\label{wxhtmlcontainercellgetalignhor}

 \constfunc{int}{GetAlignHor}{\void}

 Returns container's horizontal alignment.

-\membersection{wxHtmlContainerCell::SetAlignVer}\label{wxhtmlcontainercellsetalignver}
-
-\func{void}{SetAlignVer}{\param{int }{al}}
-
-Sets container's {\it vertical alignment}. This is per-line alignment!
-
-\wxheading{Parameters}
-
-\docparam{al}{new vertical alignment. May be one of these values:
-
-\begin{twocollist}
-\twocolitem{{\bf HTML\_ALIGN\_BOTTOM}}{cells are over the line (default)}
-\twocolitem{{\bf HTML\_ALIGN\_CENTER\_V}}{cells are centered on line}
-\twocolitem{{\bf HTML\_ALIGN\_TOP}}{cells are under the line}
-\end{twocollist}
-
-\image{}{alignv.bmp}
-}
-
 \membersection{wxHtmlContainerCell::GetAlignVer}\label{wxhtmlcontainercellgetalignver}

 \constfunc{int}{GetAlignVer}{\void}

 Returns container's vertical alignment.

-\membersection{wxHtmlContainerCell::SetIndent}\label{wxhtmlcontainercellsetindent}
+\membersection{wxHtmlContainerCell::GetFirstCell}\label{wxhtmlcontainercellgetfirstcell}

-\func{void}{SetIndent}{\param{int }{i}, \param{int }{what}, \param{int }{units = HTML\_UNITS\_PIXELS}}
+\func{wxHtmlCell*}{GetFirstCell}{\void}

-Sets indentation (free space between borders of container and subcells).
+Returns pointer to the first cell in the list.
+You can then use wxHtmlCell's GetNext method to obtain pointer to the next
+cell in list.

-\wxheading{Parameters}
-
-\docparam{i}{Indentation value.}
-
-\docparam{what}{Determines which of the 4 borders we're setting. It is OR
-combination of following constants:
-
-\begin{twocollist}
-\twocolitem{{\bf HTML\_INDENT\_TOP}}{top border}
-\twocolitem{{\bf HTML\_INDENT\_BOTTOM}}{bottom}
-\twocolitem{{\bf HTML\_INDENT\_LEFT}}{left}
-\twocolitem{{\bf HTML\_INDENT\_RIGHT}}{right}
-\twocolitem{{\bf HTML\_INDENT\_HORIZONTAL}}{left and right}
-\twocolitem{{\bf HTML\_INDENT\_VERTICAL}}{top and bottom}
-\twocolitem{{\bf HTML\_INDENT\_ALL}}{all 4 borders}
-\end{twocollist}
-
-\image{}{indent.bmp}
-}
-
-\docparam{units}{Units of {\it i}. This parameter affects interpretation of {\it} value.
-
-\begin{twocollist}
-\twocolitem{{\bf HTML\_UNITS\_PIXELS}}{{\it i} is number of pixels}
-\twocolitem{{\bf HTML\_UNITS\_PERCENT}}{{\it i} is interpreted as percents of width
-of parent container}
-\end{twocollist}
-}
+{\bf Note:} This shouldn't be used by the end user. If you need some way of
+finding particular cell in the list, try \helpref{Find}{wxhtmlcellfind} method
+instead.

 \membersection{wxHtmlContainerCell::GetIndent}\label{wxhtmlcontainercellgetindent}

@@ -130,19 +63,143 @@ It is NOT always in pixels!

 \constfunc{int}{GetIndentUnits}{\param{int }{ind}}

-Returns units of intentation value for {\it ind} where {\it ind} is one
+Returns the units of indentation for {\it ind} where {\it ind} is one
 of the {\bf HTML\_INDENT\_*} constants.

+\membersection{wxHtmlContainerCell::GetMaxLineWidth}\label{wxhtmlcontainercellgetmaxlinewidth}
+
+\constfunc{int}{GetMaxLineWidth}{\void}
+
+Returns width of widest line (note : this may be more than GetWidth()!!
+E.g. if you have 640x480 image and the wxHtmlWindow is only 100x100...)
+
+Call to this method is valid only after calling \helpref{Layout}{wxhtmlcelllayout}
+
+\membersection{wxHtmlContainerCell::InsertCell}\label{wxhtmlcontainercellinsertcell}
+
+\func{void}{InsertCell}{\param{wxHtmlCell }{*cell}}
+
+Inserts new cell into the container.

 \membersection{wxHtmlContainerCell::SetAlign}\label{wxhtmlcontainercellsetalign}

 \func{void}{SetAlign}{\param{const wxHtmlTag\& }{tag}}

-Sets container's alignment (both horizontal and vertical) according to
+Sets the container's alignment (both horizontal and vertical) according to
 the values stored in {\it tag}. (Tags {\tt ALIGN} parameter is extracted.) In fact
 it is only a front-end to \helpref{SetAlignHor}{wxhtmlcontainercellsetalignhor}
 and \helpref{SetAlignVer}{wxhtmlcontainercellsetalignver}.

+\membersection{wxHtmlContainerCell::SetAlignHor}\label{wxhtmlcontainercellsetalignhor}
+
+\func{void}{SetAlignHor}{\param{int }{al}}
+
+Sets the container's {\it horizontal alignment}. During \helpref{Layout}{wxhtmlcelllayout}
+each line is aligned according to {\it al} value.
+
+\wxheading{Parameters}
+
+\docparam{al}{new horizontal alignment. May be one of these values:
+
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf HTML\_ALIGN\_LEFT}}{lines are left-aligned (default)}
+\twocolitem{{\bf HTML\_ALIGN\_CENTER\_H}}{lines are centered}
+\twocolitem{{\bf HTML\_ALIGN\_RIGHT}}{lines are right-aligned}
+\end{twocollist}
+}
+
+\membersection{wxHtmlContainerCell::SetAlignVer}\label{wxhtmlcontainercellsetalignver}
+
+\func{void}{SetAlignVer}{\param{int }{al}}
+
+Sets the container's {\it vertical alignment}. This is per-line alignment!
+
+\wxheading{Parameters}
+
+\docparam{al}{new vertical alignment. May be one of these values:
+
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf HTML\_ALIGN\_BOTTOM}}{cells are over the line (default)}
+\twocolitem{{\bf HTML\_ALIGN\_CENTER\_V}}{cells are centered on line}
+\twocolitem{{\bf HTML\_ALIGN\_TOP}}{cells are under the line}
+\end{twocollist}
+
+\image{}{alignv.bmp}
+}
+
+\membersection{wxHtmlContainerCell::SetBackgroundColour}\label{wxhtmlcontainercellsetbackgroundcolour}
+
+\func{void}{SetBackgroundColour}{\param{const wxColour\& }{clr}}
+
+Sets the background color for this container.
+
+\membersection{wxHtmlContainerCell::SetBorder}\label{wxhtmlcontainercellsetborder}
+
+\func{void}{SetBorder}{\param{const wxColour\& }{clr1}, \param{const wxColour\& }{clr2}}
+
+Sets the border (frame) colours. Border is rectangle around the container.
+
+\wxheading{Parameters}
+
+\docparam{clr1}{Color of top and left lines}
+
+\docparam{clr2}{Color of bottom and right lines}
+
+\membersection{wxHtmlContainerCell::SetIndent}\label{wxhtmlcontainercellsetindent}
+
+\func{void}{SetIndent}{\param{int }{i}, \param{int }{what}, \param{int }{units = HTML\_UNITS\_PIXELS}}
+
+Sets the indentation (free space between borders of container and subcells).
+
+\wxheading{Parameters}
+
+\docparam{i}{Indentation value.}
+
+\docparam{what}{Determines which of the four borders we're setting. It is OR
+combination of following constants:
+
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf HTML\_INDENT\_TOP}}{top border}
+\twocolitem{{\bf HTML\_INDENT\_BOTTOM}}{bottom}
+\twocolitem{{\bf HTML\_INDENT\_LEFT}}{left}
+\twocolitem{{\bf HTML\_INDENT\_RIGHT}}{right}
+\twocolitem{{\bf HTML\_INDENT\_HORIZONTAL}}{left and right}
+\twocolitem{{\bf HTML\_INDENT\_VERTICAL}}{top and bottom}
+\twocolitem{{\bf HTML\_INDENT\_ALL}}{all 4 borders}
+\end{twocollist}
+
+\image{}{indent.bmp}
+}
+
+\docparam{units}{Units of {\it i}. This parameter affects interpretation of {\it} value.
+
+\begin{twocollist}\itemsep=0pt
+\twocolitem{{\bf HTML\_UNITS\_PIXELS}}{{\it i} is number of pixels}
+\twocolitem{{\bf HTML\_UNITS\_PERCENT}}{{\it i} is interpreted as percents of width
+of parent container}
+\end{twocollist}
+}
+
+\membersection{wxHtmlContainerCell::SetMinHeight}\label{wxhtmlcontainercellsetminheight}
+
+\func{void}{SetMinHeight}{\param{int }{h}, \param{int }{align = HTML_ALIGN_TOP}}
+
+Sets minimal height of the container.
+
+When container's \helpref{Layout}{wxhtmlcelllayout} is called, m\_Height
+is set depending on layout of subcells to the height of area covered
+by layed-out subcells. Calling this method guarantees you that the height
+of container is never smaller than {\it h} - even if the subcells cover
+much smaller area.
+
+\wxheading{Parameters}
+
+\docparam{h}{The minimal height.}
+
+\docparam{align}{If height of the container is lower than the minimum height, empty space must be inserted
+somewhere in order to ensure minimal height. This parameter is one of {\bf HTML_ALIGN_TOP,
+HTML_ALIGN_BOTTOM, HTML_ALIGN_CENTER} constants. It refers to the {\it contents}, not to the
+empty place!}

 \membersection{wxHtmlContainerCell::SetWidthFloat}\label{wxhtmlcontainercellsetwidthfloat}

@@ -152,7 +209,7 @@ and \helpref{SetAlignVer}{wxhtmlcontainercellsetalignver}.

 Sets floating width adjustment.

-Normal behaviour of container is that it's width is same as width of 
+The normal behaviour of container is that its width is the same as the width of
 parent container (and thus you can have only one sub-container per line).
 You can change this by setting FWA.

@@ -164,9 +221,9 @@ complement to full width of parent container (e.g.
 of container to parent's width minus 50 pixels. This is useful when
 creating tables - you can call SetWidthFloat(50) and SetWidthFloat(-50))}

-\docparam{units}{Units of {\it w} This parameter affects interpretation of {\it} value.
+\docparam{units}{Units of {\it w} This parameter affects the interpretation of {\it} value.

-\begin{twocollist}
+\begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf HTML\_UNITS\_PIXELS}}{{\it w} is number of pixels}
 \twocolitem{{\bf HTML\_UNITS\_PERCENT}}{{\it w} is interpreted as percents of width
 of parent container}
@@ -176,64 +233,13 @@ of parent container}
 \docparam{tag}{In the second version of method, {\it w} and {\it units}
 info is extracted from tag's {\tt WIDTH} parameter.}

+\pythonnote{The second form of this method is named
+SetWidthFloatFromTag in wxPython.}

-\membersection{wxHtmlContainerCell::SetMinHeight}\label{wxhtmlcontainercellsetminheight}

-\func{void}{SetMinHeight}{\param{int }{h}, \param{int }{align = HTML_ALIGN_TOP}}

-Sets minimal height of the container. 

-(When container's \helpref{Layout}{wxhtmlcelllayout} is called, m_Height
-is set depending on layout of subcells to the height of area covered
-by layouted subcells. Call to this method guarantees you that the height
-of container is never smaller than {\it h} - even if the subcells cover
-much smaller area.)

-\wxheading{Parameters}

-\docparam{h}{The minimal height.}

-\docparam{align}{If height of the container is lower than min. height, empty space must be inserted
-somewhere in order to ensure minimal height. This parameter is one of {\bf HTML_ALIGN_TOP,
-HTML_ALIGN_BOTTOM, HTML_ALIGN_CENTER} constants. It refers to the {\it contents}, not to the
-empty place!}
-
-\membersection{wxHtmlContainerCell::GetMaxLineWidth}\label{wxhtmlcontainercellgetmaxlinewidth}
-
-\constfunc{int}{GetMaxLineWidth}{\void}
-
-Returns width of widest line (note : this may be more than GetWidth()!!
-E.g. if you have 640x480 image and the wxHtmlWindow is only 100x100...)
-
-Call to this method is valid only after calling \helpref{Layout}{wxhtmlcelllayout}
-
-\membersection{wxHtmlContainerCell::SetBackgroundColour}\label{wxhtmlcontainercellsetbackgroundcolour}
-
-\func{void}{SetBackgroundColour}{\param{const wxColour\& }{clr}}
-
-Sets background color for this container.
-
-\membersection{wxHtmlContainerCell::SetBorder}\label{wxhtmlcontainercellsetborder}
-
-\func{void}{SetBorder}{\param{const wxColour\& }{clr1}, \param{const wxColour\& }{clr2}}
-
-Sets border (frame) colours. Border is rectangle around the container.
-
-\wxheading{Parameters}
-
-\docparam{clr1}{Color of top and left lines}
-
-\docparam{clr2}{Color of bottom and right lines}
-
-\membersection{wxHtmlContainerCell::GetFirstCell}\label{wxhtmlcontainercellgetfirstcell}
-
-\func{wxHtmlCell*}{GetFirstCell}{\void}
-
-Returns pointer to the first cell in the list.
-You can then use wxHtmlCell's GetNext method to obtain pointer to the next
-cell in list.
-
-{\bf Note} : This shouldn't be used by the end user. If you need some way of
-finding particular cell in the list, try \helpref{Find}{wxhtmlcellfind} method
-instead.

--- a/docs/latex/wx/htdcrend.tex
+++ b/docs/latex/wx/htdcrend.tex
@@ -0,0 +1,108 @@
+%
+% automatically generated by HelpGen from
+% htmprint.h at 17/Oct/99 12:48:02
+%
+
+\section{\class{wxHtmlDCRenderer}}\label{wxhtmldcrenderer}
+
+This class can render HTML document into a specified area of a DC. You can use it
+in your own printing code, although use of \helpref{wxHtmlEasyPrinting}{wxhtmleasyprinting} 
+or \helpref{wxHtmlPrintout}{wxhtmlprintout} is strongly recommended.
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxHtmlDCRenderer::wxHtmlDCRenderer}\label{wxhtmldcrendererwxhtmldcrenderer}
+
+\func{}{wxHtmlDCRenderer}{\void}
+
+Constructor.
+
+\membersection{wxHtmlDCRenderer::SetDC}\label{wxhtmldcrenderersetdc}
+
+\func{void}{SetDC}{\param{wxDC* }{dc}, \param{int }{maxwidth}}
+
+Assign DC instance to the renderer.
+
+\wxheading{Parameters}
+
+\docparam{maxwidth}{width of the area (on this DC) that is equivalent to screen's width, 
+in pixels (you should set it to page width minus margins). 
+
+{\bf Note:} In the current implementation
+the screen width is always 800 pixels: it gives best results and ensures (almost) same printed outputs
+across platforms and differently configured desktops.}
+
+See also \helpref{SetSize}{wxhtmldcrenderersetsize}.
+
+\membersection{wxHtmlDCRenderer::SetSize}\label{wxhtmldcrenderersetsize}
+
+\func{void}{SetSize}{\param{int }{width}, \param{int }{height}}
+
+Set size of output rectangle, in pixels. Note that you {\bf can't} change
+width of the rectangle between calls to \helpref{Render}{wxhtmldcrendererrender}!
+(You can freely change height.)
+If you set width equal to maxwidth then HTML is rendered as if it were displayed in fullscreen.
+If you set width = 1/2 maxwidth the it is rendered as if it covered half the screen
+and so on.
+
+\membersection{wxHtmlDCRenderer::SetHtmlText}\label{wxhtmldcrenderersethtmltext}
+
+\func{void}{SetHtmlText}{\param{const wxString\& }{html}, \param{const wxString\& }{basepath = wxEmptyString}, \param{bool }{isdir = TRUE}}
+
+Assign text to the renderer. \helpref{Render}{wxhtmldcrendererrender} then draws 
+the text onto DC.
+
+\wxheading{Parameters}
+
+\docparam{html}{HTML text. This is {\it not} a filename.}
+
+\docparam{basepath}{base directory (html string would be stored there if it was in
+file). It is used to determine path for loading images, for example.}
+
+\docparam{isdir}{FALSE if basepath is filename, TRUE if it is directory name
+(see \helpref{wxFileSystem}{wxfilesystem} for detailed explanation)}
+
+\membersection{wxHtmlDCRenderer::Render}\label{wxhtmldcrendererrender}
+
+\func{int}{Render}{\param{int }{x}, \param{int }{y}, \param{int }{from = 0}, \param{int }{dont\_render = FALSE}}
+
+Renders HTML text to the DC.
+
+\wxheading{Parameters}
+
+\docparam{x,y}{ position of upper-left corner of printing rectangle (see \helpref{SetSize}{wxhtmldcrenderersetsize})}
+
+\docparam{from}{y-coordinate of the very first visible cell}
+
+\docparam{dont\_render}{if TRUE then this method only returns y coordinate of the next page
+and does not output anything}
+
+Returned value is y coordinate of first cell than didn't fit onto page.
+Use this value as {\it from} in next call to Render in order to print multipages
+document.
+
+\wxheading{Caution!}
+
+The Following three methods {\bf must} always be called before any call to Render (preferably
+in this order):
+
+\begin{itemize}\itemsep=0pt
+\item \helpref{SetDC}{wxhtmldcrenderersetdc}
+\item \helpref{SetSize}{wxhtmldcrenderersetsize}
+\item \helpref{SetHtmlText}{wxhtmldcrenderersethtmltext}
+\end{itemize}
+
+{\bf Render() changes the DC's user scale and does NOT restore it.}
+
+\membersection{wxHtmlDCRenderer::GetTotalHeight}\label{wxhtmldcrenderergettotalheight}
+
+\func{int}{GetTotalHeight}{\void}
+
+Returns the height of the HTML text. This is important if area height (see \helpref{SetSize}{wxhtmldcrenderersetsize})
+is smaller that total height and thus the page cannot fit into it. In that case you're supposed to
+call \helpref{Render}{wxhtmldcrendererrender} as long as its return value is smaller than GetTotalHeight's.
+
--- a/docs/latex/wx/hteasypr.tex
+++ b/docs/latex/wx/hteasypr.tex
@@ -0,0 +1,136 @@
+%
+% automatically generated by HelpGen from
+% htmprint.h at 17/Oct/99 12:48:02
+%
+
+\section{\class{wxHtmlEasyPrinting}}\label{wxhtmleasyprinting}
+
+This class provides very simple interface to printing 
+architecture. It allows you to print HTML documents using
+only a few commands. 
+
+\wxheading{Note}
+
+Do not create this class on the stack only. You should create an instance on app 
+startup and use this instance for all printing operations. The reason is that
+this class stores various settings in it.
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxHtmlEasyPrinting::wxHtmlEasyPrinting}\label{wxhtmleasyprintingwxhtmleasyprinting}
+
+\func{}{wxHtmlEasyPrinting}{\param{const wxString\& }{name = "Printing"}, \param{wxFrame* }{parent\_frame = NULL}}
+
+Constructor.
+
+\wxheading{Parameters}
+
+\docparam{name}{Name of the printing. Used by preview frames and setup dialogs.}
+
+\docparam{parent\_frame}{pointer to the frame that will own preview frame and setup dialogs. May be NULL.}
+
+
+\membersection{wxHtmlEasyPrinting::PreviewFile}\label{wxhtmleasyprintingpreviewfile}
+
+\func{void}{PreviewFile}{\param{const wxString\& }{htmlfile}}
+
+Previews HTML file. 
+
+\membersection{wxHtmlEasyPrinting::PreviewText}\label{wxhtmleasyprintingpreviewtext}
+
+\func{void}{PreviewText}{\param{const wxString\& }{htmltext}, \param{const wxString\& }{basepath = wxEmptyString}}
+
+Previews HTML text (not file!). 
+
+\wxheading{Parameters}
+
+\docparam{htmltext}{HTML text.}
+
+\docparam{basepath}{base directory (html string would be stored there if it was in
+file). It is used to determine path for loading images, for example.}
+
+\membersection{wxHtmlEasyPrinting::PrintFile}\label{wxhtmleasyprintingprintfile}
+
+\func{void}{PrintFile}{\param{const wxString\& }{htmlfile}}
+
+Prints HTML file.
+
+\membersection{wxHtmlEasyPrinting::PrintText}\label{wxhtmleasyprintingprinttext}
+
+\func{void}{PrintText}{\param{const wxString\& }{htmltext}, \param{const wxString\& }{basepath = wxEmptyString}}
+
+Prints HTML text (not file!). 
+
+\wxheading{Parameters}
+
+\docparam{htmltext}{HTML text.}
+
+\docparam{basepath}{base directory (html string would be stored there if it was in
+file). It is used to determine path for loading images, for example.}
+
+\membersection{wxHtmlEasyPrinting::PrinterSetup}\label{wxhtmleasyprintingprintersetup}
+
+\func{void}{PrinterSetup}{\void}
+
+Displays printer setup dialog and allows the user to modify settings. 
+
+\membersection{wxHtmlEasyPrinting::PageSetup}\label{wxhtmleasyprintingpagesetup}
+
+\func{void}{PageSetup}{\void}
+
+Displays page setup dialog and allows the user to modify settings. 
+
+\membersection{wxHtmlEasyPrinting::SetHeader}\label{wxhtmleasyprintingsetheader}
+
+\func{void}{SetHeader}{\param{const wxString\& }{header}, \param{int }{pg = wxPAGE\_ALL}}
+
+Sets page header.
+
+\wxheading{Parameters}
+
+\docparam{header}{HTML text to be used as header. You can use macros in it:
+
+\begin{itemize}\itemsep=0pt
+\item @PAGENUM@ is replaced by page number
+\item @PAGESCNT@ is replaced by total number of pages
+\end{itemize}
+}
+
+\docparam{pg}{one of wxPAGE\_ODD, wxPAGE\_EVEN and wxPAGE\_ALL constants.}
+
+\membersection{wxHtmlEasyPrinting::SetFooter}\label{wxhtmleasyprintingsetfooter}
+
+\func{void}{SetFooter}{\param{const wxString\& }{footer}, \param{int }{pg = wxPAGE\_ALL}}
+
+Sets page footer.
+
+\wxheading{Parameters}
+
+\docparam{footer}{HTML text to be used as footer. You can use macros in it:
+
+\begin{itemize}\itemsep=0pt
+\item @PAGENUM@ is replaced by page number
+\item @PAGESCNT@ is replaced by total number of pages
+\end{itemize}
+}
+
+\docparam{pg}{one of wxPAGE\_ODD, wxPAGE\_EVEN and wxPAGE\_ALL constants.}
+
+\membersection{wxHtmlEasyPrinting::GetPrintData}\label{wxhtmleasyprintinggetprintdata}
+
+\func{wxPrintData*}{GetPrintData}{\void}
+
+Returns pointer to \helpref{wxPrintData}{wxprintdata} instance used by this class. You can
+set its parameters (via SetXXXX methods).
+
+\membersection{wxHtmlEasyPrinting::GetPageSetupData}\label{wxhtmleasyprintinggetpagesetupdata}
+
+\func{wxPageSetupDialogData*}{GetPageSetupData}{\void}
+
+Returns a pointer to \helpref{wxPageSetupDialogData}{wxpagesetupdialogdata} instance used by 
+this class. You can set its parameters (via SetXXXX methods).
+
--- a/docs/latex/wx/htfilter.tex
+++ b/docs/latex/wx/htfilter.tex
@@ -5,7 +5,7 @@

 \section{\class{wxHtmlFilter}}\label{wxhtmlfilter}

-This class is input filter for \helpref{wxHtmlWindow}{wxhtmlwindow}.
+This class is an input filter for \helpref{wxHtmlWindow}{wxhtmlwindow}.
 It allows you to read and display files of different file formats.

 \wxheading{Derived from}
--- a/docs/latex/wx/hthelpct.tex
+++ b/docs/latex/wx/hthelpct.tex
@@ -8,21 +8,22 @@
 {\bf WARNING! This help controller has an API incompatible with wxWindows
 wxHelpController!}

-This help controller provides easy way how to display HTML help in your
-application (see {\it test} sample). Whole help system is based on {\bf books}
-(see \helpref{AddBook}{wxhtmlhelpcontrolleraddbook}). A book is logical
-part of documentation (for example "User's Guide" or "Programmer's Guide" or
-"C++ Reference" or "wxWindows Reference"). Help controller can handle as
+This help controller provides an easy way of displaying HTML help in your
+application (see {\it test} sample). The help system is based on {\bf books}
+(see \helpref{AddBook}{wxhtmlhelpcontrolleraddbook}). A book is a logical
+section of documentation (for example "User's Guide" or "Programmer's Guide" or
+"C++ Reference" or "wxWindows Reference"). The help controller can handle as
 many books as you want.

 wxHTML uses Microsoft's HTML Help Workshop project files (.hhp, .hhk, .hhc) as its
 native format. The file format is described \helpref{here}{helpformat}.
 Have a look at docs/html/ directory where sample project files are stored.

-You can use tex2rtf to generate MHHW projects (see wxHTML homepage for details).
+You can use Tex2RTF to produce these files when generating HTML, if you set {\bf htmlWorkshopFiles} to {\bf true} in
+your tex2rtf.ini file.

 In order to use the controller in your application under Windows you must
-have following line in your .rc file:
+have the following line in your .rc file:

 \begin{verbatim}
 #include "wx/html/msw/wxhtml.rc"
@@ -36,25 +37,22 @@ wxEvtHandler

 \membersection{wxHtmlHelpController::wxHtmlHelpController}\label{wxhtmlhelpcontrollerwxhtmlhelpcontroller}

-\func{}{wxHtmlHelpController}{\void}
+\func{}{wxHtmlHelpController}{\param{int }{style = wxHF_DEFAULTSTYLE}}

 Constructor.

-\membersection{wxHtmlHelpController::SetTitleFormat}\label{wxhtmlhelpcontrollersettitleformat}
+\wxheading{Parameters}

-\func{void}{SetTitleFormat}{\param{const wxString\& }{format}}
+{\it style} is combination of these flags:

-Sets format of title of the frame. Must contain exactly one "\%s"
-(for title of displayed HTML page).
+\begin{twocollist}
+\twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.}
+\twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.}
+\twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.}
+\twocolitem{\windowstyle{wxHF\_SEARCH}}{Help frame has search panel.}
+\end{twocollist}

-\membersection{wxHtmlHelpController::SetTempDir}\label{wxhtmlhelpcontrollersettempdir}
-
-\func{void}{SetTempDir}{\param{const wxString\& }{path}}
-
-Sets path for storing temporary files (cached binary versions of index and contents files. These binary
-forms are much faster to read.) Default value is empty string (empty string means
-that no cached data are stored). Note that these files are NOT
-deleted when program exits!
+Default value : everything enabled.

 \membersection{wxHtmlHelpController::AddBook}\label{wxhtmlhelpcontrolleraddbook}

@@ -63,7 +61,12 @@ deleted when program exits!
 Adds book (\helpref{.hhp file}{helpformat} - HTML Help Workshop project file) into the list of loaded books.
 This must be called at least once before displaying  any help.

-If {\it show_wait_msg} is TRUE then a decorationless window with progress message is displayed.
+{\it book} may be either .hhp file or ZIP archive that contains arbitrary number of .hhp files in 
+top-level directory. This ZIP archive must have .zip or .htb extension
+(the latter stands for "HTML book"). In other words, {\tt AddBook("help.zip")} is possible and, in fact,
+recommended way.
+
+If {\it show\_wait\_msg} is TRUE then a decorationless window with progress message is displayed.

 \membersection{wxHtmlHelpController::Display}\label{wxhtmlhelpcontrollerdisplay}

@@ -74,7 +77,7 @@ the help in application.

 You can specify the page in many ways:

-\begin{itemize}
+\begin{itemize}\itemsep=0pt
 \item as direct filename of HTML document
 \item as chapter name (from contents) or as a book name
 \item as some word from index
@@ -83,7 +86,7 @@ You can specify the page in many ways:

 Looking for the page runs in these steps:

-\begin{enumerate}
+\begin{enumerate}\itemsep=0pt
 \item try to locate file named x (if x is for example "doc/howto.htm")
 \item try to open starting page of book named x
 \item try to find x in contents (if x is for example "How To ...")
@@ -95,6 +98,9 @@ Looking for the page runs in these steps:

 This alternative form is used to search help contents by numeric IDs.

+\pythonnote{The second form of this method is named DisplayId in
+wxPython.}
+
 \membersection{wxHtmlHelpController::DisplayContents}\label{wxhtmlhelpcontrollerdisplaycontents}

 \func{void}{DisplayContents}{\void}
@@ -114,8 +120,30 @@ Displays help window and focuses index panel.
 Displays help window, focuses search panel and starts searching.
 Returns TRUE if the keyword was found.

-IMPORTANT! KeywordSearch searches only pages listed in .htc file(s)!
-(you should have all pages in contents file...)
+{\bf Important:} KeywordSearch searches only pages listed in .htc file(s).
+You should list all pages in the contents file.
+
+\membersection{wxHtmlHelpController::ReadCustomization}\label{wxhtmlhelpcontrollerreadcustomization}
+
+\func{void}{ReadCustomization}{\param{wxConfigBase* }{cfg}, \param{wxString }{path = wxEmptyString}}
+
+Reads the controller's setting (position of window, etc.)
+
+\membersection{wxHtmlHelpController::SetTempDir}\label{wxhtmlhelpcontrollersettempdir}
+
+\func{void}{SetTempDir}{\param{const wxString\& }{path}}
+
+Sets the path for storing temporary files - cached binary versions of index and contents files. These binary
+forms are much faster to read. Default value is empty string (empty string means
+that no cached data are stored). Note that these files are {\it not}
+deleted when program exits.
+
+\membersection{wxHtmlHelpController::SetTitleFormat}\label{wxhtmlhelpcontrollersettitleformat}
+
+\func{void}{SetTitleFormat}{\param{const wxString\& }{format}}
+
+Sets format of title of the frame. Must contain exactly one "\%s"
+(for title of displayed HTML page).

 \membersection{wxHtmlHelpController::UseConfig}\label{wxhtmlhelpcontrolleruseconfig}

@@ -128,12 +156,6 @@ reads and writes settings (including wxHtmlWindow's settings) when needed.

 The only thing you must do is create wxConfig object and call UseConfig.

-\membersection{wxHtmlHelpController::ReadCustomization}\label{wxhtmlhelpcontrollerreadcustomization}
-
-\func{void}{ReadCustomization}{\param{wxConfigBase* }{cfg}, \param{wxString }{path = wxEmptyString}}
-
-Reads controllers setting (position of window etc.)
-
 \membersection{wxHtmlHelpController::WriteCustomization}\label{wxhtmlhelpcontrollerwritecustomization}

 \func{void}{WriteCustomization}{\param{wxConfigBase* }{cfg}, \param{wxString }{path = wxEmptyString}}
--- a/docs/latex/wx/hthlpdat.tex
+++ b/docs/latex/wx/hthlpdat.tex
@@ -0,0 +1,110 @@
+%
+% automatically generated by HelpGen from
+% helpdata.h at 24/Oct/99 18:03:10
+%
+
+\section{\class{wxHtmlHelpData}}\label{wxhtmlhelpdata}
+
+This class is used by \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}
+and \helpref{wxHtmlHelpFrame}{wxhtmlhelpframe} to access HTML help items.
+It is internal class and should not be used directly - except for the case 
+you're writing your own HTML help controller.
+
+
+\wxheading{Derived from}
+
+\helpref{wxObject}{wxobject}
+
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+
+\membersection{wxHtmlHelpData::wxHtmlHelpData}\label{wxhtmlhelpdatawxhtmlhelpdata}
+
+\func{}{wxHtmlHelpData}{\void}
+
+Constructor.
+
+
+\membersection{wxHtmlHelpData::AddBook}\label{wxhtmlhelpdataaddbook}
+
+\func{bool}{AddBook}{\param{const wxString\& }{book}}
+
+Adds new book. 'book' is location of HTML help project (hhp) or ZIP file
+that contains arbitrary number of .hhp projects (this zip file can have
+either .zip or .htb extension, htb stands for "html book").
+Returns success.
+
+
+\membersection{wxHtmlHelpData::FindPageById}\label{wxhtmlhelpdatafindpagebyid}
+
+\func{wxString}{FindPageById}{\param{int }{id}}
+
+Returns page's URL based on integer ID stored in project.
+
+
+\membersection{wxHtmlHelpData::FindPageByName}\label{wxhtmlhelpdatafindpagebyname}
+
+\func{wxString}{FindPageByName}{\param{const wxString\& }{page}}
+
+Returns page's URL based on its (file)name.
+
+
+\membersection{wxHtmlHelpData::GetBookRecArray}\label{wxhtmlhelpdatagetbookrecarray}
+
+\func{const wxHtmlBookRecArray\&}{GetBookRecArray}{\void}
+
+Returns array with help books info.
+
+\membersection{wxHtmlHelpData::GetContents}\label{wxhtmlhelpdatagetcontents}
+
+\func{wxHtmlContentsItem*}{GetContents}{\void}
+
+Returns contents lists pointer.
+
+\membersection{wxHtmlHelpData::GetContentsCnt}\label{wxhtmlhelpdatagetcontentscnt}
+
+\func{int}{GetContentsCnt}{\void}
+
+Returns size of contents list.
+
+\membersection{wxHtmlHelpData::GetIndex}\label{wxhtmlhelpdatagetindex}
+
+\func{wxHtmlContentsItem*}{GetIndex}{\void}
+
+Returns pointer to index items list.
+
+\membersection{wxHtmlHelpData::GetIndexCnt}\label{wxhtmlhelpdatagetindexcnt}
+
+\func{int}{GetIndexCnt}{\void}
+
+Returns size of index list.
+
+\membersection{wxHtmlHelpData::LoadCachedBook}\label{wxhtmlhelpdataloadcachedbook}
+
+\func{bool}{LoadCachedBook}{\param{wxHtmlBookRecord* }{book}, \param{wxInputStream* }{f}}
+
+Reads binary cached book.
+
+
+\membersection{wxHtmlHelpData::LoadMSProject}\label{wxhtmlhelpdataloadmsproject}
+
+\func{bool}{LoadMSProject}{\param{wxHtmlBookRecord* }{book}, \param{wxFileSystem\& }{fsys}, \param{const wxString\& }{indexfile}, \param{const wxString\& }{contentsfile}}
+
+Imports .hhp files (MS HTML Help Workshop).
+
+\membersection{wxHtmlHelpData::SaveCachedBook}\label{wxhtmlhelpdatasavecachedbook}
+
+\func{bool}{SaveCachedBook}{\param{wxHtmlBookRecord* }{book}, \param{wxOutputStream* }{f}}
+
+Saves binary cached book. (Internal - this methods is used automatically
+if you call SetTempDir!)
+
+\membersection{wxHtmlHelpData::SetTempDir}\label{wxhtmlhelpdatasettempdir}
+
+\func{void}{SetTempDir}{\param{const wxString\& }{path}}
+
+Sets temporary directory where binary cached versions of MS HTML Workshop
+files will be stored. (This is turned off by default and you can enable
+this feature by setting non-empty temp dir.)
+
--- a/docs/latex/wx/hthlpfrm.tex
+++ b/docs/latex/wx/hthlpfrm.tex
@@ -0,0 +1,157 @@
+%
+% automatically generated by HelpGen from
+% helpfrm.h at 24/Oct/99 18:03:10
+%
+
+
+\section{\class{wxHtmlHelpFrame}}\label{wxhtmlhelpframe}
+
+This class is used by \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}
+to display help.
+It is internal class and should not be used directly - except for the case
+you're writing your own HTML help controller.
+
+
+\wxheading{Derived from}
+
+\helpref{wxFrame}{wxframe}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+
+
+\membersection{wxHtmlHelpFrame::wxHtmlHelpFrame}\label{wxhtmlhelpframewxhtmlhelpframe}
+
+\func{}{wxHtmlHelpFrame}{\param{wxHtmlHelpData* }{data = NULL}}
+
+\func{}{wxHtmlHelpFrame}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULTSTYLE}, \param{wxHtmlHelpData* }{data = NULL}}
+
+Constructor.
+
+{\it style} is combination of these flags:
+
+\begin{twocollist}
+\twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.}
+\twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.}
+\twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.}
+\twocolitem{\windowstyle{wxHF\_SEARCH}}{Help frame has search panel.}
+\end{twocollist}
+
+
+\membersection{wxHtmlHelpFrame::Create}\label{wxhtmlhelpframecreate}
+
+\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULTSTYLE}}
+
+Creates the frame.
+
+{\it style} is combination of these flags:
+
+\begin{twocollist}
+\twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.}
+\twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.}
+\twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.}
+\twocolitem{\windowstyle{wxHF\_SEARCH}}{Help frame has search panel.}
+\end{twocollist}
+
+
+
+\membersection{wxHtmlHelpFrame::CreateContents}\label{wxhtmlhelpframecreatecontents}
+
+\func{void}{CreateContents}{\param{bool }{show\_progress = FALSE}}
+
+Creates contents panel. (May take some time.)
+
+
+\membersection{wxHtmlHelpFrame::CreateIndex}\label{wxhtmlhelpframecreateindex}
+
+\func{void}{CreateIndex}{\param{bool }{show\_progress = FALSE}}
+
+Creates index panel. (May take some time.)
+
+
+\membersection{wxHtmlHelpFrame::CreateSearch}\label{wxhtmlhelpframecreatesearch}
+
+\func{void}{CreateSearch}{\void}
+
+Creates search panel.
+
+
+\membersection{wxHtmlHelpFrame::Display}\label{wxhtmlhelpframedisplay}
+
+\func{bool}{Display}{\param{const wxString\& }{x}}
+
+\func{bool}{Display}{\param{const int }{id}}
+
+Displays page x. If not found it will offect the user a choice of
+searching books.
+Looking for the page runs in these steps:
+1. try to locate file named x (if x is for example "doc/howto.htm")
+2. try to open starting page of book x
+3. try to find x in contents (if x is for example "How To ...")
+4. try to find x in index (if x is for example "How To ...")
+
+The second form takes numeric ID as the parameter.
+(uses extension to MS format, <param name="ID" value=id>)
+
+\pythonnote{The second form of this method is named DisplayId in
+wxPython.}
+
+\membersection{wxHtmlHelpFrame::DisplayContents}\label{wxhtmlhelpframedisplaycontents}
+
+\func{bool}{DisplayContents}{\void}
+
+Displays contents panel.
+
+\membersection{wxHtmlHelpFrame::DisplayIndex}\label{wxhtmlhelpframedisplayindex}
+
+\func{bool}{DisplayIndex}{\void}
+
+Displays index panel.
+
+
+\membersection{wxHtmlHelpFrame::GetData}\label{wxhtmlhelpframegetdata}
+
+\func{wxHtmlHelpData*}{GetData}{\void}
+
+Return wxHtmlHelpData object.
+
+\membersection{wxHtmlHelpFrame::KeywordSearch}\label{wxhtmlhelpframekeywordsearch}
+
+\func{bool}{KeywordSearch}{\param{const wxString\& }{keyword}}
+
+Search for given keyword.
+
+
+\membersection{wxHtmlHelpFrame::ReadCustomization}\label{wxhtmlhelpframereadcustomization}
+
+\func{void}{ReadCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}}
+
+Reads user's settings for this frame (see \helpref{wxHtmlHelpController::ReadCustomization}{wxhtmlhelpcontrollerreadcustomization})
+
+\membersection{wxHtmlHelpFrame::RefreshLists}\label{wxhtmlhelpframerefreshlists}
+
+\func{void}{RefreshLists}{\param{bool }{show\_progress = FALSE}}
+
+Refresh all panels. This is neccessary if new book was added.
+
+\membersection{wxHtmlHelpFrame::SetTitleFormat}\label{wxhtmlhelpframesettitleformat}
+
+\func{void}{SetTitleFormat}{\param{const wxString\& }{format}}
+
+Sets frame's title format. {\it format} must contain exactly one "\%s"
+(it will be replaced by page's title).
+
+\membersection{wxHtmlHelpFrame::UseConfig}\label{wxhtmlhelpframeuseconfig}
+
+\func{void}{UseConfig}{\param{wxConfigBase* }{config}, \param{const wxString\& }{rootpath = wxEmptyString}}
+
+Add books to search choice panel
+
+
+\membersection{wxHtmlHelpFrame::WriteCustomization}\label{wxhtmlhelpframewritecustomization}
+
+\func{void}{WriteCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}}
+
+Saves user's settings for this frame (see \helpref{wxHtmlHelpController::WriteCustomization}{wxhtmlhelpcontrollerwritecustomization})
+
+
--- a/docs/latex/wx/htmlcell.tex
+++ b/docs/latex/wx/htmlcell.tex
@@ -1,4 +1,4 @@
-\subsection{Cells and Containers}\label{cells}
+\section{Cells and Containers}\label{cells}

 This article describes mechanism used by 
 \helpref{wxHtmlWinParser}{wxhtmlwinparser} and 
--- a/docs/latex/wx/htmlfilt.tex
+++ b/docs/latex/wx/htmlfilt.tex
@@ -1,4 +1,4 @@
-\membersection{Input Filters}\label{filters}
+\section{Input Filters}\label{filters}

 The wxHTML library provides a mechanism for reading and displaying
 files of many different file formats. 
--- a/docs/latex/wx/htmlhand.tex
+++ b/docs/latex/wx/htmlhand.tex
@@ -1,11 +1,11 @@
-\membersection{Tag Handlers}\label{handlers}
+\section{Tag Handlers}\label{handlers}

-wxHTML library provides architecture of pluginable {\it tag handlers}.
+The wxHTML library provides architecture of pluggable {\it tag handlers}.
 Tag handler is class that understands particular HTML tag (or tags) and is
 able to interpret it.

 \helpref{wxHtmlWinParser}{wxhtmlwinparser} has static table of {\bf modules}.
-Each module contains one or more tag handlers. Each time new wxHtmlWinParser
+Each module contains one or more tag handlers. Each time a new wxHtmlWinParser
 object is constructed all modules are scanned and handlers are added
 to wxHtmlParser's list of available handlers (note: wxHtmlParser's list
 is non-static).
@@ -15,7 +15,7 @@ is non-static).
 Common tag handler's \helpref{HandleTag}{wxhtmltaghandlerhandletag} method
 works in four steps:

-\begin{enumerate}
+\begin{enumerate}\itemsep=0pt
 \item Save state of parent parser into local variables
 \item Change parser state according to tag's params
 \item Parse text between the tag and paired ending tag (if present)
@@ -47,7 +47,7 @@ You can use set of macros to define the handler (see src/mod\_*.cpp files
 for details). Handler definition must start with {\bf TAG\_HANDLER\_BEGIN} macro
 and end with {\bf TAG\_HANDLER\_END} macro. I strongly recommend to have a look
 at {\it include/wxhtml/mod\_templ.h} file. Otherwise you won't understand
-the structure of macros... See macros reference:
+the structure of macros. See macros reference:

 {\bf TAG\_HANDLER\_BEGIN}({\it name}, {\it tags})

--- a/docs/latex/wx/htmlhlpf.tex
+++ b/docs/latex/wx/htmlhlpf.tex
@@ -1,6 +1,8 @@
-\membersection{Help Files Format}\label{helpformat}
+\section{Help Files Format}\label{helpformat}

 wxHTML library uses a reduced version of MS HTML Workshop format.
+Tex2RTF can produce these files when generating HTML, if you set {\bf htmlWorkshopFiles} to {\bf true} in
+your tex2rtf.ini file.

 (See \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} for help controller description.)

@@ -17,15 +19,15 @@ Title=@title of your book@
 Default topic=@default page to be displayed.htm@
 \end{verbatim}

-All filenames (including Default topic) are relative to the location of .hhp file.
+All filenames (including the Default topic) are relative to the location of .hhp file.

-For larger projects I recommend storing everything but .hhp file into one .zip archive. (E.g. contents file 
-would then be reffered as myhelp.zip\#zip:contents.hhc)
+For larger projects I recommend storing everything but .hhp file into one .zip archive. (The contents file 
+would then be referred to as myhelp.zip\#zip:contents.hhc)

 \wxheading{Contents file (.hhc)}

 Contents file has HTML syntax and it can be parsed by regular HTML parser. It contains exactly one list
-(<ul>....</ul> statement):
+(\verb$<ul>$....\verb$</ul>$ statement):

 \begin{verbatim}
 <ul>
@@ -49,7 +51,7 @@ You can modify value attributes of param tags. {\it topic name} is name of chapt
 contents, {\it filename.htm} is HTML page name (relative to .hhp file) and {\it numeric_id} is optional 
 - it is used only when you use \helpref{wxHtmlHelpController::Display(int)}{wxhtmlhelpcontrollerdisplay}

-Items in the list may be nested - one \<li\> statement may contain \<ul\> sub-statement:
+Items in the list may be nested - one \verb$<li>$ statement may contain a \verb$<ul>$ sub-statement:

 \begin{verbatim}
 <ul>
--- a/docs/latex/wx/htmlprn.tex
+++ b/docs/latex/wx/htmlprn.tex
@@ -1,63 +1,13 @@
-\membersection{Printing}\label{printing}
+\section{HTML Printing}\label{printing}

-The wxHTML library provides printing facilities. 
+The wxHTML library provides printing facilities with several levels of complexity. 

-You can redirect output displayed by \helpref{wxHtmlWindow}{wxhtmlwindow}
-to the printer DC using this (or similar) code (see {\bf printing} sample for
-more details) :
+The easiest way to print an HTML document is to use 
+\helpref{wxHtmlEasyPrinting class}{wxhtmleasyprinting}. It lets you print HTML documents with only one
+command and you don't have to worry about deriving from the wxPrintout class at all. It is only a simple wrapper around the 
+\helpref{wxHtmlPrintout}{wxhtmlprintout}, normal wxWindows printout class.

-\begin{verbatim}
-//
-//  This method prints page number one to dc:
-//
-
-void MyPrintout::DrawPageOne(wxDC *dc)
-{
-  int leftMargin = 20;
-  int topMargin = 50;
-         // You must compute the margins there. 
-	 // Caution! These values are NOT in printer DC's units.
-	 // These values are in screen pixels.
-	 // (see bellow)
-
-  // Here we obtain internal cell representation of HTML document:
-  // (html is our pointer to wxHtmlWindow object)
-  wxHtmlContainerCell *cell = html -> GetInternalRepresentation();
-
-  // Now we have to check in case our real page size is reduced
-  // (e.g. because we're drawing to a print preview memory DC)
-  int pageWidth, pageHeight;
-  int w, h;
-  dc->GetSize(&w, &h);                        // DC size
-  GetPageSizePixels(&pageWidth, &pageHeight); // real size
-
-  // Now we must scale it. This equation will map wxHtmlWindow
-  // to page in this way:
-  // |--this is whole page as printed---------|
-  // |        |                      |        |
-  // |        |                      |        |
-  // |-margin-|-----wxHtmlWindow-----|-margin-|
-  //
-  // So page width is 2*leftMargin + [wxHtmlWindow size]
-  // (measured in screen pixels).
-  // We will scale the printer DC so that wxHtmlWindow's content
-  // spreads from left to right:
-  float scale = (float)(
-                  (float)(pageWidth) /
-                  (float)(2 * leftMargin + cell -> GetMaxLineWidth()));
-
-  // If printer pageWidth == current DC width, then this doesn't
-  // change. But w might be the preview bitmap width, so scale down.
-  float overallScale = scale * (float)(w/(float)pageWidth);
-
-  // Set the user scale so that our computations take effect:
-  dc->SetUserScale(overallScale, overallScale);
-  dc->SetBackgroundMode(wxTRANSPARENT);
-
-  // And this is - finally - HTML stuff:
-  cell -> Draw(*dc, leftMargin, topMargin, 0, cell -> GetHeight());
-}
-\end{verbatim}
-
-(Thanks to Julian Smart for sample)
+And finally there is the low level class \helpref{wxHtmlDCRenderer}{wxhtmldcrenderer} which you can use to
+render HTML into a rectangular area on any DC. It supports rendering into multiple rectangles with the same
+width. (The most common use of this is placing one rectangle on each page or printing into two columns.)

--- a/Show More
+++ b/Show More