This commit was manufactured by cvs2svn to create tag

'WX_2_2_FIRST_MERGE'. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_2_FIRST_MERGE@7746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 13:52:23 +00:00
311 changed files with 6446 additions and 22625 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,23 +21,10 @@ linux-gnu.system.cache
 *.d
 *.swp
 *.swo
-*.swq
 Release
 Debug
-ReleaseDll
-DebugDll
-ReleaseUnicode
-DebugUnicode
-ReleaseUnicodeDll
-DebugUnicodeDll
-BaseRelease
-BaseDebug
-BaseReleaseDll
-BaseDebugDll
-BaseReleaseUnicode
-BaseDebugUnicode
-BaseReleaseUnicodeDll
-BaseDebugUnicodeDll
+ReleaseDLL
+DebugDLL
 robert
 stamp-h.in
 Makefile
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -115,20 +115,6 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
 Of course, you can also build the library using plain makefiles (see
 section I).

-IV) wxBase
----------------------------------------
-
-wxBase is the non GUI part of wxWindows. Currently it can be only built using
-configure (i.e. under Unix and probably under Win32 with cygwin) and with
-Visual C++.
-
-To build it using configure, just add "--disable-gui" argument to it.
-
-To build wxBase with VC++, use the project files wxBase.dsp and wxBaseDll.dsp
-included in the CVS. See http://www.wxwindows.org/vadim/wxDocs/buildmsw.html
-for the instructions on how to generate the project files for the programs
-using wxBase.
-
 V) MacOS
 ----------------------------------------

--- a/Makefile.in
+++ b/Makefile.in
@@ -532,13 +532,10 @@ ALL_DIST: distclean
 # but is not used when building wxBase distribution
 ALL_GUI_DIST: ALL_DIST
 	cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
-	cp $(WXDIR)/wxBase.spec $(DISTDIR)
 	cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt
 	cp $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt
-	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/wxBASE.todo
-	cp $(DOCDIR)/base/install.txt $(DISTDIR)/wxBASE.install
 	mkdir $(DISTDIR)/include
 	mkdir $(DISTDIR)/include/wx
 	mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
@@ -607,15 +604,13 @@ BASE_DIST: ALL_DIST
 	cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
 	cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
 	cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
-	cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
-	cp $(DOCDIR)/base/install.txt $(DISTDIR)/INSTALL.txt
+	cp $(WXDIR)/wxBase.dsp $(DISTDIR)
+	cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt
 	cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
 	cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt
-	cp $(DOCDIR)/base/todo.txt $(DISTDIR)/TODO.txt
+	cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt
 	cp $(SRCDIR)/*.in $(DISTDIR)/src
-	cp $(WXDIR)/src/common/*.inc $(DISTDIR)/src/common
-	cp $(WXDIR)/src/common/base.rc $(DISTDIR)/src/common
-	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common
+	cp $(WXDIR)/src/common/unzip.h $(DISTDIR)/src/common/unzip.h
 	list='$(HEADERS)'; for p in $$list; do \
 	  cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \
 	done
@@ -623,18 +618,8 @@ BASE_DIST: ALL_DIST
 	  cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \
 	done

-	mkdir $(DISTDIR)/samples
-	cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples
-	cp $(SAMPDIR)/configure $(DISTDIR)/samples
-	cp $(SAMPDIR)/configure.in $(DISTDIR)/samples
-
-	mkdir $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/Makefile.in $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/makefile.unx $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/console.cpp $(DISTDIR)/samples/console
-	cp $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
-
 GTK_DIST: ALL_GUI_DIST
+	cp $(WXDIR)/wxGTK.spec $(DISTDIR)
 	cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk
 	cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk
 	cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
--- a/6
+++ b/6
@@ -907,10 +907,10 @@ test "$host_alias" != "$target_alias" &&

 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=2
-WX_RELEASE_NUMBER=1
+WX_RELEASE_NUMBER=0

-WX_INTERFACE_AGE=1
-WX_BINARY_AGE=2
+WX_INTERFACE_AGE=0
+WX_BINARY_AGE=1

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER

--- a/configure.in
+++ b/configure.in
@@ -457,10 +457,10 @@ dnl WX_INTERFACE_AGE = 0

 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=2
-WX_RELEASE_NUMBER=1
+WX_RELEASE_NUMBER=0

-WX_INTERFACE_AGE=1
-WX_BINARY_AGE=2
+WX_INTERFACE_AGE=0
+WX_BINARY_AGE=1

 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER

--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -237,7 +237,6 @@ public:
    wxSTC_UndoType GetUndoCollection();
    void     BeginUndoAction();
    void     EndUndoAction();
-    void     SetSavePoint();


    // Selection and information
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -464,7 +464,6 @@ ListBox::~ListBox() {
 void ListBox::Create(Window &parent, int ctrlID) {
    id = new wxListBox(parent.id, ctrlID, wxDefaultPosition, wxDefaultSize,
                       0, NULL, wxLB_SINGLE | wxLB_SORT);
-    ((wxListBox*)id)->Show(FALSE);
 }

 void ListBox::Clear() {
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -333,9 +333,6 @@ void wxStyledTextCtrl::EndUndoAction() {
 }


-void wxStyledTextCtrl::SetSavePoint() {
-    SendMsg(SCI_SETSAVEPOINT);
-}


 //----------------------------------------------------------------------
@@ -359,11 +356,10 @@ wxString wxStyledTextCtrl::GetSelectedText() {

    GetSelection(&start, &end);
    int   len  = end - start;
-    if (len > 0) {
-        char* buff = text.GetWriteBuf(len);
-        SendMsg(EM_GETSELTEXT, 0, (long)buff);
-        text.UngetWriteBuf();
-    }
+    char* buff = text.GetWriteBuf(len);
+
+    SendMsg(EM_GETSELTEXT, 0, (long)buff);
+    text.UngetWriteBuf();
    return text;
 }

@@ -1053,7 +1049,7 @@ void wxStyledTextCtrl::MarkerDeleteAll(int markerNumber) {


 int wxStyledTextCtrl::MarkerGet(int line) {
-    return SendMsg(SCI_MARKERGET, line);
+    return SendMsg(SCI_MARKERGET);
 }


@@ -1063,7 +1059,7 @@ int wxStyledTextCtrl::MarkerGetNextLine(int lineStart, int markerMask) {


 int wxStyledTextCtrl::MarkerGetPrevLine(int lineStart, int markerMask) {
-//   TODO  return SendMsg(SCI_MARKERPREV, lineStart, markerMask);
+//    return SendMsg(SCI_MARKERPREV, lineStart, markerMask);
    return 0;
 }

@@ -1144,7 +1140,7 @@ char wxStyledTextCtrl::AutoCompGetSeparator() {


 void wxStyledTextCtrl::AutoCompSelect(const wxString& stringtoselect) {
-    SendMsg(SCI_AUTOCSELECT, 0, (long)stringtoselect.c_str());
+    SendMsg(SCI_AUTOCSELECT, (long)stringtoselect.c_str());
 }


--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,17 +5,14 @@ The following packages are built from the wxWindows CVS source.

 libwxbase		wxBase runtime shared libraries
 libwxbase-dev		extra files and static libs for building wxBase apps
-libwxbase-dbg		wxBase libraries built with -g and __WXDEBUG__
 libwxgtk		wxGTK runtime shared libraries
 libwxgtk-dev		extra files and static libs for building wxGTK apps
-libwxgtk-dbg		wxGTK libraries built with -g and __WXDEBUG__
 libwxgtk-python		Python binding to wxGTK
 wxwin-contrib		wxWin contrib runtime shared libs (built with wxGTK)
 wxwin-contrib-dev	extra files and static contrib libs for building apps
 wxwin-headers		common header files for building wxWindows apps
 wxwin-doc		HTML version of the wxWindows manual
 wxwin-examples		wxWindows and wxPython demos and samples (source)
-wxwin-i18n		message catalogs for native language support


 -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,6 @@
 wxwindows2.2 (2.2.1) unstable; urgency=low

-  * wxWin 2.2.1 stable release.
-  * First upload to deb.org after repackaging to build directly from
-    upstream cvs.
-  * still not quite lintian clean yet:
-    - wxPython lib can't be built with a proper soname yet.
-    - the -dbg packages need an override for the shlib symlink.
-    - and a couple of packages have the lib symlink 'before the
-      lib', but that's ugly to fix right now, they aren't critical
-      libs, and allegedly this will be handled by dpkg sometime soon.
-  * moved full licence text into copyright file.
+  * Repackaged to build from cvs.

 -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2000 18:40:00 +1030

--- a/debian/control.in
+++ b/debian/control.in
@@ -1,9 +1,9 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev, libesd0-dev
+Build-Depends: debhelper, flex, bison, libgtk1.2-dev, python-dev (>=1.5), zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, mesag-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.2.0
+Standards-Version: 3.1.1

 Package: libwxbase=V
 Architecture: any
@@ -15,8 +15,8 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package is only useful for non-gui apps.  It offers a subset of the
 classes in libwx_gtk=V for use in console apps and daemons.  It is currently
@@ -36,8 +36,8 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...), win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package provides the files needed to compile apps using the wxBase library.

@@ -45,17 +45,14 @@ Package: libwxbase=V-dbg
 Architecture: any
 Section: devel
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxbase-dbg
-Replaces: libwxbase-dbg
-Provides: libwxbase-dbg
 Description: wxBase library (debug) - non-GUI support classes of wxWindows toolkit
 wxBase is a collection of C++ classes providing basic data structures
 (strings, lists, arrays), powerful wxDateTime class for date manipulations,
 portable wrappers around many OS-specific functions allowing to build the
 same program under all supported folders, wxThread class for writing
 multithreaded programs using either Win32 or POSIX threads and much more.
- wxBase currently supports the following platforms: Generic Unix (Linux, FreeBSD,
- Solaris, HP-UX, ...) win32, and BeOS.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
 .
 This package provides a debug version of the wxBase library.  It is compiled
 both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
@@ -97,9 +94,6 @@ Package: libwxgtk=V-dbg
 Architecture: any
 Section: devel
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-dbg
-Replaces: libwxgtk-dbg
-Provides: libwxgtk-dbg
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 wxWindows is a class library for C++ providing GUI (Graphical User
 Interface) and other facilities on more than one platform.  Version =V
@@ -113,7 +107,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
-Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5.2), ${shlibs:Depends}
+Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5), ${shlibs:Depends}
 Suggests: wxwin=V-doc
 Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
 wxWindows is a class library for C++ providing GUI (Graphical User
@@ -163,19 +157,6 @@ Description: wxWindows Cross-platform C++ GUI toolkit (header files)
 This package provides the common header files required to build applications
 using the wxWindows toolkit.

-Package: wxwin=V-i18n
-Architecture: all
-Section: libs
-Conflicts: wxwin-i18n
-Replaces: wxwin-i18n
-Provides: wxwin-i18n
-Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package provides the i18n message catalogs for wxWindows.
-
 Package: wxwin=V-doc
 Architecture: all
 Section: doc
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,193 +1,18 @@
 This package was debianized by Ron Lee <ron@debian.org> on
 Sun, 13 Feb 2000 18:40:00 +1030.

-more information about wxWindows, as well as the source these debs
-are produced from can be found at www.wxwindows.org
+wxWindows main upstream site is www.wxwindows.org

-Note for Debian users:
-======================
-
-Most of the core wxWindows library is licenced under the wxWindows Library
-Licence (included below), however some additional features of the library
-may include source licenced under terms which do not include the exception
-permitting you to licence binary object code versions of works based on the
-Library under terms of your own choice.  At any time and without warning,
-newer versions of the Debian binary packages may include such code.
-
-In short, if you plan to licence apps built against these debs under terms
-compatible with the GPL or LGPL, then you have nothing to worry about.  If
-you wish to release your code under a licence which does not grant all of
-the same rights as the LGPL would assert but would be permitted under the
-terms of the exception, then you are strongly advised to either check the
-licencing terms of all components that these debs (and all future versions
-that you use) are built with, or build your own binaries of wxWindows which
-include only such code as is definitely covered by the exception.
-
-You should presume that these debs will fall under the provisions of the
-unmodified LGPL unless you can prove otherwise, however this note in no way
-alters the actual terms of the authorative licence detailed below, it is
-intended to be purely informative of the fact that the Debian binary packages
-will be built primarily with features useful to Free Software developers and
-may not be suitable "as is" for compiling software for distribution that is
-licenced incompatibly with the LGPL.
-
-Modifications and additions to the Library itself are encouraged to be
-placed under the wxWindows Library Licence.  We hope you find it useful.
-
-  -- Ron
-
-----------------------------------------------------------------------------
-
-Preamble
-========
-
-The licensing of the wxWindows library is intended to protect the wxWindows
-library, its developers, and its users, so that the considerable investment
-it represents is not abused.
-
-Under the terms of the wxWindows Licence, you as a user are not
-obliged to distribute wxWindows source code with your products, if you
-distribute these products in binary form. However, you are prevented from
-restricting use of the library in source code form, or denying others the
-rights to use or distribute wxWindows library source code in the way
-intended.
-
-The wxWindows Licence establishes the copyright for the code and related
-material, and it gives you legal permission to copy, distribute and/or
-modify the library. It also asserts that no warranty is given by the authors
-for this or derived code.
-
-The core distribution of the wxWindows library contains files
-under two different licences:
-
- Most files are distributed under the GNU Library General Public
-  Licence, version 2, with the special exception that you may create and
-  distribute object code versions built from the source code or modified
-  versions of it (even if these modified versions include code under a
-  different licence), and distribute such binaries under your own
-  terms.
-
- Most core wxWindows manuals are made available under the "wxWindows
-  Free Documentation Licence", which allows you to distribute modified
-  versions of the manuals, such as versions documenting any modifications
-  made by you in your version of the library. However, you may not restrict
-  any third party from reincorporating your changes into the original
-  manuals.
+wxWindows is licenced under the LGPL with a special exception for
+binary only apps produced with it.  Some parts of the library (as
+compiled for Debian) might *not* include this extra exception in
+their licence.  If you wish to distribute binary object code under
+terms other than those allowed by the (L)GPL (but allowed by the
+wxWindows Licence), you must first ensure all linked in code is
+subject to this exception.  This package is almost certainly built
+with code licenced under terms which do not include that exception.


-
-                wxWindows Library Licence, Version 3
-                ====================================
-
-  Copyright (c) 1998 Julian Smart, Robert Roebling et al
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       WXWINDOWS LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxWindows Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-
-
-
-                wxWindows Free Documentation Licence, Version 3
-                ===============================================
-
-  Copyright (c) 1998 Julian Smart, Robert Roebling et al
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-   
-                   WXWINDOWS FREE DOCUMENTATION LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  1. Permission is granted to make and distribute verbatim copies of this
-  manual or piece of documentation provided any copyright notice and this
-  permission notice are preserved on all copies.
-
-  2. Permission is granted to process this file or document through a
-  document processing system and, at your option and the option of any third
-  party, print the results, provided a printed document carries a copying
-  permission notice identical to this one.
-
-  3. Permission is granted to copy and distribute modified versions of this
-  manual or piece of documentation under the conditions for verbatim
-  copying, provided also that any sections describing licensing conditions
-  for this manual, such as, in particular, the GNU General Public Licence,
-  the GNU Library General Public Licence, and any wxWindows Licence are
-  included exactly as in the original, and provided that the entire
-  resulting derived work is distributed under the terms of a permission
-  notice identical to this one.
-
-  4. Permission is granted to copy and distribute translations of this
-  manual or piece of documentation into another language, under the above
-  conditions for modified versions, except that sections related to
-  licensing, including this paragraph, may also be included in translations
-  approved by the copyright holders of the respective licence documents in
-  addition to the original English.
-
-                            WARRANTY DISCLAIMER
-
-  5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
-  THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. 
-  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
-  PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
-  WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-  PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
-  THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU.  SHOULD THE MANUAL OR
-  PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-  NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-  ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE
-  LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-  MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF
-  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-  PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF
-  DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-  OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+   See the file licence.txt for authorative details of
+                  the wxWindows licence.

--- a/debian/libwxgtk-python.docs
+++ b/debian/libwxgtk-python.docs
@@ -1,3 +1,3 @@
 wxPython/README.txt
 wxPython/CHANGES.txt
-
+docs/licence.txt
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ package_gtk_py=libwxgtk$(release)-python
 package_gtk_contrib=libwxgtk$(release)-contrib
 package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
 package_headers=wxwin$(release)-headers
-package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples

@@ -37,7 +36,6 @@ objdir_gtk_debug=objs_gtk_d
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
-objdir_i18n=locale
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
 	$(objdir_doc) $(objdir_examples)
@@ -46,13 +44,12 @@ build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
             build-wxbase-debug-stamp build-gtk-shared-stamp \
             build-gtk-static-stamp build-gtk-debug-stamp \
             build-contrib-shared-stamp build-contrib-static-stamp \
-             build-gtk-python-stamp build-examples-stamp build-doc-stamp \
-             build-i18n-stamp
+             build-gtk-python-stamp build-examples-stamp build-doc-stamp

 install_all=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
            install-gtk-lib install-gtk-dev install-gtk-dbg \
            install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
-            install-headers install-i18n install-doc install-examples
+            install-headers install-doc install-examples

 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 		--prefix=$(shell pwd) \
@@ -69,27 +66,27 @@ debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in

 control-files-stamp: debian/control debian/wxwin-doc.doc-base
 	dh_testdir
-	@for f in dirs postinst; do \
+	@for f in dirs docs postinst; do \
 		echo "generating control file $(package_wxbase_lib).$$f"; \
 		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
 	done;
-	@for f in dirs files links postinst prerm; do \
+	@for f in dirs docs files links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dev).$$f"; \
 		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in dirs docs links postinst prerm; do \
 		echo "generating control file $(package_wxbase_dbg).$$f"; \
 		cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
 	done;
-	@for f in dirs postinst; do \
+	@for f in dirs docs postinst; do \
 		echo "generating control file $(package_gtk_lib).$$f"; \
 		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
 	done;
-	@for f in dirs files links postinst prerm; do \
+	@for f in dirs docs files links postinst prerm; do \
 		echo "generating control file $(package_gtk_dev).$$f"; \
 		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
+	@for f in dirs docs links postinst prerm; do \
 		echo "generating control file $(package_gtk_dbg).$$f"; \
 		cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
 	done;
@@ -97,27 +94,23 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 		echo "generating control file $(package_gtk_py).$$f"; \
 		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
 	done;
-	@for f in dirs postinst; do \
+	@for f in dirs docs postinst; do \
 		echo "generating control file $(package_gtk_contrib).$$f"; \
 		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
 	done;
-	@for f in dirs files; do \
+	@for f in dirs docs files; do \
 		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
 		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
 	done;
-	@for f in dirs files; do \
+	@for f in dirs docs files; do \
 		echo "generating control file $(package_headers).$$f"; \
 		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
 	done;
-	@for f in dirs files; do \
-		echo "generating control file $(package_i18n).$$f"; \
-		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
-	done;
 	@for f in dirs docs doc-base; do \
 		echo "generating control file $(package_doc).$$f"; \
 		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
 	done;
-	@for f in examples; do \
+	@for f in docs examples; do \
 		echo "generating control file $(package_examples).$$f"; \
 		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
 	done;
@@ -257,12 +250,6 @@ build-examples-stamp:
 	done;
 	touch $@

-build-i18n-stamp: build-gtk-shared-stamp
-	dh_testdir
-	cd $(objdir_i18n) \
-		&& $(MAKE) allmo
-	touch $@
-
 clean: debian/control
 	dh_testdir
 	dh_testroot
@@ -279,7 +266,6 @@ clean: debian/control
 	rm -f debian/$(package_gtk_contrib).*
 	rm -f debian/$(package_gtk_contrib_dev).*
 	rm -f debian/$(package_headers).*
-	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*

@@ -389,14 +375,6 @@ install-headers: install-gtk-lib
 		zlib.3     \
 		png.5

-install-i18n: DH_OPTIONS=-p$(package_i18n)
-install-i18n: build-i18n-stamp install-gtk-lib
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
 	dh_testdir
@@ -419,7 +397,7 @@ binary-common:
 	dh_installchangelogs
 	dh_installexamples
 	dh_link
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
@@ -483,5 +461,5 @@ binary-doc: control-files-stamp install-doc
 	binary-wxbase-dbg binary-doc install install-wxbase-lib \
 	install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
 	install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
-	install-gtk-py install-headers install-i18n install-doc install-examples
+	install-gtk-py install-headers install-doc install-examples

--- a/debian/wxwin-doc.docs
+++ b/debian/wxwin-doc.docs
@@ -1,2 +1,2 @@
+docs/licendoc.txt
 docs/wxWindows-manual.html
-
--- a/debian/wxwin-i18n.dirs
+++ b/debian/wxwin-i18n.dirs
@@ -1,2 +0,0 @@
-/usr/share/locale
-
--- a/debian/wxwin-i18n.docs
+++ b/debian/wxwin-i18n.docs
@@ -1,2 +0,0 @@
-docs/licence.txt
-
--- a/debian/wxwin-i18n.files
+++ b/debian/wxwin-i18n.files
@@ -1,2 +0,0 @@
-/usr/share/locale/
-
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -269,11 +269,6 @@ MainFrame::MainFrame(wxFrame *frame, char *title,  const wxPoint& pos, const wxS
 //----------------------------------------------------------------------------------------
 MainFrame::~MainFrame(void)
 {
- // Close the help frame; this will cause the config data to get written.
- if (p_Help->GetFrame()) // returns NULL if no help frame active
-  p_Help->GetFrame()->Close(TRUE);
- delete p_Help;  // Memory Leak
- p_Help = NULL;
 // save the control's values to the config
 if (p_ProgramCfg == NULL)
   return;
@@ -297,6 +292,9 @@ MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
+ // Close the help frame; this will cause the config data to get written.
+ if (p_Help->GetFrame()) // returns NULL if no help frame active
+  p_Help->GetFrame()->Close(TRUE);
 Close(TRUE);
 }
 //----------------------------------------------------------------------------------------
--- a/demos/dbbrowse/dbbrowse.dsp
+++ b/demos/dbbrowse/dbbrowse.dsp
@@ -1,156 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dbbrowse" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=dbbrowse - Win32 Debug
-!MESSAGE Dies ist kein g<>ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f<>hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "dbbrowse.mak".
-!MESSAGE 
-!MESSAGE Sie k<>nnen beim Ausf<73>hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "dbbrowse.mak" CFG="dbbrowse - Win32 Debug"
-!MESSAGE 
-!MESSAGE F<>r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "dbbrowse - Win32 Release" (basierend auf  "Win32 (x86) Application")
-!MESSAGE "dbbrowse - Win32 Debug" (basierend auf  "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "dbbrowse - 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 "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "__WXMSW__" /D "__WIN95__" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /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 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /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 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wx.lib jpeg.lib png.lib tiff.lib xpm.lib zlib.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib"
-
-!ELSEIF  "$(CFG)" == "dbbrowse - 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 "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "__WXDEBUG__" /D WXDEBUG=1 /D "__WXMSW__" /D "__WIN95__" /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_MBCS" /D "__WINDOWS__" /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 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxd.lib jpegd.lib pngd.lib tiffd.lib xpmd.lib zlibd.lib advapi32.lib comctl32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib rpcrt4.lib shell32.lib user32.lib uuid.lib winspool.lib wsock32.lib  /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmt.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "dbbrowse - Win32 Release"
-# Name "dbbrowse - Win32 Debug"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\browsedb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dbbrowse.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dbgrid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dbtree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dlguser.cpp
-
-!IF  "$(CFG)" == "dbbrowse - Win32 Release"
-
-# ADD CPP /Yu
-
-!ELSEIF  "$(CFG)" == "dbbrowse - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\pgmctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\tabpgwin.cpp
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\std.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\dbbrowse.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/demos/dbbrowse/dbbrowse.dsw
+++ b/demos/dbbrowse/dbbrowse.dsw
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL<45>SCHT WERDEN!
-
-###############################################################################
-
-Project: "dbbrowse"=".\dbbrowse.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/demos/dbbrowse/dbgrid.cpp
+++ b/demos/dbbrowse/dbgrid.cpp
@@ -74,8 +74,6 @@ DBGrid::DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wx
 //----------------------------------------------------------------------------------------
 DBGrid::~DBGrid()
 {
- delete popupMenu1;
- delete popupMenu2;
 }
 //----------------------------------------------------------------------------------------
 int  DBGrid::OnTableView(wxString Table)
@@ -124,7 +122,7 @@ int  DBGrid::OnTableView(wxString Table)
      }
      if (z % 50 == 0)
      {
-       Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - Record %6d (from %d) has been read."),Table.c_str(),z,(db_Br+i_Which)->i_Records);
+       Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - Record %6d has been read."),Table.c_str(),z);
       pDoc->p_MainFrame->SetStatusText(Temp0, 0);
      }
     }  // for (z=0;z<(db_Br+i_Which)->i_Records;z++)
--- a/demos/dbbrowse/dbtree.cpp
+++ b/demos/dbbrowse/dbtree.cpp
@@ -100,10 +100,6 @@ DBTree::~DBTree()
 (pDoc->db_Br+i_Which)->cl_BrowserDB = NULL;
 delete ct_BrowserDB;
 delete p_imageListNormal;
- if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
-  delete popupMenu1;
- if (popupMenu1)       // If the DSN has no Tables, then no delete should be done !
-  delete popupMenu2;
 }
 //----------------------------------------------------------------------------------------
 #undef TREE_EVENT_HANDLER
@@ -206,7 +202,7 @@ int  DBTree::OnPopulate()
     z++;
     if (z % 10 == 0)
     {
-      Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d (from %d) has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z,ct_BrowserDB->numTables);
+      Temp0.Printf(_("-I-> DBTree::OnPopulate(%s) - Table %6d has been read."),(ct_BrowserDB->pTableInf+x)->tableName,z);
      pDoc->p_MainFrame->SetStatusText(Temp0, 0);
     }
    }    // if ((ct_BrowserDB->pTableInf+x)->tableType == "TABLE" or VIEW)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -63,8 +63,7 @@ MainDoc::~MainDoc()
 // ----------------------------------------------------------
 // -E-> The Tree Controls take to long to close : Why ??
 // ----------------------------------------------------------
- delete ft_Doc;
- ft_Doc  = NULL;
+ // wxMessageBox("-I-> end Doc");
 p_TabArea->Show(FALSE);    // Deactivate the Window
 p_PageArea->Show(FALSE);    // Deactivate the Window
 p_PgmCtrl = NULL;
@@ -109,8 +108,6 @@ bool MainDoc::OnInitView()
 wxBitmap *p_FolderClose = new wxBitmap("PgmCtrl"); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
 //---------------------------------------------------------------------------------------
 p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);
- delete p_FolderClose;      // Memory leak
- p_FolderClose = NULL;
 //---------------------------------------------------------------------------------------
 // now create "output" window
 //---------------------------------------------------------------------------------------
--- a/demos/dbbrowse/dummy.cpp
+++ b/demos/dbbrowse/dummy.cpp
@@ -1,36 +0,0 @@
-/*
- * File:  dummy.cc
- * Purpose:  See below
- * Author:  Julian Smart
- * Created:  1993
- * Updated:
- * Copyright:   (c) 1993, AIAI, University of Edinburgh
- */
-
-/* A dummy file to include wx.h. If precompiling wx.h, I
- * always start by compiling this and producing the PCH file.
- * Then subsequent source files use the PCH file.
- *
- * If precompiling wx.h for wxWindows and derived apps,
- * link dummy.obj with your program (the MSC 7 linker complains otherwise).
- *
- * This is the only convenient way I found to use precompiled headers
- * under MSC 7.
- *
- * This will produce a big PCH file.
- */
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/msw/msvcrt.h"
-
-// Foils optimizations in Visual C++ (see also app.cpp). Without it,
-// dummy.obj isn't linked and we get a linker error.
-#if defined(__VISUALC__) && defined(__WIN16__)
-    char wxDummyChar = 0;
-#endif
-
--- a/demos/dbbrowse/pgmctrl.cpp
+++ b/demos/dbbrowse/pgmctrl.cpp
@@ -88,7 +88,6 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
 PgmCtrl::~PgmCtrl()
 {
 delete p_imageListNormal;
- delete popupMenu1;  
 }
 //----------------------------------------------------------------------------------------
 #undef TREE_EVENT_HANDLER
@@ -243,7 +242,7 @@ void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
  }
  //--------------------------------------------------------------------------------------
 }
-} // void PgmCtrl::OnRightSelect(wxTreeEvent& WXUNUSED(event))
+}
 //----------------------------------------------------------------------------------------
 void PgmCtrl::OnMouseMove(wxMouseEvent &event)
 {
--- a/demos/forty/make_cw.mcp
+++ b/demos/forty/make_cw.mcp
--- a/distrib/msw/expdwild.bat
+++ b/distrib/msw/expdwild.bat
@@ -1,15 +0,0 @@
-@echo off
-rem Expands wildcards in response file (arg 1) into output file (arg 2)
-rem Note: requires ls.exe from GNU-WIN32 distribution, renamed to ls2.exe.
-rem Correction: this is too slow, so we're using the built in 'dir'.
-
-set newname=%temp\temp.tmp
-sed -e "s/\//\\/g" %1 > %newname
-
-set len=%@LINES[%newname]
-rem set len=%@DEC[%len]
-do i = 0 to %len by 1
-  set line=%@LINE[%newname,%i]
-  if NOT "%line" == "" dir /FB %line >> %2
-enddo
-
--- a/distrib/msw/filerepl.bat
+++ b/distrib/msw/filerepl.bat
@@ -1,27 +0,0 @@
-@echo off
-Rem Replace a string with another string in the given files.
-Rem The first argument is the string to be replaced.
-Rem The second argument is the replacement string.
-Rem The third argument is a file listing the files to be processed.
-
-set keyword=%1
-set repl=%2
-set files=%3
-echo s/%keyword/%repl/g > script.tmp
-
-call %wxwin\distrib\msw\expdwild.bat %3 list.tmp
-
-set len=%@LINES[%files]
-do i = 0 to %len by 1
-  set line=%@LINE[list.tmp,%i]
-  if "%line" == "**EOF**" enddo
-rem  echo Cmd: grep %keyword %line
-  grep %keyword %line > size.tmp
-  if "%@FILESIZE[size.tmp]" == "0" enddo
-  sed -f script.tmp %line > file.tmp
-  move file.tmp %line
-enddo
-erase script.tmp
-erase list.tmp
-erase size.tmp
-:end
--- a/distrib/msw/makeall.bat
+++ b/distrib/msw/makeall.bat
@@ -1,618 +0,0 @@
-Rem @echo off
-Rem This script compiles wxWindows and some samples/demos with
-Rem a range of compilers.
-Rem Note that it currently uses batch scripts local to Julian Smart's machine,
-Rem to set up the environment correctly.
-Rem This is a 4DOS batch file, though 4DOS dependencies have been kept to
-Rem a minimum.
-Rem Julian Smart, August 12th, 2000
-Rem TODO: making a Unicode distribution by modifying setup.h programmatically.
-Rem TODO: check differing setup.h options, again by programmatic modification
-
-set WXDIR=%WXWIN%
-set FATWXWIN=%WXDIR%
-set FULLWXWIN=%WXDIR%
-if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FATWXWIN=%@PATH[%WXDIR%]wxwind~
-if not %@INDEX["%WXDIR%","wxWindows"] == "-1" set FULLWXWIN=%@PATH[%WXDIR%]wxWindows
-echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
-set BUILDDEST=o:\wxWinBuild
-Rem Only carry on if we haven't specified a single target
-set CARRYON=0
-
-rem goto end
-
-if "%1" == "vc6" goto dovc6
-if "%1" == "bc55" goto dobc55
-if "%1" == "bc50" goto dobc50
-if "%1" == "ming2992" goto doming2952
-if "%1" == "cygwin11" goto docygwin11
-if "%1" == "vc1" goto dovc1
-if "%1" == "bc16" goto dobc16
-
-set CARRYON=1
-
-if not direxist %BUILDDEST% mkdir /S %BUILDDEST%
-
-
-:dovc6
-
-cd %WXDIR%\samples
-erase /S *.exe
-cd %WXDIR%\demos
-erase /S *.exe
-cd %WXDIR%\contrib\samples
-erase /S *.exe
-cd %WXDIR%\utils\dialoged\src
-erase /S *.exe
-cd %WXDIR%\utils\tex2rtf\src
-erase /S *.exe
-
-echo Starting wxWindows build at %_TIME, %_DATE
-
-Rem First, VC++ 6.
-
-echo === VC++ 6 ===
-echo ==============
-
-Rem Set up the environment
-call msvc6
-
-echo *** VC++ Debug ***
-Rem VC++ Debug
-cd %WXDIR%\src\msw
-nmake -f makefile.vc cleanall
-nmake -f makefile.vc
-if not direxist %BUILDDEST%\VC6Debug mkdir /S %BUILDDEST%\VC6Debug
-erase /F /Y %BUILDDEST%\VC6Debug
-cd %WXDIR%\samples
-nmake -f makefile.vc clean
-
-Rem Make one sample, just to make sure Debug mode is OK
-cd %WXDIR%\samples\controls
-nmake -f makefile.vc
-copy controls.exe %BUILDDEST%\VC6Debug
-nmake -f makefile.vc clean
-
-cd %WXDIR%\src\msw
-nmake -f makefile.vc cleanall
-
-echo *** VC++ Release ***
-
-nmake -f makefile.vc cleanall FINAL=1
-nmake -f makefile.vc FINAL=1
-
-if not direxist %BUILDDEST%\VC6Release mkdir /S %BUILDDEST%\VC6Release
-erase /F /Y %BUILDDEST%\VC6Release
-
-cd %WXDIR%\samples
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-Rem Copy all executables to VC6Release
-Rem Euch, this is the only way I can think of right now
-Rem to copy them to the same directory. Daft but...
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-
-cd %WXDIR%\demos
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-Rem Copy all executables to VC6Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-
-Rem Compile OGL
-cd %WXDIR%\contrib\src\ogl
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-cd %WXDIR%\contrib\samples\ogl\ogledit
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-copy *.exe %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-cd %WXDIR%\contrib\samples\ogl\studio
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-copy *.exe %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-cd %WXDIR%\contrib\src\ogl
-nmake -f makefile.vc clean FINAL=1
-
-Rem Compile Dialog Editor
-cd %WXDIR%\utils\dialoged\src
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-copy *.exe %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-
-Rem Compile Tex2RTF
-cd %WXDIR%\utils\tex2rtf\src
-nmake -f makefile.vc clean FINAL=1
-nmake -f makefile.vc FINAL=1
-copy *.exe %BUILDDEST%\VC6Release
-nmake -f makefile.vc clean FINAL=1
-
-Rem Clean up
-
-cd %WXDIR%\src\msw
-nmake -f makefile.vc cleanall FINAL=1
-
-echo *** VC++ Debug DLL ***
-
-nmake -f makefile.vc cleanall WXMAKINGDLL=1
-nmake -f makefile.vc dll pch
-
-if not direxist %BUILDDEST%\VC6DebugDLL mkdir /S %BUILDDEST%\VC6DebugDLL
-erase /F /Y %BUILDDEST%\VC6DebugDLL
-
-copy %WXDIR%\lib\*d.dll %BUILDDEST%\VC6DebugDLL
-
-Rem Make one sample, for a sanity check
-
-cd %WXDIR%\samples\controls
-nmake -f makefile.vc WXUSINGDLL=1
-copy controls.exe %BUILDDEST%\VC6DebugDLL
-nmake -f makefile.vc clean
-
-cd %WXDIR%\src\msw
-nmake -f makefile.vc cleanall WXMAKINGDLL=1
-
-echo *** VC++ Release DLL ***
-
-nmake -f makefile.vc cleanall FINAL=1 WXMAKINGDLL=1
-nmake -f makefile.vc dll pch FINAL=1
-
-if not direxist %BUILDDEST%\VC6ReleaseDLL mkdir /S %BUILDDEST%\VC6ReleaseDLL
-erase /F /Y %BUILDDEST%\VC6ReleaseDLL
-
-copy %WXDIR%\lib\*.dll %BUILDDEST%\VC6ReleaseDLL
-
-Rem Make one sample, for a sanity check
-
-cd %WXDIR%\samples\controls
-nmake -f makefile.vc WXUSINGDLL=1 FINAL=1
-copy controls.exe %BUILDDEST%\VC6ReleaseDLL
-nmake -f makefile.vc clean FINAL=1
-
-cd %WXDIR%\src\msw
-nmake -f makefile.vc cleanall WXMAKINGDLL=1 FINAL=1
-
-if "%CARRYON" == "0" goto end
-
-:dobc55
-
-echo === BC++ 5.5 ===
-echo ================
-
-call bcb55
-
-echo *** WIN32 BC++ Debug ***
-
-Rem WIN32 BC++ Debug
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall
-make -f makefile.b32
-if not direxist %BUILDDEST%\BC55Debug mkdir /S %BUILDDEST%\BC55Debug
-erase /F /Y %BUILDDEST%\BC55Debug
-cd %WXDIR%\samples
-make -f makefile.b32 clean
-
-Rem Make one sample, just to make sure Debug mode is OK
-cd %WXDIR%\samples\controls
-make -f makefile.b32
-copy controls.exe %BUILDDEST%\BC55Debug
-make -f makefile.b32 clean
-
-Rem Compile OGL
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.b32 clean
-make -f makefile.b32
-cd %WXDIR%\contrib\samples\ogl\ogledit
-make -f makefile.b32 clean
-make -f makefile.b32
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean
-cd %WXDIR%\contrib\samples\ogl\studio
-make -f makefile.b32 clean
-make -f makefile.b32
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.b32 clean
-
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall
-
-goto bcdebugdll
-
-echo *** WIN32 BC++ Release ***
-
-make -f makefile.b32 cleanall FINAL=1
-make -f makefile.b32 FINAL=1
-
-if not direxist %BUILDDEST%\BC55Release mkdir /S %BUILDDEST%\BC55Release
-erase /F /Y %BUILDDEST%\BC55Release
-
-cd %WXDIR%\samples
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-Rem Copy all executables to BC55Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-
-cd %WXDIR%\demos
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-Rem Copy all executables to BC55Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-
-Rem Compile OGL
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-cd %WXDIR%\contrib\samples\ogl\ogledit
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-cd %WXDIR%\contrib\samples\ogl\studio
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.b32 clean FINAL=1
-
-Rem Compile Dialog Editor
-cd %WXDIR%\utils\dialoged\src
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-
-Rem Compile Tex2RTF
-cd %WXDIR%\utils\tex2rtf\src
-make -f makefile.b32 clean FINAL=1
-make -f makefile.b32 FINAL=1
-copy *.exe %BUILDDEST%\BC55Release
-make -f makefile.b32 clean FINAL=1
-
-Rem Clean up
-
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall FINAL=1
-
-:bcdebugdll
-
-echo *** WIN32 BC++ Debug DLL ***
-
-make -f makefile.b32 cleanall
-make -f makefile.b32 dll
-
-if not direxist %BUILDDEST%\BC55DebugDLL mkdir /S %BUILDDEST%\BC55DebugDLL
-erase /F /Y %BUILDDEST%\BC55DebugDLL
-
-copy %WXDIR%\lib\*.dll %BUILDDEST%\BC55DebugDLL
-
-Rem Make one sample, for a sanity check
-
-cd %WXDIR%\samples\controls
-make -f makefile.b32 WXUSINGDLL=1
-copy controls.exe %BUILDDEST%\BC55DebugDLL
-make -f makefile.b32 clean
-
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall
-
-if "%CARRYON" == "0" goto end
-
-:dobc50
-
-
-echo === BC++ 5.0 ===
-echo ================
-
-call borland
-
-echo *** WIN32 BC++ Debug ***
-
-Rem WIN32 BC++ Debug
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall
-make -f makefile.b32
-if not direxist %BUILDDEST%\BC50Debug mkdir /S %BUILDDEST%\BC50Debug
-erase /F /Y %BUILDDEST%\BC50Debug
-cd %WXDIR%\samples
-make -f makefile.b32 clean
-
-Rem Make one sample, just to make sure Debug mode is OK
-cd %WXDIR%\samples\controls
-make -f makefile.b32
-copy controls.exe %BUILDDEST%\BC50Debug
-make -f makefile.b32 clean
-
-cd %WXDIR%\src\msw
-make -f makefile.b32 cleanall
-
-if "%CARRYON" == "0" goto end
-
-:docygwin11
-
-
-echo === Cygwin 1.1 ===
-echo ==================
-
-call cygwin11
-
-echo *** Cygwin Debug ***
-
-Rem Cygwin Release
-cd %WXDIR%\src\msw
-make -f makefile.g95 cleanall
-make -f makefile.g95 FINAL=1
-if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
-erase /F /Y %BUILDDEST%\Cygwin11Release
-cd %WXDIR%\samples
-make -f makefile.g95 clean FINAL=1
-
-if not direxist %BUILDDEST%\Cygwin11Release mkdir /S %BUILDDEST%\Cygwin11Release
-erase /F /Y %BUILDDEST%\Cygwin11Release
-
-cd %WXDIR%\samples
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-Rem Copy all executables to Cygwin11Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-
-cd %WXDIR%\demos
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-Rem Copy all executables to Cygwin11Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile OGL
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-cd %WXDIR%\contrib\samples\ogl\ogledit
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-cd %WXDIR%\contrib\samples\ogl\studio
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile Dialog Editor
-cd %WXDIR%\utils\dialoged\src
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile Tex2RTF
-cd %WXDIR%\utils\tex2rtf\src
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Cygwin11Release
-make -f makefile.g95 clean FINAL=1
-
-echo Stripping executables...
-strip %BUILDDEST%\Cygwin11Release\*.exe
-
-Rem Cleanup
-
-cd %WXDIR%\src\msw
-make -f makefile.g95 cleanall
-
-if "%CARRYON" == "0" goto end
-
-:doming2952
-
-echo === Mingw32 2.95.2 ===
-echo ======================
-
-call ming2952
-
-echo *** Cygwin Debug ***
-
-Rem Cygwin Release
-cd %WXDIR%\src\msw
-make -f makefile.g95 cleanall
-make -f makefile.g95 FINAL=1
-if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
-erase /F /Y %BUILDDEST%\Ming2952Release
-cd %WXDIR%\samples
-make -f makefile.g95 clean FINAL=1
-
-if not direxist %BUILDDEST%\Ming2952Release mkdir /S %BUILDDEST%\Ming2952Release
-erase /F /Y %BUILDDEST%\Ming2952Release
-
-cd %WXDIR%\samples
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-Rem Copy all executables to Ming2952Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-
-cd %WXDIR%\demos
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-Rem Copy all executables to Ming2952Release
-erase %TEMP%\temp.zip
-zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile OGL
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-cd %WXDIR%\contrib\samples\ogl\ogledit
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-cd %WXDIR%\contrib\samples\ogl\studio
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-cd %WXDIR%\contrib\src\ogl
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile Dialog Editor
-cd %WXDIR%\utils\dialoged\src
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-
-Rem Compile Tex2RTF
-cd %WXDIR%\utils\tex2rtf\src
-make -f makefile.g95 clean FINAL=1
-make -f makefile.g95 FINAL=1
-copy *.exe %BUILDDEST%\Ming2952Release
-make -f makefile.g95 clean FINAL=1
-
-echo Stripping executables...
-strip %BUILDDEST%\Ming2952Release\*.exe
-
-Rem Cleanup
-
-cd %WXDIR%\src\msw
-make -f makefile.g95 cleanall
-
-if "%CARRYON" == "0" goto end
-
-:dovc1
-
-echo === 16-bit VC++ ===
-echo ===================
-
-Rem Set up the environment
-call msvc1
-
-Rem Needs full wxWindows path for making libraries
-set WXWIN=%FULLWXWIN%
-
-echo *** VC++ Debug ***
-Rem VC++ Debug
-cd %WXDIR%\src\msw
-nmake -f makefile.dos cleanall
-nmake -f makefile.dos
-if not direxist %BUILDDEST%\VC1Debug mkdir /S %BUILDDEST%\VC1Debug
-erase /F /Y %BUILDDEST%\VC1Debug
-
-Rem Make one sample, just to make sure Debug mode is OK
-cd %WXDIR%\samples\minimal
-nmake -f makefile.dos clean
-Rem Needs FAT wxWindows path for making executables
-set WXWIN=%FATWXWIN%
-nmake -f makefile.dos
-
-copy minimal.exe /S %BUILDDEST%\VC1Debug
-nmake -f makefile.dos clean
-
-cd %WXDIR%\src\msw
-nmake -f makefile.dos cleanall
-
-Rem Needs full wxWindows path for making libraries
-set WXWIN=%FULLWXWIN%
-
-echo *** VC++ Release ***
-
-nmake -f makefile.dos cleanall FINAL=1
-nmake -f makefile.dos FINAL=1
-
-if not direxist %BUILDDEST%\VC1Release mkdir /S %BUILDDEST%\VC1Release
-erase /F /Y %BUILDDEST%\VC1Release
-
-Rem Make one sample, just to make sure Release mode is OK
-cd %WXDIR%\samples\minimal
-nmake -f makefile.dos clean
-nmake -f makefile.dos FINAL=1
-Rem Needs FAT wxWindows path for making executables
-set WXWIN=%FATWXWIN%
-nmake -f makefile.dos FINAL=1
-copy minimal.exe /S %BUILDDEST%\VC1Release
-nmake -f makefile.dos clean
-set WXWIN=%tmpwxwin%
-
-Rem Clean up
-
-cd %WXDIR%\src\msw
-nmake -f makefile.dos cleanall FINAL=1
-
-if "%CARRYON" == "0" goto end
-
-:dobc16
-
-echo === 16-bit BC++ ===
-echo ===================
-
-Rem Set up the environment
-call borland
-
-echo *** 16-bit BC++ Debug ***
-Rem 16-bit BC++ Debug
-cd %WXDIR%\src\msw
-nmake -f makefile.bcc cleanall
-nmake -f makefile.bcc
-if not direxist %BUILDDEST%\BC16Debug mkdir /S %BUILDDEST%\BC16Debug
-erase /F /Y %BUILDDEST%\BC16Debug
-
-Rem Make one sample, just to make sure Debug mode is OK
-cd %WXDIR%\samples\minimal
-nmake -f makefile.bcc clean
-nmake -f makefile.bcc
-copy minimal.exe /S %BUILDDEST%\BC16Debug
-nmake -f makefile.bcc clean
-
-cd %WXDIR%\src\msw
-nmake -f makefile.bcc cleanall
-
-echo *** 16-bit BC++ Release ***
-
-nmake -f makefile.bcc cleanall FINAL=1
-nmake -f makefile.bcc FINAL=1
-
-if not direxist %BUILDDEST%\BC16Release mkdir /S %BUILDDEST%\BC16Release
-erase /F /Y %BUILDDEST%\BC16Release
-
-Rem Make one sample, just to make sure Release mode is OK
-cd %WXDIR%\samples\minimal
-nmake -f makefile.bcc clean
-nmake -f makefile.bcc FINAL=1
-copy minimal.exe /S %BUILDDEST%\BC16Release
-nmake -f makefile.bcc clean
-
-Rem Clean up
-
-cd %WXDIR%\src\msw
-nmake -f makefile.bcc cleanall FINAL=1
-
-:end
-
-echo Finished wxWindows build at %_TIME, %_DATE
-
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -8,7 +8,6 @@ lib/watcom/*.bat
 lib/bcc16/*.lib

 docs/licence.txt
-docs/base/*.txt
 docs/msw/*.txt
 docs/wine/*.txt
 docs/wine/COPYING.LIB
@@ -19,11 +18,6 @@ distrib/msw/*.bat
 tools/gettext/*.exe
 tools/gettext/*.sed

-wxBase.dsp
-wxBase.dsw
-wxBaseDll.dsp
-wxBaseDll.dsw
-
 src/makeb32.env
 src/makeprog.b32
 src/makelib.b32
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -94,7 +94,7 @@ scrolwin.cpp	G
 splitter.cpp	G
 statline.cpp	G	U,R,P
 statusbr.cpp	G
-tabg.cpp	G	16,P
+tabg.cpp	G	P
 numdlgg.cpp	G
 tbarsmpl.cpp	G
 textdlgg.cpp	G
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -79,6 +79,9 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif

+# Please set these according to the settings in setup.h, so we can include
+# the appropriate libraries in wx.lib
+
 # This one overrides the others, to be consistent with the settings in setup.h
 MINIMAL_WXWINDOWS_SETUP=0

@@ -86,9 +89,6 @@ PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=

-# Set to 0 if not using GLCanvas (only affects DLL build)
-USE_GLCANVAS=1
-
 # These are absolute paths, so that the compiler
 # generates correct __FILE__ symbols for debugging.
 # Otherwise you don't be able to double-click on a memory
@@ -235,7 +235,6 @@ $(WXDIR)\lib\$(WXLIBNAME).lib: $(DUMMYOBJ) $(OBJECTS)

 !if "$(USE_GLCANVAS)" == "1"
 GL_LIBS=opengl32.lib glu32.lib
-GL_LIBS_DELAY=/delayload:opengl32.dll
 !endif

 # Update the dynamic link library
@@ -247,12 +246,11 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
 	delayimp.lib
 	/delayload:ws2_32.dll /delayload:advapi32.dll /delayload:user32.dll /delayload:gdi32.dll
 	/delayload:comdlg32.dll /delayload:shell32.dll /delayload:comctl32.dll /delayload:ole32.dll
-	/delayload:oleaut32.dll /delayload:rpcrt4.dll $(GL_LIBS_DELAY)
+	/delayload:oleaut32.dll /delayload:rpcrt4.dll /delayload:winmm.dll /delayload:opengl32.dll
 <<

 !endif

-# /delayload:winmm.dll # Removed because it can cause a crash for some people

 ########################################################
 # Windows-specific objects
--- a/distrib/msw/tmake/vc6.t
+++ b/distrib/msw/tmake/vc6.t
@@ -37,41 +37,28 @@
        next if $wxHTML{$file} =~ /\b16\b/;
        $project{"WXHTMLSRCS"} .= $file . " "
    }
-
-    $project{"WX_CFLAGS"} = '/D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__"';
-    if ( Config("unicode") ) {
-	$project{"OUTDIR_SUFFIX"} = "Unicode";
-	$project{"WX_CFLAGS"} .= " /D _UNICODE /D UNICODE";
-	$project{"PROJECTNAME"} = "wxWindowsU";
-    }
-    else {
-	$project{"OUTDIR_SUFFIX"} = "";
-	$project{"PROJECTNAME"} = "wxWindows";
-    }
-
-    $project{"MAKEFILE"} = $project{"PROJECTNAME"} . ".mak";
 #$}
-# Microsoft Developer Studio Project File - #$ Substitute('Name="$$PROJECTNAME" - Package Owner=<4>');
+# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

-CFG=#$ Substitute('$$PROJECTNAME - Win32 Debug');
+CFG=wxWindows - 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 "#$ ExpandGlue('MAKEFILE','','','".');
+!MESSAGE NMAKE /f "wxWindows.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 #$ Substitute('"$$MAKEFILE" CFG="$$PROJECTNAME - Win32 Debug"');
+!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Release" (based on "Win32 (x86) Static Library")');
-!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Debug" (based on "Win32 (x86) Static Library")');
+!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 

 # Begin Project
@@ -81,20 +68,20 @@ CFG=#$ Substitute('$$PROJECTNAME - Win32 Debug');
 CPP=cl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
+!IF  "$(CFG)" == "wxWindows - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
-# PROP BASE Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
+# 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 #$ Substitute('"Release$$OUTDIR_SUFFIX"');
-# PROP Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -104,20 +91,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo

-!ELSEIF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP BASE Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# 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 #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
+# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c
+# ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /D "_MT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -131,8 +118,8 @@ LIB32=link.exe -lib

 # Begin Target

-# Name #$Substitute('"$$PROJECTNAME - Win32 Release"');
-# Name #$Substitute('"$$PROJECTNAME - Win32 Debug"');
+# Name "wxWindows - Win32 Release"
+# Name "wxWindows - Win32 Debug"

 # PROP Default_Filter ""
 # Begin Source File
@@ -152,8 +139,17 @@ SOURCE=.\src\msw\dummy.cpp

 SOURCE=.\src\common\y_tab.c

+!IF  "$(CFG)" == "wxWindows - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
 # ADD CPP /W1
 # SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
 # End Source File
 # End Target
 # End Project
--- a/distrib/msw/tmake/vc6base.t
+++ b/distrib/msw/tmake/vc6base.t
@@ -73,8 +73,8 @@ RSC=rc.exe
 # PROP Output_Dir "BaseRelease"
 # PROP Intermediate_Dir "BaseRelease"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -97,7 +97,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "BaseDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -125,5 +125,21 @@ SOURCE=.\src\msw\dummy.cpp
 #$ 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\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");

+# Begin Source File
+
+SOURCE=.\src\common\y_tab.c
+
+!IF  "$(CFG)" == "wxBase - Win32 Release"
+
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "wxBase - Win32 Debug"
+
+# ADD CPP /W1
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ENDIF 
+
+# End Source File
 # End Target
 # End Project
--- a/distrib/msw/tmake/vc6bdll.t
+++ b/distrib/msw/tmake/vc6bdll.t
@@ -71,12 +71,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "BaseReleaseDll"
-# PROP Intermediate_Dir "BaseReleaseDll"
+# PROP Output_Dir "BaseDllRelease"
+# PROP Intermediate_Dir "BaseDllRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W4 /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /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"
@@ -85,8 +85,8 @@ 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 /nologo /dll /machine:I386 /out:"BaseReleaseDll/wxbase221.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseReleaseDll/wxbase221.dll"
+# 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 /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386

 !ELSEIF  "$(CFG)" == "wxBaseDll - Win32 Debug"

@@ -97,12 +97,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "BaseDebugDll"
-# PROP Intermediate_Dir "BaseDebugDll"
+# PROP Output_Dir "BaseDllDebug"
+# PROP Intermediate_Dir "BaseDllDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /Yu"wx/wxprec.h" /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXBASEDLL_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /D "WXMAKINGDLL" /D "__WXDEBUG__" /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"
@@ -111,8 +111,8 @@ 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 /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDebugDll/wxbase221d.dll"
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDebugDll/wxbase221d.dll"
+# 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept

 !ENDIF 

@@ -122,10 +122,6 @@ LINK32=link.exe
 # Name "wxBaseDll - Win32 Debug"
 # Begin Source File

-SOURCE=.\src\common\base.rc
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\msw\dummydll.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
--- a/distrib/msw/tmake/vc6dll.t
+++ b/distrib/msw/tmake/vc6dll.t
@@ -2,13 +2,8 @@
 #! File:    vc6dll.t
 #! Purpose: tmake template file from which wxWinDll.dsp is generated by running
 #!          tmake -t vc6dll wxwin.pro -o wxWinDll.dsp
-#!
-#!          you may also generate the project file for the Unicode DLL build:
-#!          tmake -t vc6dll wxwin.pro -o wxWinDll.dsp CONFIG+=unicode
-#!
 #! Author:  Vadim Zeitlin
 #! Created: 13.10.99
-#! Modified:11.08.00 by VZ to allow generating wxWinDllU.dsp from ti too
 #! Version: $Id$
 #!#############################################################################
 #${
@@ -42,44 +37,28 @@
        next if $wxHTML{$file} =~ /\b16\b/;
        $project{"WXHTMLSRCS"} .= $file . " "
    }
-
-    $project{"WX_CFLAGS"} = "/D __WXMSW__ /D __WIN95__ /D __WINDOWS__ /D __WIN32__ /D WXMAKINGDLL";
-    if ( Config("unicode") ) {
-	$project{"OUTDIR_SUFFIX"} = "UnicodeDll";
-	$project{"DLLNAME"} = $project{"OUTDIR_SUFFIX"} . "/wxmsw221u";
-	$project{"WX_CFLAGS"} .= " /D _UNICODE /D UNICODE ";
-	$project{"PROJECTNAME"} = "wxWinDllU";
-    }
-    else {
-	$project{"OUTDIR_SUFFIX"} = "Dll";
-	$project{"DLLNAME"} = $project{"OUTDIR_SUFFIX"} . "/wxmsw221";
-	$project{"PROJECTNAME"} = "wxWinDll";
-    }
-
-    $project{"MAKEFILE"} = $project{"PROJECTNAME"} . ".mak";
-    $project{"DEBUG_DLLNAME"} = $project{"DLLNAME"} . "d";
 #$}
-# Microsoft Developer Studio Project File - #$ Substitute('Name="$$PROJECTNAME" - Package Owner=<4>');
+# 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=#$ Substitute('$$PROJECTNAME - Win32 Debug');
+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 "#$ ExpandGlue('MAKEFILE','','','".');
+!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 #$ Substitute('"$$MAKEFILE" CFG="$$PROJECTNAME - Win32 Debug"');
+!MESSAGE NMAKE /f "wxWinDll.mak" CFG="wxWinDll - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")');
-!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")');
+!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
@@ -90,64 +69,64 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
+!IF  "$(CFG)" == "wxWinDll - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
-# PROP BASE Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
+# 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 #$ Substitute('"Release$$OUTDIR_SUFFIX"');
-# PROP Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
+# PROP Output_Dir "ReleaseDLL"
+# PROP Intermediate_Dir "ReleaseDLL"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
+# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /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 /i "$(wx)\include" /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\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 #$ Substitute('/out:"Release$$DLLNAME.dll"');
-# 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\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 #$ Substitute('/out:"Release$$DLLNAME.dll"');
+# 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\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\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\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386

-!ELSEIF  "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
+!ELSEIF  "$(CFG)" == "wxWinDll - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP BASE Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# 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 #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
-# PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
+# PROP Output_Dir "DebugDLL"
+# PROP Intermediate_Dir "DebugDLL"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /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 /MDd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /GZ /c');
+# ADD BASE CPP /nologo /MDd /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 /MDd /W4 /Gm /ZI /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /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 /i "$(wx)\include" /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 src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept #$ Substitute('/out:"Debug$$DEBUG_DLLNAME.dll"');
-# 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\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept #$ Substitute('/out:"Debug$$DEBUG_DLLNAME.dll"');
+# 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\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\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\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

 !ENDIF 

 # Begin Target

-# Name #$Substitute('"$$PROJECTNAME - Win32 Release"');
-# Name #$Substitute('"$$PROJECTNAME - Win32 Debug"');
+# Name "wxWinDll - Win32 Release"
+# Name "wxWinDll - Win32 Debug"

 # PROP Default_Filter ""
 # Begin Source File
@@ -165,16 +144,19 @@ SOURCE=.\src\msw\dummydll.cpp

 # Begin Source File

-SOURCE=.\src\msw\version.rc
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /d "_UNICODE"
-# End Source File
-# 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/vcapp.t
+++ b/distrib/msw/tmake/vcapp.t
@@ -30,43 +30,20 @@
    if ( Config("wx") ) {
 	#! VC 6.0 supports env vars in include path
 	#! $WXDIR = $ENV{'WX'};
-	if ( $ENV{'wx'} ) { $WXDIR = "\$(wx)"; }
-	else { $WXDIR = "\$(WXWIN)"; }
+	$WXDIR = "\$(WX)";
 	$TMAKE_INCDIR_WX = $WXDIR . "\\include";
 	AddIncludePath($TMAKE_INCDIR_WX);
    }

-    if ( Config("unicode") ) {
-	$UNICODE="Unicode";
-	$UNICODE_SUFFIX="u";
-	$UNICODE_FLAGS="/D _UNICODE /D UNICODE ";
-
-	$project{"TARGET"} .= "Unicode";
-	$project{"MAKEFILE"} .= "Unicode";
-    }
-    else {
-	$UNICODE="";
-	$UNICODE_SUFFIX="";
-	$UNICODE_FLAGS=" ";
-    }
-
    if ( Config("dll") ) {
 	$DLL="Dll";
-	$DEBUG_SUFFIX="d";
-	$DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "221";
+	$DLL_OR_LIB="wxWinDll";
 	$DLL_FLAGS="/D WXUSINGDLL ";
-	$EXTRA_LIBS="";
-
-	$project{"TARGET"} .= "Dll";
-	$project{"MAKEFILE"} .= "Dll";
    }
    else {
 	$DLL="";
-	$DEBUG_SUFFIX="";
-	$DLL_OR_LIB=Config("wxbase") ? "wxBase" : "wxWindows";
+	$DLL_OR_LIB="wxWindows";
 	$DLL_FLAGS=" ";
-	#! actually this depends on the contents of setup.h
-	$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
    }

    #! let's be smarter: first of all, if no extension is given, add .lib
@@ -87,17 +64,13 @@
 	if ( Config("wx") ) {
 	    $vc_base_libs .= "comctl32.lib rpcrt4.lib wsock32.lib ";

-	    $vc_link_release = "$WXDIR\\Release$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
-	    $vc_link_debug = "$WXDIR\\Debug$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
-	    foreach ( split(/ /, $EXTRA_LIBS) ) {
-		$vc_link_release .= "$WXDIR\\src\\$_\\Release\\$_.lib ";
-		$vc_link_debug .= "$WXDIR\\src\\$_\\Debug\\$_.lib ";
-	    }
+	    $vc_link_release = "$WXDIR\\Release$DLL\\$DLL_OR_LIB.lib $WXDIR\\src\\xpm\\Release\\xpm.lib ";
+	    $vc_link_debug = "$WXDIR\\Debug$DLL\\$DLL_OR_LIB.lib $WXDIR\\src\\xpm\\Debug\\xpm.lib "; 
 	}
 	$vc_link_release .= '/nologo /subsystem:windows /machine:I386';
 	$vc_link_debug   .= '/nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept';

-	$vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $UNICODE_FLAGS . $DLL_FLAGS;
+	$vc_cpp_def_common = '/D "WIN32" /D "_WINDOWS" ' . $DLL_FLAGS;
 	$vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common;
 	$vc_cpp_def_debug   = '/D "_DEBUG" ' . $vc_cpp_def_common;
    } else {
@@ -106,22 +79,16 @@
 	$vc_base_libs = 'kernel32.lib user32.lib advapi32.lib ';
 	if ( Config("wx") ) {
 	    $vc_base_libs .= 'wsock32.lib ';
-	    $vc_link_release = "$WXDIR\\BaseRelease$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX.lib ";
-	    $vc_link_debug = "$WXDIR\\BaseDebug$UNICODE$DLL\\$DLL_OR_LIB$UNICODE_SUFFIX$DEBUG_SUFFIX.lib ";
+	    $vc_link_release = "$WXDIR\\Base${DLL}Release\\wxBase$DLL.lib ";
+	    $vc_link_debug = "$WXDIR\\Base${DLL}Debug\\wxBase$DLL.lib "; 
 	}
 	$vc_link_release .= '/nologo /subsystem:console /machine:I386';
 	$vc_link_debug   .= '/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept';

-	$vc_cpp_def_common = '/D "WIN32" /D "_CONSOLE" ' . $UNICODE_FLAGS . $DLL_FLAGS;
+	$vc_cpp_def_common = '/D "WIN32" /D "_CONSOLE" ' . $DLL_FLAGS;
 	$vc_cpp_def_release = '/D "NDEBUG" ' . $vc_cpp_def_common; 
 	$vc_cpp_def_debug   = '/D "_DEBUG" ' . $vc_cpp_def_common;
    }
-
-    foreach ( split(/ /, Project('LIBPATH')) ) {
-	$vc_link_release .= " /libpath:$_\\Release";
-	$vc_link_debug .= " /libpath:$_\\Debug";
-    }
-
    #! define wxWin debug flags in debug build
    if ( Config("wx") ) {
 	$vc_cpp_def_debug .= '/MDd /D "__WXDEBUG__" /D "WXDEBUG=1" ';
@@ -140,7 +107,7 @@
    }
    #! else: disable C++ exception handling for wxWindows

-    $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O1 ';
+    $vc_cpp_opt_release = $vc_cpp_opt_common1 . '/O2 ';
    $vc_cpp_opt_debug   = $vc_cpp_opt_common1 . '/Zi /Od ';
    $vc_cpp_opt_common  = '/YX /FD /c';
    $project{"VC_BASE_CPP_RELEASE"} = $vc_cpp_opt_release . $vc_cpp_def_release . $vc_cpp_opt_common;
@@ -238,13 +205,13 @@ RSC=rc.exe

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
-# PROP BASE Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
+# 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 "Release#$ $text = "$UNICODE$DLL" . '"'
-# PROP Intermediate_Dir "Release#$ $text = "$UNICODE$DLL" . '"'
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
@@ -266,13 +233,13 @@ LINK32=link.exe

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
-# PROP BASE Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
+# 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 "Debug#$ $text = "$UNICODE$DLL" . '"'
-# PROP Intermediate_Dir "Debug#$ $text = "$UNICODE$DLL" . '"'
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -1,8 +1,3 @@
-wxBase.dsp
-wxBase.dsw
-wxBaseDll.dsp
-wxBaseDll.dsw
-
 src/wxvc.dsp
 src/wxvc.dsw
 src/wxvc_dll.dsp
--- a/distrib/msw/vcupdate.bat
+++ b/distrib/msw/vcupdate.bat
@@ -1,9 +0,0 @@
-@echo off
-Rem Replace the DLL version number in the VC++ project files
-
-input Enter the old version name (e.g. wx22_0): %%oldName
-input Enter the new version name (e.g. wx22_1): %%newName
-
-call %wxwin\distrib\msw\filerepl.bat %oldName %newName %wxwin\distrib\msw\vc.rsp
-echo Done.
-
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
  Version=5.0
-  Title=wxWindows 2.2.1 Installation
+  Title=wxWindows 2.2.0 Installation
  Flags=00000100
  Split=1420
  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
  Variable=APPTITLE
-  Value=wxWindows 2.2.1
+  Value=wxWindows 2.2.0
 end
 item: Set Variable
  Variable=GROUP
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -5,7 +5,7 @@ set dest=%src\deliver
 set wise=0

 Rem Set this to the required version
-set version=2.2.1
+set version=2.2.0

 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -179,7 +179,6 @@ copy %src\bin\dialoged.exe bin
 copy %src\bin\tex2rtf.exe bin
 copy %src\bin\dbgview.* bin
 copy %src\bin\life.exe bin
-copy %src\demos\life\breeder.lif bin
 copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
 copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin

--- a/docs/base/install.txt
+++ b/docs/base/install.txt
@@ -1,61 +0,0 @@
-
-Installing wxBase 2.2
---------------------
-
-This is wxBase 2.2 for Microsoft Windows 9x/NT/2000 and generic Unix
-platforms. wxBase is a collection of non GUI classes, functions and macros
-used by wxWindows framework.
-
-It contains several data structure classes (as wxWindows predates STL, it has
-its own string, list, array, hash table, ... classes and also a powerful
-wxDateTime class), OS-abstraction classes (wxThread, wxSocket, wxStopWatch &c)
-and a few more utility classes (wxCmdLineParser, wxConfig for working with
-.INI and other configuration files, wxDllLoader for run-time binding and much
-more).
-
-Compilation
-----------
-
-a) under Win32 with Visual C++: open the provided wxBase.dsw workspace. From
-   it, you can build wxBase as a static library and/or as a DLL. Please see
-
-            http://www.wxwindows.org/vadim/wxDocs/buildmsw.html
-
-   for the instructions on how to use wxBase in your own projects. You can
-   also download the precompiled binaries from
-
-            http://www.wxwindows.org/vadim/wxDocs/binaries.html
-
-   NB: it should be possible to compile wxBase with other compilers as well,
-       if you managed to do this, please let me know so that your makefiles
-       could be included in the next distribution.
-
-b) under Unix/BeOS: use configure with --disable-gui argument. Building wxBase
-   in a separate directory is recommended, i.e.:
-
-        $ gunzip -c wxBase-x.y.z.tar.gz | tar xvf -
-        $ cd wxBase-x.y.z
-
-        # assuming you want to build the debug version of the library
-        $ mkdir debug
-        $ cd debug
-        $ ../configure --disable-gui --enable-debug
-
-        # if you want to build the release version:
-        $ mkdir release
-        $ cd release
-        $ ../configure --disable-gui
-
-        # in both cases
-        $ make && make install
-
-    Under most modern Unices you can specify --disable-static option to
-configure to avoid building the static libraries (but only the shared ones) to
-save some time and disk space.
-
-Problems
--------
-
-If you encounter problems or bugs, please report them to
-wx-users@wxwindows.org mailing list. Be sure to mention your platform, wxBase
-version and the compiler information. Thanks!
--- a/docs/base/todo.txt
+++ b/docs/base/todo.txt
@@ -1,5 +0,0 @@
-
-TODO for wxBase 2
-----------------
-
-better BeOS support.
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,60 +1,6 @@
 wxWindows 2 Change Log
 ----------------------

-2.2.1
-----
-
-wxBase:
-
- Fixed logic bug in wxDateTime::ParseDate.
- wxDB: replaced German variable names with English.
- wxDbGetConnection() did not check for the correct scrolling
-  of cursors when re-using a cached database connection.
-    
-All (GUI):
-
- Corrected uninitialized variable in wxDocument constructor.
- DocView now finds more appropriate parent frame for dialogs.
- Filter index checked, then path to find correct doc template.
- Unicode compile fixes.
- Generic list control column sizing bug fixed.
- Corrected wxComboBox validation behaviour.
- Added EVT_UPDATE_UI_RANGE macro.
- Some DB sample problems corrected.
- wxGrid fixes.
- Fixed low resolution problem with wxPostScriptDC.
-
-wxMSW:
-
- Removed delayed loading for winmm in VC++ makefile (problems
-  reported); USE_GLCANVAS now a variable in makefile.vc.
- Comments added to setup.h.
- wxCommandEvent::IsChecked now works for menu items.
- wxDEFAULT font size handled properly.
- Mods for Cygwin 1.1.
- Updated VC++ project and makefiles for consistency. DLL now
-  has version number in name.
- Added insertion point functions implementation for wxComboBox.
- Handle wxNO_FULL_REPAINT_ON_RESIZE for MDI children.
- Fixed problem with iconizing miniframes.
- Fixed bug with radiobox size being miscalculated if the label was
-  too long.
- The MSW radiobutton now informs about its state in the event (m_int)
-  as wxGTK did.
-
-wxGTK:
-
- Please see docs/gtk/changes.txt.
-
-wxMotif:
-
- Small compilation fixes
-
-Documentation:
-
- Added wxDb documentation.
- Added notes for Cygwin 1.1 to MSW install.txt.
-
 2.2.0
 -----

--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,25 +1,4 @@
-
-22nd July 2000: wxWindows 2.2.1 released
-
-Minor build fixes.
-
-Corrected guffow-scrolling so that no surplus expose
-events are generated.
-
-Corrected bug in wxMask creation on 16-bit displays.
-
-Minor correction to wxDC::DrawRoundedRectangle.
-
-Added support for <INSERT> and <DELETE> menu accelerators.
-
-Use the wxCommmandEvent::IsChecked() function for checkable
-menu items.
-
-Made wxComboBox case-sensitive.
-
-Minor correction to doc-view architecture.
-
-10th July 2000: wxWindows 2.2.0 released
+10th July 2000: wxWindows 2.2 released

 Added code for writing BMP images.

--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -38,7 +38,7 @@ 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.2.so.0.1.1 (shared) so
+libwx_gtk.a (static) and libwx_gtk-2.2.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.
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -17,11 +17,6 @@ The columns of this table have the obvious meaning: in each row you will see
 the language, the official translator (if any) for it and the status of the
 translations as of wxWindows 2.2.
 <p>
-Please subscribe to the
-<a href="http://wxwindows.org/mailman/listinfo/wx-translators">
-wxWindows translators</a> mailing list if you are interested in participating.
-Thanks!
-<p>

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

@@ -58,7 +53,7 @@ Thanks!
    <td valign=center>French (standard)</td>
    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
    <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
-                                   <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>,
+                                   <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>
                                   <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
                                   </td>
 </tr>
@@ -68,7 +63,7 @@ Thanks!
    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
    <td align=center valign=center><A HREF="mailto:DanR@gmx.de">Daniel Reith</A>,
                                   <A HREF="mailto:sparhawk@aon.at">Gerhard Gruber</A>,
-                                   <A HREF="mailto:stefan@hedemann.de">Stefan Hedemann</A>,
+                                   <A HREF="mailto:stefan@hedemann.de">Stefan Hedemann</A>
                                   <A HREF="mailto:D.Reymann@geisenheim.mnd.fh-wiesbaden.de">Dr. Detlev Reymann</A>
                                   </td>
 </tr>
@@ -86,20 +81,19 @@ Thanks!
    <td align=center valign=center><A HREF="mailto:bernardosw@terra.com.br">Bernardo Santos Wernesback</A></td>
 </tr>

-<tr>
-    <td valign=center>Russian</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Ok"></td>
-    <td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>,
-                                   <A HREF="mailto:vadim@wxwindows.org">Vadim Zeitlin</A>
-                                   </td>
-</tr>
-
 <tr>
    <td valign=center>Spanish</td>
    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
    <td align=center valign=center><A HREF="mailto:guille@iies.es">Guillermo Rodriguez Garcia</A></td>
 </tr>

+<tr>
+    <td valign=center>Russian</td>
+    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
+    <td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>
+                                   </td>
+</tr>
+
 <tr>
    <td valign=center>Swedish</td>
    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
--- a/docs/html/makedist.htm
+++ b/docs/html/makedist.htm
@@ -1,128 +0,0 @@
-<HTML>
-
-<HEAD>
-<TITLE>Making a wxMSW distribution</TITLE>
-
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" TEXT=#000000 LINK=#FF0000 VLINK=#000000>
-
-<font face="Arial, Lucida Sans, Helvetica">
-
-<a name="top"></a>
-
-<table width=100% border=0 cellpadding=5 cellspacing=0>
-<tr>
-<td bgcolor="#C4ECF9">
-<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
-Making a wxMSW distribution
-</font>
-</td>
-</tr>
-</table>
-
-<P>
-
-These are some notes on the steps involved in making up a wxMSW distribution from
-a CVS hierarchy.
-Currently only Julian Smart does this, but in the event of the duty being
-transferred, or to allow people to produce custom distributions, the following may be helpful.<P>
-
-The distribution scripts are in the distrib/msw directory.<P>
-
-<H3>Requirements</H3>
-
-<ol>
-<li>A wxWindows hierarchy from CVS.
-<li>A copy of Tex2RTF in your path.
-<li>32-bit zip and unzip utilities. I use zip 2.0.1 by Mark Adler and others, and unzip 5.12
-by Info-ZIP. I call them zip32 and unzip32 in the scripts.
-<li>Adobe Acrobat to generate the PDF documentation.
-<li>The scripts use 4DOS, so you will need a copy (the evaluation copy should do).
-<li>Several Windows compilers to test out the distribution (see below). VC++ is assumed, for
-running some of the scripts, e.g. the makefile for running Tex2RTF.
-<li>To make the setup.exe version of the distribution, a copy of WISE Installer
-(I use version 5.0: I don't know if the scripts are compatible with
-other versions).
-<li>If you need to extract the top and bottom from the wxWindows WISE script after editing it with WISE (so that
-the distribution script can automatically rebuild the .wse script from the distribution files + .wse script top and bottom),
-you will need to compile distrib/msw/splitwise.cpp into distrib/msw/splitwise.exe, a DOS command line program.
-<li><a href="http://wildsau.idv.uni-linz.ac.at/mfx/upx.html" target=_top>UPX</a>, for compressing executables.
-<li>A <i>lot</i> of disk space.
-</ol>
-
-<H3>Steps</H3>
-
-<ol>
-<li>Compile utils/projgen if necessary and run, to generate the .dsp/.dsw files for the samples, demos and utils
-using VC++ 5/6. In fact when wxWindows is fairly stable and new samples haven't been added and settings
-changed, this step isn't necessary.<P>
-<li>Update version numbers:
-<ul>
-<li>Ensure include/wx/version.h specifies the correct wxWindows version.
-<li>Alter WXVERSION or other version-related variables in src/makevc.env, src/makeg95.env, src/makeb32.env.
-<li>Alter the DLL version in the VC++ project files using distrib/msw/vcupdate.bat (no arguments).
-<li>Edit distrib/msw/zipdist.bat and change the <b>version</b> variable to the appropriate version.
-<li>Edit the WISE script (normally distrib/msw/wisetop.txt) to change the version number. See also below for other WISE script changes.
-<li>Update the date and version number in docs/latex/wx/manual.tex.
-</ul>
-<P>
-<li>Check setup.h is correct for the distribution (e.g. wxUSE_ODBC = 1, wxUSE_UNICODE = 0, etc.).<P>
-<li>Regenerate makefiles from the tmake templates, if necessary. Most makefiles have a target to do this using the makefile name,
-or else 'self'. Or you can use the 'makeall.bat' script in distrib\msw\tmake.<P>
-<li>Using VC++ 6, make a WIN32 release executable of Dialog Editor and place it in the top-level <b>bin</b> directory
-in your CVS hierarchy. Similarly for Tex2RTF and Life!. Compress them with UPX to save space.<P>
-<li>Ensure that the library and most of the samples/demos compile for the popular compilers. Currently I check
-with the following compilers:<P>
-VC++ 1.5, VC++ 4.0, VC++ 5.0, VC++ 6.0 (static and DLL), BC++ 4.5 (WIN16/WIN32), BC++ 5.0 (WIN16/WIN32), C++Builder 3,
-Watcom C++ 10.6, Cygwin b20, Mingw32 2.95. For VC++ 6 and BC++ 5.0, check compilation using both the
-makefiles and the project files (wxvc.dsp, wxvc_dll.dsp, bc32.ide). See distrib/msw/makeall.bat for a script
-to build wxWindows and samples for a variety of compilers.<P>
-<li>Ensure that all .rsp files, that list the files to go in the distribution, are up-to-date.
-For example, samples or demos may have been added to the hierarchy. The same applies to projgen (see above).<P>
-<li>Likewise, ensure that vc.rsp contains references to all the sample project files (that have been generated
-by projgen).<P>
-<li>Ensure docs/msw/install.txt is up-to-date (detail any gotchas for particular compiler versions, etc.).<P>
-<li>Update docs/readme.txt, docs/changes.txt (summarize from CVS change notifications).<P>
-<li>Build the WinHelp, HTML, and PDF documentation
-via the VC++ makefile, src/msw/makefile.vc. You can use e.g. the targets <b>cleandocs alldocs</b>. Check the
-output of the Windows Help Compiler for missing links, and edit/recompile the docs if necessary. The PDF documentation is produced from the Word RTF
-document, and read into Word. Apply the wxManual Style Template to improve presentation. Select all, press F9 to reformat the fields. Check the table of contents for
-overspill from the body of a section into the TOC. If there's a problem, it's due to the lack of a
-blank line at the end of the relevant .tex file. Insert the blank line, regenerate the RTF, and reload into Word.
-Then use Adobe Distiller to generate the PDF.<P>
-<li>You need to edit the WISE script to change the version number, and any other changes you wish to make.
-For simple changes, you can edit distrib/msw/wisetop.txt directly with a text editor. If you
-wish to use WISE Installer directly, you will need to make a full wxwin2.wse file first,
-by: (a) making up the distribution (next step), (b) editing wxwin2.wse with WISE Installer, (c)
-running the distrib/msw/splitwise program to produce wisetop.txt, wisebott.txt, (d) executing the
-next step again to remake the distribution programatically (or just run WISE directly: but remember
-to run splitwise to be in sync for future reference). For more details, please see distrib/msw/readme.txt.<P>
-<li>Make a <b>deliver</b> directory in the top-level wxWin hierarchy, change directory to distrib\msw,
-and run <b>zipdist wise</b> (omit 'wise' if you don't want to build the setup.exe files).<P>
-<li>You should now have lots of .zip files in your <b>deliver</b> folder, some setup.* files,
-plus a <b>wx</b> hierarchy (extracted
-from the zips) that you can now delete.<P>
-<li>Test the setup.exe distribution by installing it, preferably compiling using several compilers
-e.g. using distrib\msw\makeall.bat.<P>
-<li>Go into Linux, unpack the distribution zip files, then call the Linux distribution script
-to create .tgz files for wxMotif.<P>
-<li>Upload the appropriate files to the SourceGear ftp site.<P>
-<li>Download Robert's wxGTK files and upload to the SourceGear ftp site.<P>
-<li>If updating the CD-ROM hierarchy as well, follow these steps using the CD-ROM makefile:
-  <ol>
-  <li>Edit WXDISTDIR in the makefile and change to the correct distribution directory for this version.
-  <li>Run the makefile with <b>copydist</b>. This copies the distribution to the correct place
-on the CD-ROM.
-  <li>Run the makefile with <b>copydocs</b>. This copies the wxWindows 2 manuals to the correct
-place on the CD-ROM.
-  <li>Copy any project file zips that didn't need updating from an old distribution, e.g. wxWindows-x.y.z-wat.zip.
-  <li>Copy Robert's wxGTK files to the directory by hand.
-  </ol><P>
-</ol>
-
-</font>
-
-</BODY>
-
-</HTML>
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,18 +18,6 @@ News
 </tr>
 </table>

-<H3>July 28th, 2000</H3><P>
-
-<ul>
-<li>Vaclav Slavik has recently written an
-<a href="http://www.root.cz/clanek.phtml?id=425" target=_top>article about wxWindows</a> for a Czech ezine.
-<li><a href="http://www.ddj.com/news/fullstory.cgi?id=2057" target=_top">Dr Dobbs Journal</a> also carries a piece on wxWindows.
-<li>Hurray! There is a lot of traffic on the wxStudio mailing list, and
-Gerd Mueller has offered to make the <a href="http://www.softwarebuero.de" target=_top>WipeOut</a> IDE
-open source and merge it with wxStudio. There is a new <a href="http://wxstudio.sourceforge.net/" target=_top>wxStudio</a> page
-on SourceForge.
-</ul>
-
 <H3><a name="release2_2_0">July 9th, 2000</H3><P>

 <ul>
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -93,9 +93,7 @@ often don't work.
 <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 xlC 3.1.4.0 (AIX 4.2)</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td>
-                                 <td>Bernhard Eck</td>
-                                 <td>Some problems with OpenGL and native X server</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>
--- a/docs/install.txt
+++ b/docs/install.txt
@@ -0,0 +1,14 @@
+                        INSTALL.TXT
+
+NB: this file describes the installation of wxBase library. If you are using a
+    GUI version of wxWindows, please refer to the install.txt in the
+    appropriate subdirectory (msw, gtk, motif).
+
+0. Requirments and supported platforms
+   -----------------------------------
+
+1. Installing under Win32
+   ----------------------
+
+2. Installing under Unix/BeOS
+   --------------------------
--- a/docs/latex/wx/caret.tex
+++ b/docs/latex/wx/caret.tex
@@ -26,10 +26,6 @@ can't be reused in two different windows.

 No base class

-\wxheading{Include files}
-
-<wx/caret.h>
-
 \wxheading{Data structures}

 \latexignore{\rtfignore{\wxheading{Members}}}
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -48,13 +48,13 @@
 \input database.tex
 \input dataform.tex
 \input dataobj.tex
+\input db.tex
 \input dobjcomp.tex
 \input dobjsmpl.tex
 \input datstrm.tex
 \input date.tex
 \input datespan.tex
 \input datetime.tex
-\input db.tex
 \input dc.tex
 \input ddeclint.tex
 \input ddeconn.tex
@@ -281,6 +281,7 @@
 \input txtdrptg.tex
 \input timespan.tex
 \input valtext.tex
+\input table.tex
 \input textfile.tex
 \input thread.tex
 \input time.tex
--- a/docs/latex/wx/cmdevent.tex
+++ b/docs/latex/wx/cmdevent.tex
@@ -36,9 +36,7 @@ which is generated by a wxListBox control.}
 \twocolitem{{\bf EVT\_TEXT(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_UPDATED command,
 which is generated by a wxTextCtrl control.}
 \twocolitem{{\bf EVT\_TEXT\_ENTER(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_ENTER command,
-which is generated by a wxTextCtrl control. Note that you must use
-wxTE\_PROCESS\_ENTER flag when creating the control if you want it to generate
-such events.}
+which is generated by a wxTextCtrl control.}
 \twocolitem{{\bf EVT\_MENU(id, func)}}{Process a wxEVT\_COMMAND\_MENU\_SELECTED command,
 which is generated by a menu item.}
 \twocolitem{{\bf EVT\_MENU\_RANGE(id1, id2, func)}}{Process a wxEVT\_COMMAND\_MENU\_RANGE command,
@@ -119,16 +117,16 @@ Constructor.

 \membersection{wxCommandEvent::Checked}

-\constfunc{bool}{Checked}{\void}
+\func{bool}{Checked}{\void}

-Deprecated, use \helpref{IsChecked}{wxcommandeventischecked} instead.
+Returns TRUE or FALSE for a checkbox selection event.

 \membersection{wxCommandEvent::GetClientData}

 \func{void*}{GetClientData}{\void}

 Returns client data pointer for a listbox or choice selection event
-(not valid for a deselection).
+(not valid for a deselection). Beware, this is not implmented anywhere...

 \membersection{wxCommandEvent::GetExtraLong}

@@ -156,16 +154,6 @@ a deselection).
 Returns item string for a listbox or choice selection event (not valid for
 a deselection).

-\membersection{wxCommandEvent::IsChecked}\label{wxcommandeventischecked}
-
-\constfunc{bool}{IsChecked}{\void}
-
-This method can be used with checkbox and menu events: for the checkboxes, the
-method returns {\tt TRUE} for a selection event and {\tt FALSE} for a
-deselection one. For the menu events, this method indicates if the menu item
-just has become checked or unchecked (and thus only makes sense for checkable
-menu items).
-
 \membersection{wxCommandEvent::IsSelection}

 \func{bool}{IsSelection}{\void}
--- a/docs/latex/wx/combobox.tex
+++ b/docs/latex/wx/combobox.tex
@@ -23,9 +23,8 @@ A combobox permits a single selection only. Combobox items are numbered from zer
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxCB\_SIMPLE}}{Creates a combobox with a permanently displayed list. Windows only. }
 \twocolitem{\windowstyle{wxCB\_DROPDOWN}}{Creates a combobox with a drop-down list.}
-\twocolitem{\windowstyle{wxCB\_READONLY}}{Same as wxCB\_DROPDOWN but only the
-strings specified as the combobox choices can be selected, it is impossible to
-select (even from a program) a string which is not in the choices list.}
+\twocolitem{\windowstyle{wxCB\_READONLY}}{Creates a combo box consisting of a drop-down list and static text item
+displaying the current selection.}
 \twocolitem{\windowstyle{wxCB\_SORT}}{Sorts the entries in the list alphabetically.}
 \end{twocollist}

@@ -320,9 +319,6 @@ wxPython.}

 Sets the text for the combobox text field.

-{\bf NB:} For a combobox with {\tt wxCB\_READONLY} style the string must be in
-the combobox choices list, otherwise the call to SetValue() is ignored.
-
 \wxheading{Parameters}

 \docparam{text}{The text to set.}
--- a/docs/latex/wx/database.tex
+++ b/docs/latex/wx/database.tex
@@ -3,6 +3,9 @@
 Every database object represents an ODBC connection.
 The connection may be closed and reopened.

+Note: this class is considered obsolete, replaced by the Remstar wxDB/wxTable classes
+(documented separately in Word and PDF format, as odbc.doc and odbc.pdf).
+
 \wxheading{Derived from}

 \helpref{wxObject}{wxobject}
@@ -19,7 +22,7 @@ A much more robust and feature-rich set of ODBC classes is now
 available and recommended for use in place of the wxDatabase class.

 See details of these classes in:
-\helpref{wxDB}{wxdb}, \helpref{wxDbTable}{wxdbtable}
+\helpref{wxDB}{wxdb}, \helpref{wxTable}{wxtable}

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

@@ -77,9 +80,9 @@ and disconnects from the current data source.

 Commits previous transactions. Not implemented.

-\membersection{wxDatabase::ErrorOccured}
+\membersection{wxDatabase::ErrorOccurred}

-\func{bool}{ErrorOccured}{\void}
+\func{bool}{ErrorOccurred}{\void}

 Returns TRUE if the last action caused an error.

@@ -87,7 +90,7 @@ Returns TRUE if the last action caused an error.

 \func{void}{ErrorSnapshot}{\param{HSTMT}{ statement = SQL\_NULL\_HSTMT}}

-This function will be called whenever an ODBC error occured. It stores the
+This function will be called whenever an ODBC error occurred. It stores the
 error related information returned by ODBC. If a statement handle of the
 concerning ODBC action is available it should be passed to the function.

--- a/docs/latex/wx/db.tex
+++ b/docs/latex/wx/db.tex
--- a/docs/latex/wx/dc.tex
+++ b/docs/latex/wx/dc.tex
@@ -375,7 +375,7 @@ Ends a document page (only relevant when outputting to a printer).

 \membersection{wxDC::FloodFill}\label{wxdcfloodfill}

-\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{const wxColour\&}{ colour}, \param{int}{ style=wxFLOOD\_SURFACE}}
+\func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxColour *}{colour}, \param{int}{ style=wxFLOOD\_SURFACE}}

 Flood fills the device context starting from the given point, in the given colour,
 and using a style:
--- a/docs/latex/wx/gridattr.tex
+++ b/docs/latex/wx/gridattr.tex
@@ -1,170 +0,0 @@
-%
-% automatically generated by HelpGen from
-% grid.h at 11/May/00 18:30:19
-%
-
-
-\section{\class{wxGridCellAttr}}\label{wxgridcellattr}
-
-
-
-wxGridCellAttr: this class can be used to alter the cells appearance in
-the grid by changing their colour/font/... from default. An object of this
-class may be returned by wxGridTable::GetAttr().
-
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxGridCellAttr::wxGridCellAttr}\label{wxgridcellattrwxgridcellattr}
-
-\func{}{wxGridCellAttr}{\void}
-
-ctors
-
-
-\membersection{wxGridCellAttr::wxGridCellAttr}\label{wxgridcellattrwxgridcellattr}
-
-\func{}{wxGridCellAttr}{\param{const wxColour\& }{colText}, \param{const wxColour\& }{colBack}, \param{const wxFont\& }{font}, \param{int }{hAlign}, \param{int }{vAlign}}
-
-VZ: considering the number of members wxGridCellAttr has now, this ctor
-seems to be pretty useless... may be we should just remove it?
-
-
-\membersection{wxGridCellAttr::Clone}\label{wxgridcellattrclone}
-
-\constfunc{wxGridCellAttr*}{Clone}{\void}
-
-creates a new copy of this object
-
-
-\membersection{wxGridCellAttr::IncRef}\label{wxgridcellattrincref}
-
-\func{void}{IncRef}{\void}
-
-this class is ref counted: it is created with ref count of 1, so
-calling DecRef() once will delete it. Calling IncRef() allows to lock
-it until the matching DecRef() is called
-
-
-\membersection{wxGridCellAttr::DecRef}\label{wxgridcellattrdecref}
-
-\func{void}{DecRef}{\void}
-
-
-\membersection{wxGridCellAttr::SetTextColour}\label{wxgridcellattrsettextcolour}
-
-\func{void}{SetTextColour}{\param{const wxColour\& }{colText}}
-
-setters
-
-
-\membersection{wxGridCellAttr::SetBackgroundColour}\label{wxgridcellattrsetbackgroundcolour}
-
-\func{void}{SetBackgroundColour}{\param{const wxColour\& }{colBack}}
-
-
-\membersection{wxGridCellAttr::SetFont}\label{wxgridcellattrsetfont}
-
-\func{void}{SetFont}{\param{const wxFont\& }{font}}
-
-
-\membersection{wxGridCellAttr::SetAlignment}\label{wxgridcellattrsetalignment}
-
-\func{void}{SetAlignment}{\param{int }{hAlign}, \param{int }{vAlign}}
-
-
-\membersection{wxGridCellAttr::SetReadOnly}\label{wxgridcellattrsetreadonly}
-
-\func{void}{SetReadOnly}{\param{bool }{isReadOnly = TRUE}}
-
-
-\membersection{wxGridCellAttr::SetRenderer}\label{wxgridcellattrsetrenderer}
-
-\func{void}{SetRenderer}{\param{wxGridCellRenderer* }{renderer}}
-
-takes ownership of the pointer
-
-
-\membersection{wxGridCellAttr::SetEditor}\label{wxgridcellattrseteditor}
-
-\func{void}{SetEditor}{\param{wxGridCellEditor* }{editor}}
-
-
-\membersection{wxGridCellAttr::HasTextColour}\label{wxgridcellattrhastextcolour}
-
-\constfunc{bool}{HasTextColour}{\void}
-
-accessors
-
-
-\membersection{wxGridCellAttr::HasBackgroundColour}\label{wxgridcellattrhasbackgroundcolour}
-
-\constfunc{bool}{HasBackgroundColour}{\void}
-
-
-\membersection{wxGridCellAttr::HasFont}\label{wxgridcellattrhasfont}
-
-\constfunc{bool}{HasFont}{\void}
-
-
-\membersection{wxGridCellAttr::HasAlignment}\label{wxgridcellattrhasalignment}
-
-\constfunc{bool}{HasAlignment}{\void}
-
-
-\membersection{wxGridCellAttr::HasRenderer}\label{wxgridcellattrhasrenderer}
-
-\constfunc{bool}{HasRenderer}{\void}
-
-
-\membersection{wxGridCellAttr::HasEditor}\label{wxgridcellattrhaseditor}
-
-\constfunc{bool}{HasEditor}{\void}
-
-
-\membersection{wxGridCellAttr::GetTextColour}\label{wxgridcellattrgettextcolour}
-
-\constfunc{const wxColour\&}{GetTextColour}{\void}
-
-
-\membersection{wxGridCellAttr::GetBackgroundColour}\label{wxgridcellattrgetbackgroundcolour}
-
-\constfunc{const wxColour\&}{GetBackgroundColour}{\void}
-
-
-\membersection{wxGridCellAttr::GetFont}\label{wxgridcellattrgetfont}
-
-\constfunc{const wxFont\&}{GetFont}{\void}
-
-
-\membersection{wxGridCellAttr::GetAlignment}\label{wxgridcellattrgetalignment}
-
-\constfunc{void}{GetAlignment}{\param{int* }{hAlign}, \param{int* }{vAlign}}
-
-
-\membersection{wxGridCellAttr::GetRenderer}\label{wxgridcellattrgetrenderer}
-
-\constfunc{wxGridCellRenderer*}{GetRenderer}{\param{wxGrid* }{grid}, \param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridCellAttr::GetEditor}\label{wxgridcellattrgeteditor}
-
-\constfunc{wxGridCellEditor*}{GetEditor}{\param{wxGrid* }{grid}, \param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridCellAttr::IsReadOnly}\label{wxgridcellattrisreadonly}
-
-\constfunc{bool}{IsReadOnly}{\void}
-
-
-\membersection{wxGridCellAttr::SetDefAttr}\label{wxgridcellattrsetdefattr}
-
-\func{void}{SetDefAttr}{\param{wxGridCellAttr* }{defAttr}}
-
--- a/docs/latex/wx/gridedit.tex
+++ b/docs/latex/wx/gridedit.tex
@@ -1,134 +0,0 @@
-%
-% automatically generated by HelpGen from
-% grid.h at 11/May/00 18:30:18
-%
-
-
-\section{\class{wxGridCellEditor}}\label{wxgridcelleditor}
-
-
-
-wxGridCellEditor:  This class is responsible for providing and manipulating
-the in-place edit controls for the grid.  Instances of wxGridCellEditor
-(actually, instances of derived classes since it is an ABC) can be
-associated with the cell attributes for individual cells, rows, columns, or
-even for the entire grid.
-
-
-\wxheading{Derived from}
-
-\helpref{wxGridCellWorker}{wxgridcellworker}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxGridCellEditor::wxGridCellEditor}\label{wxgridcelleditorwxgridcelleditor}
-
-\func{}{wxGridCellEditor}{\void}
-
-
-\membersection{wxGridCellEditor::IsCreated}\label{wxgridcelleditoriscreated}
-
-\func{bool}{IsCreated}{\void}
-
-
-\membersection{wxGridCellEditor::Create}\label{wxgridcelleditorcreate}
-
-\func{void}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{wxEvtHandler* }{evtHandler}}
-
-Creates the actual edit control
-
-
-\membersection{wxGridCellEditor::SetSize}\label{wxgridcelleditorsetsize}
-
-\func{void}{SetSize}{\param{const wxRect\& }{rect}}
-
-Size and position the edit control
-
-
-\membersection{wxGridCellEditor::Show}\label{wxgridcelleditorshow}
-
-\func{void}{Show}{\param{bool }{show}, \param{wxGridCellAttr* }{attr = NULL}}
-
-Show or hide the edit control, use the specified attributes to set
-colours/fonts for it
-
-
-\membersection{wxGridCellEditor::PaintBackground}\label{wxgridcelleditorpaintbackground}
-
-\func{void}{PaintBackground}{\param{const wxRect\& }{rectCell}, \param{wxGridCellAttr* }{attr}}
-
-Draws the part of the cell not occupied by the control: the base class
-version just fills it with background colour from the attribute
-
-
-\membersection{wxGridCellEditor::BeginEdit}\label{wxgridcelleditorbeginedit}
-
-\func{void}{BeginEdit}{\param{int }{row}, \param{int }{col}, \param{wxGrid* }{grid}}
-
-Fetch the value from the table and prepare the edit control
-to begin editing.  Set the focus to the edit control.
-
-
-\membersection{wxGridCellEditor::EndEdit}\label{wxgridcelleditorendedit}
-
-\func{bool}{EndEdit}{\param{int }{row}, \param{int }{col}, \param{wxGrid* }{grid}}
-
-Complete the editing of the current cell. Returns true if the value has
-changed.  If necessary, the control may be destroyed.
-
-
-\membersection{wxGridCellEditor::Reset}\label{wxgridcelleditorreset}
-
-\func{void}{Reset}{\void}
-
-Reset the value in the control back to its starting value
-
-
-\membersection{wxGridCellEditor::StartingKey}\label{wxgridcelleditorstartingkey}
-
-\func{void}{StartingKey}{\param{wxKeyEvent\& }{event}}
-
-If the editor is enabled by pressing keys on the grid,
-this will be called to let the editor do something about
-that first key if desired.
-
-
-\membersection{wxGridCellEditor::StartingClick}\label{wxgridcelleditorstartingclick}
-
-\func{void}{StartingClick}{\void}
-
-if the editor is enabled by clicking on the cell, this method will be
-called
-
-
-\membersection{wxGridCellEditor::HandleReturn}\label{wxgridcelleditorhandlereturn}
-
-\func{void}{HandleReturn}{\param{wxKeyEvent\& }{event}}
-
-Some types of controls on some platforms may need some help
-with the Return key.
-
-
-\membersection{wxGridCellEditor::Destroy}\label{wxgridcelleditordestroy}
-
-\func{void}{Destroy}{\void}
-
-Final cleanup
-
-
-\membersection{wxGridCellEditor::Clone}\label{wxgridcelleditorclone}
-
-\constfunc{wxGridCellEditor*}{Clone}{\void}
-
-create a new object which is the copy of this one
-
-
-\membersection{wxGridCellEditor::\destruct{wxGridCellEditor}}\label{wxgridcelleditordtor}
-
-\func{}{\destruct{wxGridCellEditor}}{\void}
-
-the dtor is private because only DecRef() can delete us
-
--- a/docs/latex/wx/gridrend.tex
+++ b/docs/latex/wx/gridrend.tex
@@ -1,50 +0,0 @@
-%
-% automatically generated by HelpGen from
-% grid.h at 11/May/00 18:30:18
-%
-
-
-\section{\class{wxGridCellRenderer}}\label{wxgridcellrenderer}
-
-
-suppress the stupid gcc warning about the class having private dtor and
-no friends
-
-wxGridCellRenderer: this class is responsible for actually drawing the cell
-in the grid. You may pass it to the wxGridCellAttr (below) to change the
-format of one given cell or to wxGrid::SetDefaultRenderer() to change the
-view of all cells. This is an ABC, you will normally use one of the
-predefined derived classes or derive your own class from it.
-
-
-\wxheading{Derived from}
-
-\helpref{wxGridCellWorker}{wxgridcellworker}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxGridCellRenderer::Draw}\label{wxgridcellrendererdraw}
-
-\func{void}{Draw}{\param{wxGrid\& }{grid}, \param{wxGridCellAttr\& }{attr}, \param{wxDC\& }{dc}, \param{const wxRect\& }{rect}, \param{int }{row}, \param{int }{col}, \param{bool }{isSelected}}
-
-draw the given cell on the provided DC inside the given rectangle
-using the style specified by the attribute and the default or selected
-state corresponding to the isSelected value.
-this pure virtual function has a default implementation which will
-prepare the DC using the given attribute: it will draw the rectangle
-with the bg colour from attr and set the text colour and font
-
-
-\membersection{wxGridCellRenderer::GetBestSize}\label{wxgridcellrenderergetbestsize}
-
-\func{wxSize}{GetBestSize}{\param{wxGrid\& }{grid}, \param{wxGridCellAttr\& }{attr}, \param{wxDC\& }{dc}, \param{int }{row}, \param{int }{col}}
-
-get the preferred size of the cell for its contents
-
-
-\membersection{wxGridCellRenderer::Clone}\label{wxgridcellrendererclone}
-
-\constfunc{wxGridCellRenderer*}{Clone}{
--- a/docs/latex/wx/gridtbl.tex
+++ b/docs/latex/wx/gridtbl.tex
@@ -1,236 +0,0 @@
-\section{\class{wxGridTableBase}}\label{wxgridtablebase}
-
-
-Grid table classes
-
-\wxheading{Derived from}
-
-\helpref{wxObject}{wxobject}
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxGridTableBase::wxGridTableBase}\label{wxgridtablebasewxgridtablebase}
-
-\func{}{wxGridTableBase}{\void}
-
-
-\membersection{wxGridTableBase::\destruct{wxGridTableBase}}\label{wxgridtablebasedtor}
-
-\func{}{\destruct{wxGridTableBase}}{\void}
-
-
-\membersection{wxGridTableBase::GetNumberRows}\label{wxgridtablebasegetnumberrows}
-
-\func{int}{GetNumberRows}{\void}
-
-You must override these functions in a derived table class
-
-
-\membersection{wxGridTableBase::GetNumberCols}\label{wxgridtablebasegetnumbercols}
-
-\func{int}{GetNumberCols}{\void}
-
-
-\membersection{wxGridTableBase::IsEmptyCell}\label{wxgridtablebaseisemptycell}
-
-\func{bool}{IsEmptyCell}{\param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridTableBase::GetValue}\label{wxgridtablebasegetvalue}
-
-\func{wxString}{GetValue}{\param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridTableBase::SetValue}\label{wxgridtablebasesetvalue}
-
-\func{void}{SetValue}{\param{int }{row}, \param{int }{col}, \param{const wxString\& }{value}}
-
-
-\membersection{wxGridTableBase::GetTypeName}\label{wxgridtablebasegettypename}
-
-\func{wxString}{GetTypeName}{\param{int }{row}, \param{int }{col}}
-
-Data type determination and value access
-
-
-\membersection{wxGridTableBase::CanGetValueAs}\label{wxgridtablebasecangetvalueas}
-
-\func{bool}{CanGetValueAs}{\param{int }{row}, \param{int }{col}, \param{const wxString\& }{typeName}}
-
-
-\membersection{wxGridTableBase::CanSetValueAs}\label{wxgridtablebasecansetvalueas}
-
-\func{bool}{CanSetValueAs}{\param{int }{row}, \param{int }{col}, \param{const wxString\& }{typeName}}
-
-
-\membersection{wxGridTableBase::GetValueAsLong}\label{wxgridtablebasegetvalueaslong}
-
-\func{long}{GetValueAsLong}{\param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridTableBase::GetValueAsDouble}\label{wxgridtablebasegetvalueasdouble}
-
-\func{double}{GetValueAsDouble}{\param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridTableBase::GetValueAsBool}\label{wxgridtablebasegetvalueasbool}
-
-\func{bool}{GetValueAsBool}{\param{int }{row}, \param{int }{col}}
-
-
-\membersection{wxGridTableBase::SetValueAsLong}\label{wxgridtablebasesetvalueaslong}
-
-\func{void}{SetValueAsLong}{\param{int }{row}, \param{int }{col}, \param{long }{value}}
-
-
-\membersection{wxGridTableBase::SetValueAsDouble}\label{wxgridtablebasesetvalueasdouble}
-
-\func{void}{SetValueAsDouble}{\param{int }{row}, \param{int }{col}, \param{double }{value}}
-
-
-\membersection{wxGridTableBase::SetValueAsBool}\label{wxgridtablebasesetvalueasbool}
-
-\func{void}{SetValueAsBool}{\param{int }{row}, \param{int }{col}, \param{bool }{value}}
-
-
-\membersection{wxGridTableBase::GetValueAsCustom}\label{wxgridtablebasegetvalueascustom}
-
-\func{void*}{GetValueAsCustom}{\param{int }{row}, \param{int }{col}, \param{const wxString\& }{typeName}}
-
-For user defined types
-
-
-\membersection{wxGridTableBase::SetValueAsCustom}\label{wxgridtablebasesetvalueascustom}
-
-\func{void}{SetValueAsCustom}{\param{int }{row}, \param{int }{col}, \param{const wxString\& }{typeName}, \param{void* }{value}}
-
-
-\membersection{wxGridTableBase::SetView}\label{wxgridtablebasesetview}
-
-\func{void}{SetView}{\param{wxGrid* }{grid}}
-
-Overriding these is optional
-
-
-\membersection{wxGridTableBase::GetView}\label{wxgridtablebasegetview}
-
-\constfunc{wxGrid *}{GetView}{\void}
-
-
-\membersection{wxGridTableBase::Clear}\label{wxgridtablebaseclear}
-
-\func{void}{Clear}{\void}
-
-
-\membersection{wxGridTableBase::InsertRows}\label{wxgridtablebaseinsertrows}
-
-\func{bool}{InsertRows}{\param{size\_t }{pos = 0}, \param{size\_t }{numRows = 1}}
-
-
-\membersection{wxGridTableBase::AppendRows}\label{wxgridtablebaseappendrows}
-
-\func{bool}{AppendRows}{\param{size\_t }{numRows = 1}}
-
-
-\membersection{wxGridTableBase::DeleteRows}\label{wxgridtablebasedeleterows}
-
-\func{bool}{DeleteRows}{\param{size\_t }{pos = 0}, \param{size\_t }{numRows = 1}}
-
-
-\membersection{wxGridTableBase::InsertCols}\label{wxgridtablebaseinsertcols}
-
-\func{bool}{InsertCols}{\param{size\_t }{pos = 0}, \param{size\_t }{numCols = 1}}
-
-
-\membersection{wxGridTableBase::AppendCols}\label{wxgridtablebaseappendcols}
-
-\func{bool}{AppendCols}{\param{size\_t }{numCols = 1}}
-
-
-\membersection{wxGridTableBase::DeleteCols}\label{wxgridtablebasedeletecols}
-
-\func{bool}{DeleteCols}{\param{size\_t }{pos = 0}, \param{size\_t }{numCols = 1}}
-
-
-\membersection{wxGridTableBase::GetRowLabelValue}\label{wxgridtablebasegetrowlabelvalue}
-
-\func{wxString}{GetRowLabelValue}{\param{int }{row}}
-
-
-\membersection{wxGridTableBase::GetColLabelValue}\label{wxgridtablebasegetcollabelvalue}
-
-\func{wxString}{GetColLabelValue}{\param{int }{col}}
-
-
-\membersection{wxGridTableBase::SetRowLabelValue}\label{wxgridtablebasesetrowlabelvalue}
-
-\func{void}{SetRowLabelValue}{\param{int }{WXUNUSED(row)}, \param{const }{wxString\&}}
-
-
-\membersection{wxGridTableBase::SetColLabelValue}\label{wxgridtablebasesetcollabelvalue}
-
-\func{void}{SetColLabelValue}{\param{int }{WXUNUSED(col)}, \param{const }{wxString\&}}
-
-
-\membersection{wxGridTableBase::SetAttrProvider}\label{wxgridtablebasesetattrprovider}
-
-\func{void}{SetAttrProvider}{\param{wxGridCellAttrProvider* }{attrProvider}}
-
-Attribute handling
-give us the attr provider to use - we take ownership of the pointer
-
-
-\membersection{wxGridTableBase::GetAttrProvider}\label{wxgridtablebasegetattrprovider}
-
-\constfunc{wxGridCellAttrProvider*}{GetAttrProvider}{\void}
-
-get the currently used attr provider (may be NULL)
-
-
-\membersection{wxGridTableBase::CanHaveAttributes}\label{wxgridtablebasecanhaveattributes}
-
-\func{bool}{CanHaveAttributes}{\void}
-
-Does this table allow attributes?  Default implementation creates
-a wxGridCellAttrProvider if necessary.
-
-
-\membersection{wxGridTableBase::UpdateAttrRows}\label{wxgridtablebaseupdateattrrows}
-
-\func{void}{UpdateAttrRows}{\param{size\_t }{pos}, \param{int }{numRows}}
-
-change row/col number in attribute if needed
-
-
-\membersection{wxGridTableBase::UpdateAttrCols}\label{wxgridtablebaseupdateattrcols}
-
-\func{void}{UpdateAttrCols}{\param{size\_t }{pos}, \param{int }{numCols}}
-
-
-\membersection{wxGridTableBase::GetAttr}\label{wxgridtablebasegetattr}
-
-\func{wxGridCellAttr*}{GetAttr}{\param{int }{row}, \param{int }{col}}
-
-by default forwarded to wxGridCellAttrProvider if any. May be
-overridden to handle attributes directly in the table.
-
-
-\membersection{wxGridTableBase::SetAttr}\label{wxgridtablebasesetattr}
-
-\func{void}{SetAttr}{\param{wxGridCellAttr* }{attr}, \param{int }{row}, \param{int }{col}}
-
-these functions take ownership of the pointer
-
-
-\membersection{wxGridTableBase::SetRowAttr}\label{wxgridtablebasesetrowattr}
-
-\func{void}{SetRowAttr}{\param{wxGridCellAttr* }{attr}, \param{int }{row}}
-
-
-\membersection{wxGridTableBase::SetColAttr}\label{wxgridtablebasesetcolattr}
-
-\func{void}{SetColAttr}{\param{wxGridCellAttr* }{attr}, \param{int }{col}}
-
--- a/docs/latex/wx/gridwork.tex
+++ b/docs/latex/wx/gridwork.tex
@@ -1,59 +0,0 @@
-%
-% automatically generated by HelpGen from
-% grid.h at 11/May/00 18:30:18
-%
-
-
-\section{\class{wxGridCellWorker}}\label{wxgridcellworker}
-
-
-
-wxGridCellWorker: common base class for wxGridCellRenderer and
-wxGridCellEditor
-NB: this is more an implementation convenience than a design issue, so this
-class is not documented and is not public at all
-
-
-\wxheading{Derived from}
-
-No base class
-
-\wxheading{Data structures}
-
-\latexignore{\rtfignore{\wxheading{Members}}}
-
-
-\membersection{wxGridCellWorker::wxGridCellWorker}\label{wxgridcellworkerwxgridcellworker}
-
-\func{}{wxGridCellWorker}{\void}
-
-
-\membersection{wxGridCellWorker::IncRef}\label{wxgridcellworkerincref}
-
-\func{void}{IncRef}{\void}
-
-this class is ref counted: it is created with ref count of 1, so
-calling DecRef() once will delete it. Calling IncRef() allows to lock
-it until the matching DecRef() is called
-
-
-\membersection{wxGridCellWorker::DecRef}\label{wxgridcellworkerdecref}
-
-\func{void}{DecRef}{\void}
-
-
-\membersection{wxGridCellWorker::SetParameters}\label{wxgridcellworkersetparameters}
-
-\func{void}{SetParameters}{\param{const wxString\& }{params}}
-
-interpret renderer parameters: arbitrary string whose interpretatin is
-left to the derived classes
-
-
-\membersection{wxGridCellWorker::\destruct{wxGridCellWorker}}\label{wxgridcellworkerdtor}
-
-\func{}{\destruct{wxGridCellWorker}}{\void}
-
-virtual dtor for any base class - private because only DecRef() can
-delete us
-
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -187,10 +187,6 @@ on program start-up to look up colors. This ensures a very fast conversion, but
 the image quality won't be perfect (and could be better for photo images using more
 sophisticated dithering algorithms).

-On Windows, if there is a palette present (set with SetPalette), it will be used when
-creating the wxBitmap (most useful in 8-bit display mode). On other platforms,
-the palette is currently ignored.
-
 \membersection{wxImage::Copy}\label{wximagecopy}

 \constfunc{wxImage}{Copy}{\void}
@@ -313,15 +309,6 @@ Gets the green value of the mask colour.

 Gets the red value of the mask colour.

-\membersection{wxImage::GetPalette}\label{wximagegetpalette}
-
-\constfunc{const wxPalette\&}{GetPalette}{\void}
-
-Returns the palette associated with the image. Currently the palette is only
-used in ConvertToBitmap under Windows.
-
-Eventually wxImage handlers will set the palette if one exists in the image file.
-
 \membersection{wxImage::GetSubImage}\label{wximagegetsubimage}

 \constfunc{wxImage}{GetSubImage}{\param{const wxRect\&}{ rect}}
@@ -610,12 +597,6 @@ Specifies whether there is a mask or not. The area of the mask is determined by

 Sets the mask colour for this image (and tells the image to use the mask).

-\membersection{wxImage::SetPalette}\label{wximagesetpalette}
-
-\func{void}{SetPalette}{\param{const wxPalette\&}{ palette}}
-
-Associates a palette with the image. Currently, the palette is not used.
-
 \membersection{wxImage::SetRGB}\label{wximagesetrgb}

 \func{void}{SetRGB}{\param{int }{x}, \param{int }{y}, \param{unsigned char }{red}, \param{unsigned char }{green}, \param{unsigned char }{blue}}
--- a/docs/latex/wx/locale.tex
+++ b/docs/latex/wx/locale.tex
@@ -51,11 +51,7 @@ understand: first of all, the application locale is changed - note that this
 will affect many of standard C library functions such as printf() or strftime().
 Second, this wxLocale object becomes the new current global locale for the
 application and so all subsequent calls to wxGetTranslation() will try to
-translate the messages using the message catalogs for this locale. Finally,
-unless bLoadDefault parameter is FALSE, the method also loads the wxstd.mo
-catalog (which is looked for in all the usual places and, additionally, under
-the location specified bythe environment variable WXDIR if it is set) which
-will allow to translate all the messages generated by the library itself.
+translate the messages using the message catalogs for this locale.

 \membersection{wxLocale::\destruct{wxLocale}}\label{wxlocaledtor}

@@ -65,6 +61,13 @@ The destructor, like the constructor, also has global side effects: the previous
 set locale is restored and so the changes described in 
 \helpref{Init}{wxlocaleinit} documentation are rolled back.

+\membersection{wxLocale::GetLocale}\label{wxlocalegetlocale}
+
+\constfunc{const char*}{GetLocale}{\void}
+
+Returns the locale name as passed to the constructor or 
+\helpref{Init()}{wxlocaleinit}.
+
 \membersection{wxLocale::AddCatalog}\label{wxlocaleaddcatalog}

 \func{bool}{AddCatalog}{\param{const char }{*szDomain}}
@@ -90,36 +93,6 @@ looked up under prefix/<lang>/LC\_MESSAGES, prefix/LC\_MESSAGES and prefix

 This only applies to subsequent invocations of AddCatalog()!

-\membersection{wxLocale::GetLocale}\label{wxlocalegetlocale}
-
-\constfunc{const char*}{GetLocale}{\void}
-
-Returns the locale name as passed to the constructor or 
-\helpref{Init()}{wxlocaleinit}.
-
-\membersection{wxLocale::GetName}\label{wxlocalegetname}
-
-\constfunc{const wxString\&}{GetName}{\void}
-
-Returns the current short name for the locale (as given to the constructor or
-the Init() function).
-
-\membersection{wxLocale::GetString}\label{wxlocalegetstring}
-
-\constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szDomain = NULL}}
-
-Retrieves the translation for a string in all loaded domains unless the szDomain
-parameter is specified (and then only this catalog/domain is searched).
-
-Returns original string if translation is not available
-(in this case an error message is generated the first time
-a string is not found; use \helpref{wxLogNull}{wxlogoverview} to suppress it).
-
-\wxheading{Remarks}
-
-Domains are searched in the last to first order, i.e. catalogs
-added later override those added before.
-
 \membersection{wxLocale::Init}\label{wxlocaleinit}

 \func{bool}{Init}{\param{const char }{*szName}, \param{const char }{*szShort = NULL}, \param{const char }{*szLocale = NULL}, \param{bool }{bLoadDefault = TRUE}}
@@ -156,9 +129,26 @@ normally corresponds to 'domain' which is more or less the application name.

 See also: \helpref{AddCatalog}{wxlocaleaddcatalog}

-\membersection{wxLocale::IsOk}\label{wxlocaleisok}
+\membersection{wxLocale::GetName}\label{wxlocalegetname}

-\constfunc{bool}{IsOk}{\void}
+\constfunc{const wxString\&}{GetName}{\void}

-Returns TRUE if the locale could be set successfully.
+Returns the current short name for the locale (as given to the constructor or
+the Init() function).
+
+\membersection{wxLocale::GetString}\label{wxlocalegetstring}
+
+\constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szDomain = NULL}}
+
+Retrieves the translation for a string in all loaded domains unless the szDomain
+parameter is specified (and then only this catalog/domain is searched).
+
+Returns original string if translation is not available
+(in this case an error message is generated the first time
+a string is not found; use \helpref{wxLogNull}{wxlogoverview} to suppress it).
+
+\wxheading{Remarks}
+
+Domains are searched in the last to first order, i.e. catalogs
+added later override those added before.

--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -31,7 +31,7 @@
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{August 13th 2000}
+\date{July 9th 2000}
 }
 \makeindex
 \begin{document}
--- a/docs/latex/wx/postscpt.tex
+++ b/docs/latex/wx/postscpt.tex
@@ -35,17 +35,5 @@ get PostScript printing settings.
 This constructor and the global printer settings are now deprecated;
 use the wxPrintData constructor instead.

-\membersection{wxPostScriptDC::GetResolution}\label{wxpostscriptdcgetresolution}

-\func{static int}{GetResolution}{\void}
-
-Return resolution used in PostScript output. See 
-\helpref{SetResolution}{wxpostscriptdcsetresolution}.
-
-\membersection{wxPostScriptDC::SetResolution}\label{wxpostscriptdcsetresolution}
-
-\func{static void}{SetResolution}{\param{int}{ ppi}}
-
-Set resolution (in pixels per inch) that will be used in PostScript
-output. Default is 720ppi.

--- a/docs/latex/wx/spinbutt.tex
+++ b/docs/latex/wx/spinbutt.tex
@@ -6,9 +6,6 @@ Portable programs should try to use \helpref{wxSpinCtrl}{wxspinctrl} instead
 as wxSpinButton is not implemented for all platforms (Win32 and GTK only
 currently).

-{\bf NB:} the range supported by this control (and wxSpinCtrl) depends on the
-platform but is at least {\tt SHRT\_MIN} to {\tt SHRT\_MAX}.
-
 \wxheading{Derived from}

 \helpref{wxControl}{wxcontrol}\\
--- a/docs/latex/wx/tconstr.tex
+++ b/docs/latex/wx/tconstr.tex
@@ -2,8 +2,8 @@

 Classes: \helpref{wxLayoutConstraints}{wxlayoutconstraints}, \helpref{wxIndividualLayoutConstraint}{wxindividuallayoutconstraint}.

-Objects of class wxLayoutConstraint can be associated with a window to define
-the way it is laid out, with respect to its siblings or the parent.
+Objects of class wxLayoutConstraint can be associated with a window to define the
+way its subwindows are laid out, with respect to their siblings or parent.

 The class consists of the following eight constraints of class wxIndividualLayoutConstraint,
 some or all of which should be accessed directly to set the appropriate
@@ -34,12 +34,9 @@ label).

 The constrains calculation is done in \helpref{wxWindow::Layout}{wxwindowlayout} 
 function which evaluates constraints. To call it you can either call
-\helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout} if the parent window
-is a frame, panel or a dialog to tell default OnSize handlers to call Layout
-automatically whenever the window size changes, or override OnSize and call
-Layout yourself (note that you do have to call 
-\helpref{Layout}{wxwindowlayout} yourself if the parent window is not a
-frame, panel or dialog).
+wxWindow::SetAutoLayout to tell default OnSize handlers to call Layout
+automatically whenever the window size changes, or override OnSize and call Layout
+yourself.

 \subsection{Constraint layout: more detail}

--- a/docs/latex/wx/textfile.tex
+++ b/docs/latex/wx/textfile.tex
@@ -189,13 +189,10 @@ allows more "iterator-like" traversal of the list of lines, i.e. you may
 write something like:

 \begin{verbatim}
-wxTextFile file;
-...
-for ( str = file.GetFirstLine(); !file.Eof(); str = file.GetNextLine() )
+for ( str = GetFirstLine(); !Eof(); str = GetNextLine() )
 {
    // do something with the current line in str
 }
-// do something with the last line in str
 \end{verbatim}

 \membersection{wxTextFile::GetNextLine}\label{wxtextfilegetnextline}
@@ -215,21 +212,7 @@ Gets the previous line in the file.

 \func{wxString\&}{GetLastLine}{\void}

-Gets the last line of the file. Together with 
-\helpref{GetPrevLine}{wxtextfilegetprevline} it allows to enumerate the lines
-in the file from the end to the beginning like this:
-
-\begin{verbatim}
-wxTextFile file;
-...
-for ( str = file.GetLastLine();
-      file.GetCurrentLine() > 0;
-      str = file.GetPrevLine() )
-{
-    // do something with the current line in str
-}
-// do something with the first line in str
-\end{verbatim}
+Gets the last line of the file.

 \membersection{wxTextFile::GetLineType}\label{wxtextfilegetlinetype}

--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -168,16 +168,12 @@ Adds a separator for spacing groups of tools.

 \membersection{wxToolBar::AddTool}\label{wxtoolbaraddtool}

-\func{wxToolBarTool*}{AddTool}{\param{int}{ toolId}, \param{const wxBitmap\&}{ bitmap1},\rtfsp
-\param{const wxString\& }{shortHelpString = ""}, \param{const wxString\& }{longHelpString = ""}}
-
 \func{wxToolBarTool*}{AddTool}{\param{int}{ toolId}, \param{const wxBitmap\&}{ bitmap1},\rtfsp
 \param{const wxBitmap\&}{ bitmap2 = wxNullBitmap}, \param{bool}{ isToggle = FALSE},\rtfsp
 \param{long}{ xPos = -1}, \param{long}{ yPos = -1},\rtfsp
 \param{wxObject* }{clientData = NULL}, \param{const wxString\& }{shortHelpString = ""}, \param{const wxString\& }{longHelpString = ""}}

-Adds a tool to the toolbar. The first (short and most commonly used) version
-adds a normal (and not a togglable) button without any associated client data.
+Adds a tool to the toolbar.

 \wxheading{Parameters}

--- a/docs/latex/wx/upduievt.tex
+++ b/docs/latex/wx/upduievt.tex
@@ -19,8 +19,7 @@ functions that take a wxUpdateUIEvent argument.

 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf EVT\_UPDATE\_UI(id, func)}}{Process a wxEVT\_UPDATE\_UI event for the command with the given id.}
-\twocolitem{{\bf EVT\_UPDATE\_UI\_RANGE(id1, id2, func)}}{Process a wxEVT\_UPDATE\_UI event for any command with id included in the given range.}
+\twocolitem{{\bf EVT\_UPDATE\_UI(id, func)}}{Process a wxEVT\_UPDATE\_UI event.}
 \end{twocollist}%

 \wxheading{Remarks}
--- a/docs/motif/readme.txt
+++ b/docs/motif/readme.txt
@@ -1,7 +1,7 @@

-  Welcome to wxWindows/Motif 2.2.1
+  Welcome to wxWindows/Motif 2.2.0

-You have downloaded version 2.2.1 of the Motif port of
+You have downloaded version 2.2.0 of the Motif port of
 the wxWindows GUI library.

 More information about the wxWindows project as a whole
@@ -33,7 +33,7 @@ Alternatively, you may also use the bug reporting system
 linked from the wxWindows web page.

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

--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -45,9 +45,6 @@ Other add-on packages are available from the wxWindows Web site, such as:
 - tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from
  the same document source.

-For instructions on compiling wxBase (wxWindows-without-GUI),
-please see docs/base/install.txt.
-
 General installation notes
 --------------------------

@@ -138,7 +135,7 @@ To build the DLL version using makefiles:
   suitable precompiled header file for compiling applications.
   The resulting libraries are called:

-      wx\lib\wx[version]d.lib(dll) (debug version)
+      wx\lib\wx[version].lib(dll) (debug version)
      wx\lib\wx[version].lib(dll) (release version, using FINAL=1)

 2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
@@ -401,11 +398,9 @@ Watcom C++ 10.6/11 compilation

 1. Make sure your WXWIN variable is set, and uses the DOS short
   name form.
-2. Change directory to wx\src\msw. Type
-   'wmake -f makefile.wat all' to
+2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
   make the wxWindows core library.
-3. Change directory to wx\samples\minimal and type
-   'wmake -f makefile.wat all'
+3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
   to make this sample. Repeat for other samples of interest.

 Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
@@ -415,8 +410,8 @@ options, the linker gives up. So the date/time option is switched
 off for Watcom C++. Also, wxAutomationObject is not compiled with
 Watcom C++.
 Note (3): if Watcom can't read the precompiled header when
-building a sample or library, try deleting src\msw\watcom.pch and
-compiling again.
+building a sample, try deleting src\msw\watcom.pch and
+compiling the sample again.
 Note (4): if you get _popen_ and _pclose_ link errors, try
 recompiling wxWindows with XPM support disabled in setup.h.
 Alternatively, make sure these lines exist at the top of
@@ -479,14 +474,14 @@ the debugging version of the library is 90MB, with samples coming in
 at 40MB :-) However, wxWindows at least makes a good test suite for
 improving the compiler.

-Cygwin/Mingw32 compilation
+Cygwin b19/b20/Mingw32 compilation
 ----------------------------------

-wxWindows 2 supports Cygwin (formerly GnuWin32) betas and
-releases, and Mingw32.
+wxWindows 2 supports Cygwin (formerly GnuWin32) b19, b20, Mingw32,
+and Mingw32/EGCS. Cygwin 1.1.0 and 1.1.1 are not yet supported.

-Thanks are due to Keith Garry Boyce (garp@opustel.com), Cygnus
-and others for making it all possible.
+Thanks are due to Keith Garry Boyce (garp@opustel.com) and Cygnus for making
+it all possible.

 Both Cygwin and Mingw32 (the minimal distribution of Cygwin) can be used
 with the same makefiles.
@@ -496,10 +491,11 @@ Here are the steps required:
 - Retrieve and install the latest beta of Cygwin, or Mingw32, as per the
  instructions with either of these packages.

- If using Mingw32, you need some extra files to use the wxWindows
-  makefiles. You can find these files in ports/mingw32 on the ftp
-  site or CD-ROM, as extra.zip. These should be extracted to the Mingw32
-  directory. If you have alread downloaded bison, flex, make, rm, cp, mv
+- If using Mingw32 (including the EGCS variant), you need some
+  extra files to use the wxWindows makefiles. You can find these
+  files in ports/mingw32 on the ftp site or CD-ROM, as extra.zip.
+  These should be extracted to the Mingw32 directory.
+  If you have alread downloaded bison, flex, make, rm, cp, mv
  from elsewhere, you won't need this.

  If using Mingw32 2.95 and below with wxWindows 2.1 or above, you
@@ -517,9 +513,10 @@ Here are the steps required:
  supplied).

 - Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-  the file to either 1 (you have Mingw32 or Cygwin 1.x releases) or 0
-  (if you have Cygwin betas). If using Mingw32, also set the
-  MINGW32VERSION variable appropriately.
+  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
+  If using MINGW32, also set the MINGW32VERSION variable
+  appropriately. Note: Cygwin 1.1.0 and above may
+  need MINGW32 set to 1 to compile properly.

 - Set your WXWIN variable to where wxWindows is installed.
  *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
@@ -536,7 +533,7 @@ Here are the steps required:

 - Use the 'strip' command to reduce executable size.

- With Cygwin, you can invoke gdb --nw myfile.exe to
+- With Cygnus Cygwin, you can invoke gdb --nw myfile.exe to
  debug an executable. If there are memory leaks, they will be
  flagged when the program quits.

@@ -588,10 +585,11 @@ Notes:

 References:

- - The Cygwin site is at
-     http://sourceware.cygnus.com
+ - The GNU-WIN32 site is at
+     http://www.cygnus.com/gnu-win32/
 - Mingw32 is available at:
-     ftp://www.mingw.org
+     ftp://www,mingw.org
+ - See also http://web.ukonline.co.uk/julian.smart/wxwin/gnuwin32.htm

 TWIN32 and gcc on Linux
 -----------------------
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.2.1
+wxWindows 2.2.0
 ---------------

 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -34,9 +34,6 @@ wxWindows 2 currently supports the following platforms:
 - Mac (not covered here: please see the wxWindows web site
  for details)

-Additionally, the wxBase library containing only the non GUI classes can be
-built under Unix/Win32 and (with some limitation) BeOS.
-
 Most popular C++ compilers are supported; see the install.txt
 file for each platform (available via docs/html/index.htm) for details.
 See also http://www.lpthe.jussieu.fr/~zeitlin/wxWindows/platform.html.
@@ -48,7 +45,7 @@ The distribution is available in archive formats appropriate to the
 target system. Documentation is available mainly in zip format.
 Some add-on libraries (such as the Object Graphics Library) are
 available in zip form only. In the following, x.y.z represents
-the current version number (for example, 2.2.1).
+the current version number.

 wxWindows for GTK distribution
 ------------------------------
@@ -90,24 +87,6 @@ As well as the core source, the wxMSW distribution contains:
 - the JPEG library source;
 - the TIFF library source.

-wxBase (wxWindows without GUI) distribution
-------------------------------------------
-
-wxBase-x.y.z.tgz                    wxBase source distribution (the same files
-wxBase-x.y.z.zip                    but compressed using different formats)
-
-wxBase-x.y.z-0.i386.rpm             wxBase Linux binaries as an RPM
-wxBase-x.y.z-0.src.rpm              source for the i386 RPM above
-wxBase-devel-x.y.z-0.i386.rpm       wxBase headers (requires wxBase.rpm)
-
-wxBase doesn't include the documentation as you are likely to already have it
-from either wxGTK or wxMSW distributions. If you don't, please download the
-manual separately.
-
-NB: you can also build wxBase from the files included in either wxMSW or wxGTK
-    distribution (follow the same instructions as for wxBase distribution in
-    doc/base/install.txt)
-    
 Documentation files
 -------------------

@@ -147,7 +126,6 @@ the samples or write your own applications.
 For installation information, please see the install.txt file
 in the individual directories:

-  docs/base
  docs/msw
  docs/gtk
  docs/motif
@@ -228,5 +206,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.

 Good luck!

-The wxWindows Team, 13th August, 2000
+The wxWindows Team, 9th July, 2000

--- a/docs/tech/tn0003.txt
+++ b/docs/tech/tn0003.txt
@@ -45,15 +45,6 @@ For Word RTF:

  tex2rtf manual.tex manual.rtf -rtf -twice

-If you wish to have a GUI display show the status of what is happening
-as the conversion is happening, use the '-interactive' command line
-parameter, and then choose FILE|GO from the menu.  For example:
-
-   tex2rtf manual.tex manual.rtf -rtf -twice -interactive
-
-NOTE: You must be using the latest tex2rtf which was released with
-v2.2.0 of wxWindowsto use the -interactive switch
-
 If you wish to generate documentation for wxHTML Help Viewer
 (or Windows HTML Help), set htmlWorkshopFiles to true in your
 tex2rtf.ini file. See also the wxHTML Notes section in the
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -33,7 +33,7 @@ enum
    wxCMD_LINE_PARAM_OPTIONAL   = 0x02, // the parameter may be omitted
    wxCMD_LINE_PARAM_MULTIPLE   = 0x04, // the parameter may be repeated
    wxCMD_LINE_OPTION_HELP      = 0x08, // this option is a help request
-    wxCMD_LINE_NEEDS_SEPARATOR  = 0x10  // must have sep before the value
+    wxCMD_LINE_NEEDS_SEPARATOR  = 0x10, // must have sep before the value
 };

 // an option value or parameter may be a string (the most common case), a
@@ -96,20 +96,20 @@ public:

    // default ctor or ctor giving the cmd line in either Unix or Win form
    wxCmdLineParser() { Init(); }
-    wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }
+    wxCmdLineParser(int argc, char **argv) { Init(); SetCmdLine(argc, argv); }
    wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); }

    // the same as above, but also gives the cmd line description - otherwise,
    // use AddXXX() later
    wxCmdLineParser(const wxCmdLineEntryDesc *desc)
        { Init(); SetDesc(desc); }
-    wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)
+    wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, char **argv)
        { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
    wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline)
        { Init(); SetCmdLine(cmdline); SetDesc(desc); }

    // set cmd line to parse after using one of the ctors which don't do it
-    void SetCmdLine(int argc, wxChar **argv);
+    void SetCmdLine(int argc, char **argv);
    void SetCmdLine(const wxString& cmdline);

    // not virtual, don't use this class polymorphically
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -5,8 +5,6 @@
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson
 // Mods:        Dec, 1998:
 //                -Added support for SQL statement logging and database cataloging
 //                     April, 1999
@@ -44,7 +42,7 @@
 // BJO 20000503: introduce new GetColumns members which are more database independant and 
 //               return columns in the order they were created
 #define OLD_GETCOLUMNS 1
-#define EXPERIMENTAL_WXDB_FUNCTIONS 0
+

 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
@@ -53,7 +51,7 @@

 #if wxMAJOR_VERSION == 2
    #ifdef __GNUG__
-        #pragma interface "db.h"
+    #pragma interface "db.h"
    #endif
 #endif

@@ -270,8 +268,8 @@ class WXDLLEXPORT wxDbColFor
 public:
    wxString       s_Field;             // Formated String for Output
    wxString       s_Format[7];         // Formated Objects - TIMESTAMP has the biggest (7)
-    wxString       s_Amount[7];          // Formated Objects - amount of things that can be formatted
-    int            i_Amount[7];          // Formated Objects - TT MM YYYY HH MM SS m
+    wxString       s_Menge[7];          // Formated Objects - amount of things that can be formatted
+    int            i_Menge[7];          // Formated Objects - TT MM YYYY HH MM SS m
    int            i_Nation;            // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
    int            i_dbDataType;        // conversion of the 'sqlDataType' to the generic data type used by these classes
    SWORD          i_sqlDataType;
@@ -305,9 +303,6 @@ public:
    int          FkCol;       // Foreign key column       0=No; 1= First Key, 2 = Second Key etc.
    char         FkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Foreign key table name
    wxDbColFor  *pColFor;                              // How should this columns be formatted
-
-    wxDbColInf();
-    ~wxDbColInf();
 };


@@ -321,8 +316,6 @@ public:
    char        tableRemarks[254+1];
    int         numCols;                    // How many Columns does this Table have: GetColumnCount(..);
    wxDbColInf *pColInf;                    // pColInf = NULL ; User can later call GetColumns(..);
-    wxDbTableInf();
-    ~wxDbTableInf();
 };


@@ -333,9 +326,6 @@ public:
    char          schema[128+1];
    int           numTables;           // How many tables does this database have
    wxDbTableInf *pTableInf;           // pTableInf = new wxDbTableInf[numTables];
-
-    wxDbInf();
-    ~wxDbInf();
 };


@@ -403,7 +393,7 @@ private:
    unsigned int nTables;

    // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-     //
+	 //
    // This information is obtained from the ODBC driver by use of the
    // SQLGetTypeInfo() function.  The key piece of information is the
    // type name the data source uses for each logical data type.
@@ -442,9 +432,6 @@ public:
        char   databaseName[128];                        // Database filename
        char   outerJoins[2];                            // Indicates whether the data source supports outer joins
        char   procedureSupport[2];                      // Indicates whether the data source supports stored procedures
-#if EXPERIMENTAL_WXDB_FUNCTIONS  // will be added in 2.4
-        char   accessibleTables[2];                      // Indicates whether the data source only reports accessible tables in SQLTables.
-#endif
        UWORD  maxConnections;                           // Maximum # of connections the data source supports
        UWORD  maxStmts;                                 // Maximum # of HSTMTs per HDBC
        UWORD  apiConfLvl;                               // ODBC API conformance level
@@ -477,7 +464,7 @@ public:

 #if wxODBC_BACKWARD_COMPATABILITY
    // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
-     //
+	 //
    // This information is obtained from the ODBC driver by use of the
    // SQLGetTypeInfo() function.  The key piece of information is the
    // type name the data source uses for each logical data type.
@@ -489,7 +476,7 @@ public:
 #endif

    // Public member functions
-    wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
+    wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)TRUE);
    bool         Open(char *Dsn, char *Uid, char *AuthStr);  // Data Source Name, User ID, Password
    void         Close(void);
    bool         CommitTrans(void);
@@ -527,9 +514,6 @@ public:
    wxDbSqlTypeInfo GetTypeInfDate()   {return typeInfDate;}

    bool         TableExists(const char *tableName, const char *userID=NULL, const char *path=NULL);  // Table name can refer to a table, view, alias or synonym
-#if EXPERIMENTAL_WXDB_FUNCTIONS  // will be added in 2.4
-    bool         TablePrivileges(const char *tableName, const char* priv, const char *userID=NULL, const char *path=NULL);  // Table name can refer to a table, view, alias or synonym
-#endif
    void         LogError(const char *errMsg, const char *SQLState = 0) {logError(errMsg, SQLState);}
    void         SetDebugErrorMessages(bool state) { silent = !state; }
    bool         SetSqlLogging(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME, bool append = FALSE);
--- a/include/wx/dbtable.h
+++ b/include/wx/dbtable.h
@@ -3,8 +3,6 @@
 // Purpose:     Declaration of the wxDbTable class.
 // Author:      Doug Card
 // Modified by: George Tasker
-//              Bart Jourquin
-//              Mark Johnson
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
@@ -35,7 +33,7 @@

 #if wxMAJOR_VERSION == 2
    #ifdef __GNUG__
-        #pragma interface "dbtable.h"
+    #pragma interface "dbtable.h"
    #endif
 #endif

@@ -96,20 +94,20 @@ public:
 class WXDLLEXPORT wxDbTable
 {
 private:
-    ULONG       tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors
+    ULONG    tableID;  // Used for debugging.  This can help to match up mismatched constructors/destructors

    // Private member variables
-    UDWORD      cursorType;
-    bool        insertable;
+    UDWORD cursorType;
+    bool   insertable;

    // Private member functions
-    bool        bindInsertParams(void);
-    bool        bindUpdateParams(void);
-    bool        bindCols(HSTMT cursor);
-    bool        getRec(UWORD fetchType);
-    bool        execDelete(const char *pSqlStmt);
-    bool        execUpdate(const char *pSqlStmt);
-    bool        query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = 0);
+    bool bindInsertParams(void);
+    bool bindUpdateParams(void);
+    bool bindCols(HSTMT cursor);
+    bool getRec(UWORD fetchType);
+    bool execDelete(const char *pSqlStmt);
+    bool execUpdate(const char *pSqlStmt);
+    bool query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = 0);

 #if !wxODBC_BACKWARD_COMPATABILITY
 // these were public
@@ -190,32 +188,32 @@ public:
    bool            CreateIndex(const char * idxName, bool unique, int noIdxCols, wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE);
    bool            DropIndex(const char * idxName);

-    // Accessors
+// Accessors

    // The member variables returned by these accessors are all
    // set when the wxDbTable instance is createand cannot be 
    // changed, hence there is no corresponding SetXxxx function
-    wxDb           *GetDb()              { return pDb; }
-    const char     *GetTableName()       { return tableName; }
-    const char     *GetQueryTableName()  { return queryTableName; }
-    const char     *GetTablePath()       { return tablePath; }
+	 wxDb           *GetDb()              { return pDb; }
+	 const char     *GetTableName()       { return tableName; }
+	 const char     *GetQueryTableName()  { return queryTableName; }
+	 const char     *GetTablePath()       { return tablePath; }

-    int             GetNumberOfColumns() { return noCols; }  // number of "defined" columns for this wxDbTable instance
+         int GetNumberOfColumns() { return noCols; }  // number of "defined" columns for this wxDbTable instance
       

-    const char     *GetFromClause()      { return from; }
-    const char     *GetOrderByClause()   { return orderBy; }
-    const char     *GetWhereClause()     { return where; }
+	 const char     *GetFromClause()      { return from; }
+	 const char     *GetOrderByClause()   { return orderBy; }
+	 const char     *GetWhereClause()     { return where; }

-    bool            IsQueryOnly()        { return queryOnly; }
+	 bool            IsQueryOnly()        { return queryOnly; }
 #if wxODBC_BACKWARD_COMPATABILITY
    void            SetFromClause(const char *From) { from = (char *)From; }
-    void            SetOrderByClause(const char *OrderBy) { orderBy = (char *)OrderBy; }
-    void            SetWhereClause(const char *Where) { where = (char *)Where; }
+	 void            SetOrderByClause(const char *OrderBy) { orderBy = (char *)OrderBy; }
+	 void            SetWhereClause(const char *Where) { where = (char *)Where; }
 #else
-    void            SetFromClause(const wxString& From) { from = From; }
-    void            SetOrderByClause(const wxString& OrderBy) { orderBy = OrderBy; }
-    void            SetWhereClause(const wxString& Where) { where = Where; }
+	 void            SetFromClause(const wxString& From) { from = From; }
+	 void            SetOrderByClause(const wxString& OrderBy) { orderBy = OrderBy; }
+	 void            SetWhereClause(const wxString& Where) { where = Where; }
 #endif
    int             Insert(void);
    bool            Update(void);
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -100,9 +100,8 @@
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #   pragma warning(disable:4511)    // copy ctor couldn't be generated
 #   pragma warning(disable:4512)    // operator=() couldn't be generated
-#   pragma warning(disable:4699)    // using precompiled header
+#   pragma warning(disable:4699)    // Using precompiled header
 #   pragma warning(disable:4134)    // conversion between pointers to members of same class
-#   pragma warning(disable:4710)    // function not inlined
 #ifndef WIN32
 #   pragma warning(disable:4135)    // conversion between different integral types
 #   pragma warning(disable:4769)    // assignment of near pointer to long integer
@@ -143,7 +142,7 @@
 // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
 // we are setting this define because of the complex check
 // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
    #ifndef wxUSE_NORLANDER_HEADERS
        #define wxUSE_NORLANDER_HEADERS 1
    #endif
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -443,7 +443,7 @@ public:
    wxString GetString() const { return m_commandString; }

    // Get checkbox value
-    bool IsChecked() const { return m_commandInt != 0; }
+    bool Checked() const { return (m_commandInt != 0); }

    // TRUE if the listbox event was a selection.
    bool IsSelection() const { return (m_extraLong != 0); }
@@ -456,10 +456,6 @@ public:

    void CopyObject(wxObject& obj) const;

-#ifdef WXWIN_COMPATIBILITY_2
-    bool Checked() const { return IsChecked(); }
-#endif // WXWIN_COMPATIBILITY_2
-
 public:
    wxString          m_commandString; // String event argument
    int               m_commandInt;
@@ -1806,17 +1802,15 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
 { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
 { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
+ { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\

 // Idle event
 #define EVT_IDLE(func) \
- { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL },
+ { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL },\

 // Update UI event
 #define EVT_UPDATE_UI(id, func) \
- { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },
-#define EVT_UPDATE_UI_RANGE(id1, id2, func) \
- { wxEVT_UPDATE_UI, id1, id2, (wxObjectEventFunction)(wxEventFunction)(wxUpdateUIEventFunction)&func, (wxObject *) NULL },
+ { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\

 // ----------------------------------------------------------------------------
 // Global data
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -130,12 +130,6 @@ public:

  virtual int GetDepth() const { return 24; }

-  static void SetResolution(int ppi);
-  static int GetResolution();
-  
-private:  
-  static float ms_PSScaleFactor;
-
 protected:

  FILE*             m_pstream;    // PostScript output stream
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1290,27 +1290,12 @@ public:
    void SelectRow( int row, bool addToSelected = FALSE );
    void SelectCol( int col, bool addToSelected = FALSE );

-    // MB: This ugly confusion of SelectBlock functions will be absent
-    // in post wx-2.2 releases
-    //
-    void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
-                      bool addToSelected );
-
-    void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
-        { SelectBlock( topRow, leftCol, bottomRow, rightCol, FALSE ); }
-
-    void SelectBlock( const wxGridCellCoords& topLeft,
-                      const wxGridCellCoords& bottomRight,
-                      bool addToSelected )
-        { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),
-                       bottomRight.GetRow(), bottomRight.GetCol(),
-                       addToSelected ); }
+    void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol );

    void SelectBlock( const wxGridCellCoords& topLeft,
                      const wxGridCellCoords& bottomRight )
        { SelectBlock( topLeft.GetRow(), topLeft.GetCol(),
-                       bottomRight.GetRow(), bottomRight.GetCol(),
-                       FALSE ); }
+                       bottomRight.GetRow(), bottomRight.GetCol() ); }

    void SelectAll();

@@ -1537,6 +1522,11 @@ protected:
    wxGridTableBase          *m_table;
    bool                      m_ownTable;

+    int m_left;
+    int m_top;
+    int m_right;
+    int m_bottom;
+
    int m_numRows;
    int m_numCols;

@@ -1734,12 +1724,6 @@ protected:
    void SetCurrentCell( int row, int col )
        { SetCurrentCell( wxGridCellCoords(row, col) ); }

-    void HighlightBlock( int topRow, int leftCol, int bottomRow, int rightCol );
-
-    void HighlightBlock( const wxGridCellCoords& topLeft,
-                      const wxGridCellCoords& bottomRight )
-        { HighlightBlock( topLeft.GetRow(), topLeft.GetCol(),
-                       bottomRight.GetRow(), bottomRight.GetCol() ); }

    // ------ functions to get/send data (see also public functions)
    //
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -116,7 +116,6 @@ public:
    virtual void SetMenuBar( wxMenuBar *menu_bar );
    virtual wxMenuBar *GetMenuBar() const;

-    wxSize GetClientSize() const { return wxFrame::GetClientSize(); }
    virtual void GetClientSize( int *width, int *height ) const;
    virtual void AddChild( wxWindowBase *child );

--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -116,7 +116,6 @@ public:
    virtual void SetMenuBar( wxMenuBar *menu_bar );
    virtual wxMenuBar *GetMenuBar() const;

-    wxSize GetClientSize() const { return wxFrame::GetClientSize(); }
    virtual void GetClientSize( int *width, int *height ) const;
    virtual void AddChild( wxWindowBase *child );

--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -77,9 +77,6 @@ public:
        // restores old locale
    ~wxLocale();

-    // return TRUE if the locale was set successfully
-    bool IsOk() const { return m_pszOldLocale != NULL; }
-
    // returns locale name
    const wxChar *GetLocale() const { return m_strLocale; }

@@ -113,7 +110,7 @@ public:
    // domains are searched in the last to first order, i.e. catalogs
    // added later override those added before.
    const wxMB2WXbuf GetString(const wxChar *szOrigString,
-                               const wxChar *szDomain = (const wxChar *) NULL) const;
+			       const wxChar *szDomain = (const wxChar *) NULL) const;

    // Returns the current short name for the locale
    const wxString& GetName() const { return m_strShort; }
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/minifram.h
+// Name:        minifram.h
 // Purpose:     wxMiniFrame class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_MINIFRAM_H_
@@ -20,51 +20,55 @@

 #ifdef __WIN32__

-class WXDLLEXPORT wxMiniFrame : public wxFrame
-{
+class WXDLLEXPORT wxMiniFrame: public wxFrame {
+
+  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+
 public:
-  wxMiniFrame() { }
-  wxMiniFrame(wxWindow *parent,
-              wxWindowID id,
-              const wxString& title,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER,
-              const wxString& name = wxFrameNameStr)
+  inline wxMiniFrame(void) {}
+  inline wxMiniFrame(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxDEFAULT_FRAME_STYLE,
+           const wxString& name = wxFrameNameStr)
  {
      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name);
  }

 protected:
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 };


-#else // !Win32
+#else
+
+class WXDLLEXPORT wxMiniFrame: public wxFrame {
+
+  DECLARE_DYNAMIC_CLASS(wxMiniFrame)

-class WXDLLEXPORT wxMiniFrame : public wxFrame
-{
 public:
-  wxMiniFrame() { }
-  wxMiniFrame(wxWindow *parent,
-              wxWindowID id,
-              const wxString& title,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
-              const wxString& name = wxFrameNameStr)
+  inline wxMiniFrame(void) {}
+  inline wxMiniFrame(wxWindow *parent,
+           wxWindowID id,
+           const wxString& title,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
+           const wxString& name = wxFrameNameStr)
  {
      Create(parent, id, title, pos, size, style, name);
  }

-  virtual ~wxMiniFrame();
+  ~wxMiniFrame(void);

-  virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+  long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+protected:
 };

-#endif // Win32/!Win32
+#endif
+

 #endif
    // _WX_MINIFRAM_H_
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -100,15 +100,8 @@ public:
 #endif // WXWIN_COMPATIBILITY

 protected:
-    // subclass one radio button
    void SubclassRadioButton(WXHWND hWndBtn);

-    // get the max size of radio buttons
-    wxSize GetMaxButtonSize() const;
-
-    // get the total size occupied by the radio box buttons
-    wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
-
    WXHWND *          m_radioButtons;
    int               m_majorDim;
    int *             m_radioWidth;  // for bitmaps
@@ -121,7 +114,6 @@ protected:
    virtual void DoSetSize(int x, int y,
                           int width, int height,
                           int sizeFlags = wxSIZE_AUTO);
-    virtual wxSize DoGetBestSize() const;
 };

 #endif
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _WX_SETUP_H_
@@ -49,22 +49,6 @@
 // Recommended setting: 0
 #define wxICON_IS_BITMAP    0

-// Define as 1 for font size to be backward compatible to 1.63 and earlier.
-// 1.64 and later define point sizes to be compatible with Windows.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxFONT_SIZE_COMPATIBILITY    0
-
-// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
-// If migrating between versions, your dialogs may seem to shrink.
-//
-// Default is 1
-//
-// Recommended setting: 0 (the new calculations are more correct!)
-#define wxDIALOG_UNIT_COMPATIBILITY   1
-
 // ----------------------------------------------------------------------------
 // debugging settings
 // ----------------------------------------------------------------------------
@@ -256,15 +240,16 @@

 // If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
 // to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNLIB_CLASS.
+// network connection is established/terminated.
 //
 // Default is 1.
 //
 // Recommended setting: 1
 #define wxUSE_DIALUP_MANAGER   1

-// Compile in wxLibrary class for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
+// Compile in wxLibrary class for run-time DLL loading and function calling
+//
+// This setting is for Win32 only
 //
 // Default is 1.
 //
@@ -274,58 +259,33 @@
 // Set to 1 to use socket classes
 #define wxUSE_SOCKETS       1

-#if wxUSE_GUI
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
+// Set to 1 to enable virtual file systems
+// (needed by wxHTML)
 #define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1

-// Set to 1 to compile wxZipInput/OutputStream classes.
+// input stream for reading from zip archives
 #define wxUSE_ZIPSTREAM     1

-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG.
-#define wxUSE_ZLIB          1
-
-#else // !wxUSE_GUI
-
-// although it is possible to compile all of those in wxBase, this is not done
-// by default
-#define wxUSE_FILESYSTEM    0
-#define wxUSE_FS_ZIP        0
-#define wxUSE_FS_INET       0
-#define wxUSE_ZIPSTREAM     0
-#define wxUSE_ZLIB          0
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWindows one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
 #define wxUSE_APPLE_IEEE          1
+                                // if enabled, the float codec written by Apple
+                                // will be used to write, in a portable way,
+                                // float on the disk

-// Use wxFile class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (highly recommended, required i18n code, wxConfig...)
+// use wxFile class - required by i18n code, wxConfig and others - recommended
 #define wxUSE_FILE                1

-// use wxTextFile class: requires wxFile, required by wxFileConfig
+// use wxTextFile class: requires wxFile, required by wxConfig
 #define wxUSE_TEXTFILE            1

-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
+// i18n support: _() macro, wxLocale class. Requires wxFile
 #define wxUSE_INTL                1

+#define wxUSE_DYNAMIC_CLASSES     1
+                                // If 1, enables provision of run-time type information.
+                                // NOW MANDATORY: don't change.
+
 // ----------------------------------------------------------------------------
 // Optional controls
 // ----------------------------------------------------------------------------
@@ -363,7 +323,7 @@
 // of disabled controls)
 #define wxUSE_CARET        1
 #define wxUSE_CHECKBOX     1
-#define wxUSE_CHECKLISTBOX 1        // requires wxUSE_OWNER_DRAWN
+#define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_GAUGE        1
@@ -399,7 +359,7 @@
 // Default is 1 for both options.
 //
 // Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using
-// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is
+// wxGrid and 100% backwards compatible (with all old wxGrid quirks) is
 // essential.
 //
 // WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit.
@@ -544,41 +504,42 @@
                                // Use .wxr resource mechanism (requires PrologIO library)

 // ----------------------------------------------------------------------------
-// postscript support settings
+// Postscript support settings
 // ----------------------------------------------------------------------------

-// Set to 1 for PostScript device context.
 #define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
+                                // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
+                                // 1 to use font metric files in GetTextExtent

-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+                                // Set to 0 to disable PostScript print/preview architecture code
+                                // under Windows (just use Windows printing).

 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------

-// Define 1 to use ODBC classes
 #define wxUSE_ODBC          0
+                                // Define 1 to use ODBC classes

-// For backward compatibility reasons, this parameter now only controls the
-// default scrolling method used by cursors.  This default behavior can be
-// overriden by setting the second param of wxDB::wxDbGetConnection() or 
-// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
-// that use the connection) should support forward only scrolling of cursors, 
-// or both forward and backward support for backward scrolling cursors is 
-// dependent on the data source as well as the ODBC driver being used.
 #define wxODBC_FWD_ONLY_CURSORS	 1
+                                // For backward compatibility reasons, this parameter now only
+                                // controls the default scrolling method used by cursors.  This
+                                // default behavior can be overriden by setting the second param
+                                // of wxDB::GetDbConnection() to indicate whether the connection
+                                // (and any wxTable()s that use the connection) should support
+                                // forward only scrolling of cursors, or both forward and backward
+                                // Support for backward scrolling cursors is dependent on the
+                                // data source as well as the ODBC driver being used.

-// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
-// member variables.  With a setting of 1, full backward compatability with the
-// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
-// as future development will be done only on the non-deprecated
-// functions/classes/member variables/etc.
 #define wxODBC_BACKWARD_COMPATABILITY 0
+                                // Default is 0.  Set to 1 to use the deprecated classes, enum
+                                // types, function, member variables.  With a setting of 1, full
+                                // backward compatability with the 2.0.x release is possible.
+                                // It is STRONGLY recommended that this be set to 0, as 
+                                // future development will be done only on the non-deprecated
+                                // functions/classes/member variables/etc.

 // ----------------------------------------------------------------------------
 // other compiler (mis)features
@@ -604,127 +565,77 @@
 // image format support
 // ----------------------------------------------------------------------------

-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
+#define wxUSE_ZLIB          1
+                                // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
+                                // Use PNG bitmap/image code
 #define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
+                                // Use JPEG bitmap/image code
 #define wxUSE_LIBTIFF       1
-
-// Set to 1 for GIF format support
+                                // Use TIFF bitmap/image code
 #define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
+                                // Use GIF bitmap/image code
 #define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
+                                // Use PNM bitmap/image code
 #define wxUSE_PCX           1
+                                // Use PCX bitmap/image code

 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------

-// Set this to 1 if you want to use wxWindows and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
+// Make settings compatible with MFC
 #define wxUSE_MFC           0

-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
+// required for drag-and-drop, clipboard, OLE Automation
 #define wxUSE_OLE           1

-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
 #if defined(__WIN95__)
 #define wxUSE_CTL3D                      0
 #else
+// Define 1 to use Microsoft CTL3D library.
 #define wxUSE_CTL3D                      1
 #endif

-// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
-// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
-// miniframes support instead.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_ITSY_BITSY             0
-#else
-#define wxUSE_ITSY_BITSY             1
-#endif
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
+// can we use RICHEDIT control?
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
 #endif

-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// ----------------------------------------------------------------------------
-// obsolete settings
-// ----------------------------------------------------------------------------
-
-// NB: all settings in this section are obsolete and should not be used/changed
-//     at all, they will disappear
-
-// Set to 1 to use PenWindows
-#define wxUSE_PENWINDOWS             0
-
-// Define 1 to use bitmap messages.
+#define wxUSE_ITSY_BITSY             1
+                                // Define 1 to use Microsoft's ItsyBitsy
+                                // small title bar library, for wxMiniFrame.
+                                // This setting is only used for Win3.1;
+                                // Win9x and NT use native miniframes
+                                // support instead.
 #define wxUSE_BITMAP_MESSAGE         1
+                                // Define 1 to use bitmap messages.
+#define wxFONT_SIZE_COMPATIBILITY    0
+                                // Define 1 for font size to be backward compatible
+                                // to 1.63 and earlier. 1.64 and later define point
+                                // sizes to be compatible with Windows.
+#define wxDIALOG_UNIT_COMPATIBILITY   0
+                                // Set to 0 for accurate dialog units, else
+                                // 1 to be as per 2.1.16 and before. If migrating
+                                // between versions, your dialogs may seem to shrink.
+#define wxUSE_PENWINDOWS             0
+                                // Set to 1 to use PenWindows

-// If 1, enables provision of run-time type information.
-// NOW MANDATORY: don't change.
-#define wxUSE_DYNAMIC_CLASSES     1
+#define wxUSE_OWNER_DRAWN             1
+                                // Owner-drawn menus and listboxes

-// ----------------------------------------------------------------------------
-// disable the settings which don't work for some compilers
-// ----------------------------------------------------------------------------
-
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
 #ifndef wxUSE_NORLANDER_HEADERS
 #   define wxUSE_NORLANDER_HEADERS 1
 #endif
 #endif

+// ----------------------------------------------------------------------------
+// disable the settings which don't work for some compilers
+// ----------------------------------------------------------------------------
+
 #if defined(__GNUWIN32__)
 // These don't work as expected for mingw32 and cygwin32
 #undef  wxUSE_MEMORY_TRACING
@@ -739,16 +650,14 @@
 #undef wxUSE_MS_HTML_HELP
 #define wxUSE_MS_HTML_HELP 0

-// Cygwin betas don't have wcslen
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#  if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
-#    undef wxUSE_WCHAR_T
-#    define wxUSE_WCHAR_T 0
-#  endif
-#endif
-
 #endif // __GNUWIN32__

+// Cygwin b20 doesn't have wcslen
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)
+#undef wxUSE_WCHAR_T
+#define wxUSE_WCHAR_T 0
+#endif
+
 // MFC duplicates these operators
 #if wxUSE_MFC
 #undef  wxUSE_GLOBAL_MEMORY_OPERATORS
@@ -835,7 +744,7 @@
 #define wxUSE_MS_HTML_HELP 0
 #endif

-// wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
+// wxUSE_DBEUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
 #if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
 #undef wxUSE_DEBUG_NEW_ALWAYS
 #define wxUSE_DEBUG_NEW_ALWAYS 0
@@ -900,17 +809,6 @@

 #endif // Win16

-// ----------------------------------------------------------------------------
-// undef the things which don't make sense for wxBase build
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_GUI
-
-#undef wxUSE_HTML
-#define wxUSE_HTML 0
-
-#endif // !wxUSE_GUI
-
 // ----------------------------------------------------------------------------
 // check the settings consistency: do it here to abort compilation immediately
 // and not almost in the very end when the relevant file fails to compile and
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -237,7 +237,6 @@ public:
    wxSTC_UndoType GetUndoCollection();
    void     BeginUndoAction();
    void     EndUndoAction();
-    void     SetSavePoint();


    // Selection and information
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -221,16 +221,6 @@ public:
    // toolbar construction
    // --------------------

-    // the most commonly used version of AddTool()
-    wxToolBarToolBase *AddTool(int id,
-                               const wxBitmap& bitmap,
-                               const wxString& shortHelpString = wxEmptyString,
-                               const wxString& longHelpString = wxEmptyString)
-    {
-        return AddTool(id, bitmap, wxNullBitmap, FALSE, NULL,
-                       shortHelpString, longHelpString);
-    }
-
    // If pushedBitmap is NULL, a reversed version of bitmap is created and
    // used as the pushed/toggled image. If toggle is TRUE, the button toggles
    // between the two states.
--- a/lib/wx22.def
+++ b/lib/wx22.def
@@ -68,6 +68,8 @@ EXPORTS
      RemoveAt__14wxArrayOptionsFUi
      ;wxArrayParams::Insert(const wxCmdLineParam&,unsigned int)
      Insert__13wxArrayParamsFRC14wxCmdLineParamUi
+      ;wxArrayOptions::Empty()
+      Empty__14wxArrayOptionsFv
      ;wxCmdLineParserData::wxCmdLineParserData()
      __ct__19wxCmdLineParserDataFv
      ;wxCmdLineParser::SetCmdLine(const wxString&)
@@ -82,8 +84,6 @@ EXPORTS
      Insert__14wxArrayOptionsFRC15wxCmdLineOptionUi
      ;wxArrayParams::Add(const wxCmdLineParam&)
      Add__13wxArrayParamsFRC14wxCmdLineParam
-      ;wxArrayParams::DoEmpty()
-      DoEmpty__13wxArrayParamsFv
      ;wxArrayOptions::~wxArrayOptions()
      __dt__14wxArrayOptionsFv
      ;wxCmdLineParser::Usage()
@@ -106,12 +106,12 @@ EXPORTS
      __dt__15wxCmdLineParserFv
      ;wxArrayParams::~wxArrayParams()
      __dt__13wxArrayParamsFv
+      ;wxArrayParams::Empty()
+      Empty__13wxArrayParamsFv
      ;wxArrayParams::operator=(const wxArrayParams&)
      __as__13wxArrayParamsFRC13wxArrayParams
      ;wxCmdLineParser::AddOption(const wxString&,const wxString&,const wxString&,wxCmdLineParamType,int)
      AddOption__15wxCmdLineParserFRC8wxStringN2118wxCmdLineParamTypei
-      ;wxArrayOptions::DoEmpty()
-      DoEmpty__14wxArrayOptionsFv
      ;wxCmdLineParser::GetParamCount() const
      GetParamCount__15wxCmdLineParserCFv
      ;wxArrayOptions::DoCopy(const wxArrayOptions&)
@@ -339,8 +339,6 @@ EXPORTS
      GetDays__10wxTimeSpanCFv
      ;wxDateTime::GetCurrentMonth(wxDateTime::Calendar)
      GetCurrentMonth__10wxDateTimeFQ2_10wxDateTime8Calendar
-      ;wxDateTimeArray::DoEmpty()
-      DoEmpty__15wxDateTimeArrayFv
      ;wxDateTime::Add(const wxTimeSpan&) const
      Add__10wxDateTimeCFRC10wxTimeSpan
      ;wxDateTime::SetMinute(unsigned short)
@@ -381,8 +379,6 @@ EXPORTS
      GetHours__10wxTimeSpanCFv
      ;wxDateTime::GetCurrentYear(wxDateTime::Calendar)
      GetCurrentYear__10wxDateTimeFQ2_10wxDateTime8Calendar
-      ;wxDateSpan::Add(const wxDateSpan&)
-      Add__10wxDateSpanFRC10wxDateSpan
      ;wxDateTime::SetDay(unsigned short)
      SetDay__10wxDateTimeFUs
      ;wxDateTime::SetHour(unsigned short)
@@ -451,8 +447,8 @@ EXPORTS
      GetNumberOfDays__10wxDateTimeFiQ2_10wxDateTime8Calendar
      ;wxDateTime::GetCountry()
      GetCountry__10wxDateTimeFv
-      ;wxDateSpan::Add(const wxDateSpan&) const
-      Add__10wxDateSpanCFRC10wxDateSpan
+      ;wxDateTimeArray::Empty()
+      Empty__15wxDateTimeArrayFv
      ;wxDateTime::ParseRfc822Date(const char*)
      ParseRfc822Date__10wxDateTimeFPCc
      ;wxDateTime::ParseTime(const char*)
@@ -490,12 +486,8 @@ EXPORTS
      __apl__10wxDateTimeFRC10wxTimeSpan
      ;wxDateTime::operator-=(const wxDateSpan&)
      __ami__10wxDateTimeFRC10wxDateSpan
-      ;wxDateSpan::operator-=(const wxDateSpan&)
-      __ami__10wxDateSpanFRC10wxDateSpan
      ;wxTimeSpan::Subtract(const wxTimeSpan&) const
      Subtract__10wxTimeSpanCFRC10wxTimeSpan
-      ;wxDateSpan::Subtract(const wxDateSpan&) const
-      Subtract__10wxDateSpanCFRC10wxDateSpan
      ;wxDateTime::SetToCurrent()
      SetToCurrent__10wxDateTimeFv
      ;wxDateSpan::Negate() const
@@ -555,14 +547,10 @@ EXPORTS
      __apl__10wxDateSpanFRC10wxDateSpan
      ;wxDateTime::operator-=(const wxTimeSpan&)
      __ami__10wxDateTimeFRC10wxTimeSpan
-      ;wxDateTime::UNow()
-      UNow__10wxDateTimeFv
      ;wxDateTime::Today()
      Today__10wxDateTimeFv
      ;wxDateTime::Subtract(const wxTimeSpan&) const
      Subtract__10wxDateTimeCFRC10wxTimeSpan
-      ;wxDateSpan::Subtract(const wxDateSpan&)
-      Subtract__10wxDateSpanFRC10wxDateSpan
      ;wxDateTime::IsEqualUpTo(const wxDateTime&,const wxTimeSpan&) const
      IsEqualUpTo__10wxDateTimeCFRC10wxDateTimeRC10wxTimeSpan
      ;wxDateTime::GetWeekDay(wxDateTime::WeekDay,int,wxDateTime::Month,int) const
@@ -577,12 +565,12 @@ EXPORTS
      Add__10wxDateTimeFRC10wxDateSpan
      ;wxTimeSpan::Abs() const
      Abs__10wxTimeSpanCFv
-      ;wxDateTime::GetYearDay(unsigned short) const
-      GetYearDay__10wxDateTimeCFUs
-      ;wxDateTime::SetToYearDay(unsigned short)
-      SetToYearDay__10wxDateTimeFUs
      ;wxTimeSpan::Format(const char*) const
      Format__10wxTimeSpanCFPCc
+      ;wxDateTime::SetToYearDay(unsigned short)
+      SetToYearDay__10wxDateTimeFUs
+      ;wxDateTime::GetYearDay(unsigned short) const
+      GetYearDay__10wxDateTimeCFUs
  ;From object file:  ..\common\datstrm.cpp
    ;PUBDEFs (Symbols available from object file):
      ;wxDataOutputStream::operator<<(unsigned int)
@@ -2240,8 +2228,6 @@ EXPORTS
    ;PUBDEFs (Symbols available from object file):
      ;wxBMPHandler::sm_classwxBMPHandler
      sm_classwxBMPHandler__12wxBMPHandler
-      ;wxBMPHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
-      SaveFile__12wxBMPHandlerFP7wxImageR14wxOutputStreamUl
      ;wxConstructorForwxBMPHandler()
      wxConstructorForwxBMPHandler__Fv
      ;wxBMPHandler::LoadFile(wxImage*,wxInputStream&,unsigned long,int)
@@ -3040,11 +3026,9 @@ EXPORTS
      ExpandCommand__10wxFileTypeFRC8wxStringRCQ2_10wxFileType17MessageParameters
      ;wxMimeTypesManager::IsOfType(const wxString&,const wxString&)
      IsOfType__18wxMimeTypesManagerFRC8wxStringT1
-      ;wxArrayFileTypeInfo::DoEmpty()
-      DoEmpty__19wxArrayFileTypeInfoFv
-      wxTheMimeTypesManager
      ;wxArrayFileTypeInfo::~wxArrayFileTypeInfo()
      __dt__19wxArrayFileTypeInfoFv
+      wxTheMimeTypesManager
      ;wxFileType::wxFileType()
      __ct__10wxFileTypeFv
      ;wxFileType::GetIcon(wxIcon*) const
@@ -3073,12 +3057,14 @@ EXPORTS
      RemoveAt__19wxArrayFileTypeInfoFUi
      ;wxMimeTypeCmnModule::sm_classwxMimeTypeCmnModule
      sm_classwxMimeTypeCmnModule__19wxMimeTypeCmnModule
-      ;wxMimeTypesManager::wxMimeTypesManager()
-      __ct__18wxMimeTypesManagerFv
+      ;wxArrayFileTypeInfo::Empty()
+      Empty__19wxArrayFileTypeInfoFv
      ;wxConstructorForwxMimeTypeCmnModule()
      wxConstructorForwxMimeTypeCmnModule__Fv
      ;wxMimeTypesManager::~wxMimeTypesManager()
      __dt__18wxMimeTypesManagerFv
+      ;wxMimeTypesManager::wxMimeTypesManager()
+      __ct__18wxMimeTypesManagerFv
      ;wxArrayFileTypeInfo::operator=(const wxArrayFileTypeInfo&)
      __as__19wxArrayFileTypeInfoFRC19wxArrayFileTypeInfo
      ;wxFileType::GetOpenCommand(wxString*,const wxFileType::MessageParameters&) const
@@ -3308,8 +3294,6 @@ EXPORTS
      __vft10wxPrintout8wxObject
      ;wxPrintout::HasPage(int)
      HasPage__10wxPrintoutFi
-      ;wxPrinterBase::sm_lastError
-      sm_lastError__13wxPrinterBase
      ;wxPrinterBase::sm_abortWindow
      sm_abortWindow__13wxPrinterBase
      ;wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout*,wxPrintout*,wxPrintDialogData*)
@@ -3418,13 +3402,13 @@ EXPORTS
      PaintPage__18wxPrintPreviewBaseFP8wxWindowR4wxDC
  ;From object file:  ..\common\process.cpp
    ;PUBDEFs (Symbols available from object file):
-      ;wxProcess::SetPipeStreams(wxInputStream*,wxOutputStream*,wxInputStream*)
-      SetPipeStreams__9wxProcessFP13wxInputStreamP14wxOutputStreamT1
      ;wxConstructorForwxProcess()
      wxConstructorForwxProcess__Fv
      ;wxProcess::Init(wxEvtHandler*,int,unsigned long)
      Init__9wxProcessFP12wxEvtHandleriUl
      __vft9wxProcess8wxObject
+      ;wxProcess::SetPipeStreams(wxInputStream*,wxOutputStream*)
+      SetPipeStreams__9wxProcessFP13wxInputStreamP14wxOutputStream
      ;wxProcess::~wxProcess()
      __dt__9wxProcessFv
      ;wxConstructorForwxProcessEvent()
@@ -4334,8 +4318,6 @@ EXPORTS
      insert__8wxStringFUiRC8wxString
      ;operator+(const wxString&,const char*)
      __pl__FRC8wxStringPCc
-      ;wxArrayString::operator==(const wxArrayString&) const
-      __eq__13wxArrayStringCFRC13wxArrayString
      ;wxString::operator=(const wchar_t*)
      __as__8wxStringFPCw
      ;wxString::StartsWith(const char*,wxString*) const
@@ -4609,14 +4591,12 @@ EXPORTS
      ;wxTextInputStream::operator>>(unsigned int&)
      __rs__17wxTextInputStreamFRUi
      __vft18wxTextOutputStream
-      ;wxTextInputStream::EatEOL(const char&)
-      EatEOL__17wxTextInputStreamFRCc
+      ;wxTextInputStream::operator>>(wxString&)
+      __rs__17wxTextInputStreamFR8wxString
      ;wxTextInputStream::operator>>(short&)
      __rs__17wxTextInputStreamFRs
      ;wxTextInputStream::operator>>(unsigned short&)
      __rs__17wxTextInputStreamFRUs
-      ;wxTextInputStream::operator>>(wxString&)
-      __rs__17wxTextInputStreamFR8wxString
      ;wxTextOutputStream::operator<<(const wxString&)
      __ls__18wxTextOutputStreamFRC8wxString
      ;wxTextOutputStream::Write8(unsigned char)
@@ -4769,8 +4749,6 @@ EXPORTS
      wxMessageBox__FRC8wxStringT1lP8wxWindowiT5
      ;wxNewId()
      wxNewId__Fv
-      ;wxExecute(const wxString&,wxArrayString&,wxArrayString&)
-      wxExecute__FRC8wxStringR13wxArrayStringT2
      ;wxHexToDec(const wxString&)
      wxHexToDec__FRC8wxString
      ;wxExecute(const wxString&,wxArrayString&)
@@ -5687,8 +5665,6 @@ EXPORTS
      ;wxZipInputStream::OnSysRead(void*,unsigned int)
      OnSysRead__16wxZipInputStreamFPvUi
      __vft16wxZipInputStream12wxStreamBase
-      ;wxZipInputStream::Eof() const
-      Eof__16wxZipInputStreamCFv
  ;From object file:  ..\common\zstream.cpp
    ;PUBDEFs (Symbols available from object file):
      ;wxZlibInputStream::wxZlibInputStream(wxInputStream&)
@@ -5741,8 +5717,6 @@ EXPORTS
      Create__14wxCalendarCtrlFP8wxWindowiRC10wxDateTimeRC7wxPointRC6wxSizelRC8wxString
      ;wxCalendarCtrl::Show(unsigned long)
      Show__14wxCalendarCtrlFUl
-      ;wxCalendarEvent::sm_classwxCalendarEvent
-      sm_classwxCalendarEvent__15wxCalendarEvent
      ;wxCalendarCtrl::OnDClick(wxMouseEvent&)
      OnDClick__14wxCalendarCtrlFR12wxMouseEvent
      ;wxCalendarCtrl::RefreshDate(const wxDateTime&)
@@ -5753,8 +5727,6 @@ EXPORTS
      DoSetSize__14wxCalendarCtrlFiN41
      ;wxMonthComboBox::GetEventTable() const
      GetEventTable__15wxMonthComboBoxCFv
-      ;wxConstructorForwxCalendarEvent()
-      wxConstructorForwxCalendarEvent__Fv
      ;wxCalendarCtrl::~wxCalendarCtrl()
      __dt__14wxCalendarCtrlFv
      ;wxCalendarCtrl::SetHolidayAttrs()
@@ -5843,14 +5815,6 @@ EXPORTS
      __dt__7wxCaretFv
      ;wxCaretTimer::wxCaretTimer(wxCaret*)
      __ct__12wxCaretTimerFP7wxCaret
-      ;wxCaret::OnTimer()
-      OnTimer__7wxCaretFv
-      ;wxCaret::Refresh()
-      Refresh__7wxCaretFv
-      ;wxCaret::OnSetFocus()
-      OnSetFocus__7wxCaretFv
-      ;wxCaret::OnKillFocus()
-      OnKillFocus__7wxCaretFv
      ;wxCaret::DoShow()
      DoShow__7wxCaretFv
      ;wxCaret::DoHide()
@@ -6126,12 +6090,14 @@ EXPORTS
      __dt__18wxGenericDragImageFv
      ;wxGenericDragImage::Create(const wxIcon&,const wxCursor&,const wxPoint&)
      Create__18wxGenericDragImageFRC6wxIconRC8wxCursorRC7wxPoint
-      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
-      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
+      ;wxGenericDragImage::wxGenericDragImage()
+      __ct__18wxGenericDragImageFv
      ;wxGenericDragImage::Show()
      Show__18wxGenericDragImageFv
      ;wxGenericDragImage::Hide()
      Hide__18wxGenericDragImageFv
+      ;wxGenericDragImage::BeginDrag(const wxPoint&,wxWindow*,wxWindow*)
+      BeginDrag__18wxGenericDragImageFRC7wxPointP8wxWindowT2
      ;wxGenericDragImage::Create(const wxTreeCtrl&,wxTreeItemId&)
      Create__18wxGenericDragImageFRC10wxTreeCtrlR12wxTreeItemId
      __vft18wxGenericDragImage8wxObject
@@ -6147,12 +6113,6 @@ EXPORTS
      Init__18wxGenericDragImageFv
      ;wxGenericDragImage::EndDrag()
      EndDrag__18wxGenericDragImageFv
-      ;wxGenericDragImage::UpdateBackingFromWindow(wxDC&,wxMemoryDC&,const wxRect&,const wxRect&) const
-      UpdateBackingFromWindow__18wxGenericDragImageCFR4wxDCR10wxMemoryDCRC6wxRectT3
-      ;wxGenericDragImage::Create(const wxCursor&,const wxPoint&)
-      Create__18wxGenericDragImageFRC8wxCursorRC7wxPoint
-      ;wxGenericDragImage::DoDrawImage(wxDC&,const wxPoint&) const
-      DoDrawImage__18wxGenericDragImageCFR4wxDCRC7wxPoint
      ;wxGenericDragImage::Create(const wxListCtrl&,long)
      Create__18wxGenericDragImageFRC10wxListCtrll
      ;wxGenericDragImage::sm_classwxGenericDragImage
@@ -6544,8 +6504,6 @@ EXPORTS
      Replace__11wxImageListFiRC8wxBitmap
      ;wxImageList::wxImageList(int,int,unsigned long,int)
      __ct__11wxImageListFiT1UlT1
-      ;wxImageList::Create(int,int,unsigned long,int)
-      Create__11wxImageListFiT1UlT1
      ;wxImageList::~wxImageList()
      __dt__11wxImageListFv
      ;wxImageList::GetSize(int,int&,int&) const
@@ -6613,12 +6571,10 @@ EXPORTS
      OnIdle__10wxListCtrlFR11wxIdleEvent
      ;wxListMainWindow::DeleteItem(long)
      DeleteItem__16wxListMainWindowFl
-      ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
-      __ct__19wxListLineDataArrayFRC19wxListLineDataArray
-      ;wxListEvent::wxListEvent(int,int)
-      __ct__11wxListEventFiT1
      ;wxListItemData::SetSize(int,int)
      SetSize__14wxListItemDataFiT1
+      ;wxListEvent::wxListEvent(int,int)
+      __ct__11wxListEventFiT1
      ;wxListLineData::SetItem(int,const wxListItem&)
      SetItem__14wxListLineDataFiRC10wxListItem
      ;wxListMainWindow::SendNotify(wxListLineData*,int)
@@ -6684,8 +6640,8 @@ EXPORTS
      GetItemRect__16wxListMainWindowFlR6wxRect
      ;wxListEvent::CopyObject(wxObject&) const
      CopyObject__11wxListEventCFR8wxObject
-      ;wxListLineDataArray::operator=(const wxListLineDataArray&)
-      __as__19wxListLineDataArrayFRC19wxListLineDataArray
+      ;wxListItemData::IsHit(int,int) const
+      IsHit__14wxListItemDataCFiT1
      ;wxListLineData::sm_classwxListLineData
      sm_classwxListLineData__14wxListLineData
      ;wxListItem::sm_classwxListItem
@@ -6706,8 +6662,6 @@ EXPORTS
      SelectLine__16wxListMainWindowFP14wxListLineData
      ;wxListHeaderData::IsHit(int,int) const
      IsHit__16wxListHeaderDataCFiT1
-      ;wxListItemData::IsHit(int,int) const
-      IsHit__14wxListItemDataCFiT1
      ;wxListCtrl::InsertItem(wxListItem&)
      InsertItem__10wxListCtrlFR10wxListItem
      ;wxListMainWindow::HitTest(int,int,int&)
@@ -6780,24 +6734,20 @@ EXPORTS
      OnChar__14wxListTextCtrlFR10wxKeyEvent
      ;wxListLineData::IsInRect(int,int,const wxRect&)
      IsInRect__14wxListLineDataFiT1RC6wxRect
-      ;wxListLineDataArray::Index(const wxListLineData&,unsigned long) const
-      Index__19wxListLineDataArrayCFRC14wxListLineDataUl
      ;wxListLineData::Hilight(unsigned long)
      Hilight__14wxListLineDataFUl
      ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
      FindItem__10wxListCtrlFlRC8wxStringUl
      ;wxListLineData::DrawRubberBand(wxDC*,unsigned long)
      DrawRubberBand__14wxListLineDataFP4wxDCUl
-      ;wxListLineDataArray::RemoveAt(unsigned int)
-      RemoveAt__19wxListLineDataArrayFUi
+      ;wxListItemData::SetPosition(int,int)
+      SetPosition__14wxListItemDataFiT1
      ;wxListHeaderData::wxListHeaderData(const wxListItem&)
      __ct__16wxListHeaderDataFRC10wxListItem
      ;wxListHeaderData::SetWidth(int)
      SetWidth__16wxListHeaderDataFi
      ;wxListHeaderData::SetPosition(int,int)
      SetPosition__16wxListHeaderDataFiT1
-      ;wxListItemData::SetPosition(int,int)
-      SetPosition__14wxListItemDataFiT1
      ;wxListCtrl::SetItemState(long,long,long)
      SetItemState__10wxListCtrlFlN21
      ;wxListHeaderData::SetHeight(int)
@@ -6901,12 +6851,10 @@ EXPORTS
      DeleteItem__10wxListCtrlFl
      ;wxListLineData::AssignRect(wxRect&,const wxRect&)
      AssignRect__14wxListLineDataFR6wxRectRC6wxRect
-      ;wxListLineDataArray::DoCopy(const wxListLineDataArray&)
-      DoCopy__19wxListLineDataArrayFRC19wxListLineDataArray
-      ;wxListMainWindow::UnfocusLine(wxListLineData*)
-      UnfocusLine__16wxListMainWindowFP14wxListLineData
      ;wxListItemData::SetImage(int)
      SetImage__14wxListItemDataFi
+      ;wxListMainWindow::UnfocusLine(wxListLineData*)
+      UnfocusLine__16wxListMainWindowFP14wxListLineData
      ;wxListCtrl::SetColumn(int,wxListItem&)
      SetColumn__10wxListCtrlFiR10wxListItem
      ;wxListLineData::InitItems(int)
@@ -6927,8 +6875,8 @@ EXPORTS
      DeleteColumn__16wxListMainWindowFi
      ;wxListLineData::CalculateSize(wxDC*,int)
      CalculateSize__14wxListLineDataFP4wxDCi
-      ;wxListLineDataArray::~wxListLineDataArray()
-      __dt__19wxListLineDataArrayFv
+      ;wxListMainWindow::GetImageSize(int,int&,int&)
+      GetImageSize__16wxListMainWindowFiRiT2
      ;wxConstructorForwxListItem()
      wxConstructorForwxListItem__Fv
      ;wxListCtrl::~wxListCtrl()
@@ -6945,8 +6893,6 @@ EXPORTS
      GetSelectedItemCount__10wxListCtrlCFv
      ;wxListMainWindow::GetMode() const
      GetMode__16wxListMainWindowCFv
-      ;wxListMainWindow::GetImageSize(int,int&,int&)
-      GetImageSize__16wxListMainWindowFiRiT2
      ;wxListHeaderWindow::GetEventTable() const
      GetEventTable__18wxListHeaderWindowCFv
      ;wxListCtrl::GetDropTarget() const
@@ -6996,14 +6942,12 @@ EXPORTS
      EnsureVisible__16wxListMainWindowFl
      ;wxListCtrl::EnsureVisible(long)
      EnsureVisible__10wxListCtrlFl
-      ;wxListLineDataArray::Add(const wxListLineData&)
-      Add__19wxListLineDataArrayFRC14wxListLineData
+      ;wxListItemData::wxListItemData(const wxListItem&)
+      __ct__14wxListItemDataFRC10wxListItem
      ;wxListItemData::sm_classwxListItemData
      sm_classwxListItemData__14wxListItemData
      ;wxListHeaderData::sm_classwxListHeaderData
      sm_classwxListHeaderData__16wxListHeaderData
-      ;wxListItemData::wxListItemData(const wxListItem&)
-      __ct__14wxListItemDataFRC10wxListItem
      ;wxListMainWindow::SetItem(wxListItem&)
      SetItem__16wxListMainWindowFR10wxListItem
      ;wxListItemData::SetItem(const wxListItem&)
@@ -7020,8 +6964,6 @@ EXPORTS
      ScrollList__10wxListCtrlFiT1
      ;wxListLineData::IsHit(int,int)
      IsHit__14wxListLineDataFiT1
-      ;wxListLineDataArray::Insert(const wxListLineData&,unsigned int)
-      Insert__19wxListLineDataArrayFRC14wxListLineDataUi
      ;wxListMainWindow::InsertItem(wxListItem&)
      InsertItem__16wxListMainWindowFR10wxListItem
      ;wxListCtrl::InsertItem(long,const wxString&,int)
@@ -7040,8 +6982,6 @@ EXPORTS
      FindItem__10wxListCtrlFlRC7wxPointi
      ;wxListMainWindow::DeleteLine(wxListLineData*)
      DeleteLine__16wxListMainWindowFP14wxListLineData
-      ;wxListLineDataArray::DoEmpty()
-      DoEmpty__19wxListLineDataArrayFv
      ;wxConstructorForwxListItemData()
      wxConstructorForwxListItemData__Fv
      ;wxConstructorForwxListHeaderWindow()
@@ -7086,8 +7026,6 @@ EXPORTS
      __ct__18wxListHeaderWindowFP8wxWindowiP16wxListMainWindowRC7wxPointRC6wxSizelRC8wxString
      ;wxListMainWindow::wxListMainWindow(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
      __ct__16wxListMainWindowFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
-      ;wxListHeaderWindow::AdjustDC(wxDC&)
-      AdjustDC__18wxListHeaderWindowFR4wxDC
  ;From object file:  ..\generic\logg.cpp
    ;PUBDEFs (Symbols available from object file):
      ;wxLogDialog::wxLogDialog(wxWindow*,const wxArrayString&,const wxArrayInt&,const wxArrayLong&,const wxString&,long)
@@ -7120,8 +7058,6 @@ EXPORTS
      Flush__8wxLogGuiFv
      ;wxLogFrame::DoClose()
      DoClose__10wxLogFrameFv
-      ;wxLogDialog::CreateDetailsControls()
-      CreateDetailsControls__11wxLogDialogFv
      ;wxLogGui::DoLog(unsigned long,const char*,long)
      DoLog__8wxLogGuiFUlPCcl
      ;wxLogDialog::OnListSelect(wxListEvent&)
@@ -7134,8 +7070,6 @@ EXPORTS
      __vft11wxLogWindow5wxLog
      ;wxLogTextCtrl::DoLogString(const char*,long)
      DoLogString__13wxLogTextCtrlFPCcl
-      ;wxLogDialog::OnSave(wxCommandEvent&)
-      OnSave__11wxLogDialogFR14wxCommandEvent
      ;wxLogFrame::OnCloseWindow(wxCloseEvent&)
      OnCloseWindow__10wxLogFrameFR12wxCloseEvent
      ;wxLogWindow::DoLogString(const char*,long)
@@ -7219,8 +7153,6 @@ EXPORTS
      SetFocus__7wxPanelFv
      ;wxPanel::SetFocusToChild()
      SetFocusToChild__7wxPanelFv
-      ;wxSetFocusToChild(wxWindow*,wxWindow**)
-      wxSetFocusToChild__FP8wxWindowPP8wxWindow
  ;From object file:  ..\generic\plot.cpp
    ;PUBDEFs (Symbols available from object file):
      ;wxPlotXAxisArea::OnMouse(wxMouseEvent&)
@@ -7299,10 +7231,12 @@ EXPORTS
      GetAt__12wxPlotWindowFUi
      ;wxPlotWindow::Delete(wxPlotOnOffCurve*)
      Delete__12wxPlotWindowFP16wxPlotOnOffCurve
-      ;wxArrayPlotOnOff::wxArrayPlotOnOff(const wxArrayPlotOnOff&)
-      __ct__16wxArrayPlotOnOffFRC16wxArrayPlotOnOff
+      ;wxArrayPlotOnOff::Empty()
+      Empty__16wxArrayPlotOnOffFv
      ;wxConstructorForwxPlotYAxisArea()
      wxConstructorForwxPlotYAxisArea__Fv
+      ;wxArrayPlotOnOff::wxArrayPlotOnOff(const wxArrayPlotOnOff&)
+      __ct__16wxArrayPlotOnOffFRC16wxArrayPlotOnOff
      ;wxPlotWindow::RedrawXAxis()
      RedrawXAxis__12wxPlotWindowFv
      ;wxPlotWindow::GetOnOffCurveCount()
@@ -7333,14 +7267,12 @@ EXPORTS
      sm_classwxPlotXAxisArea__15wxPlotXAxisArea
      ;wxPlotWindow::Add(wxPlotOnOffCurve*)
      Add__12wxPlotWindowFP16wxPlotOnOffCurve
-      ;wxArrayPlotOnOff::DoEmpty()
-      DoEmpty__16wxArrayPlotOnOffFv
+      ;wxPlotCurve::wxPlotCurve(int,double,double)
+      __ct__11wxPlotCurveFidT2
      ;wxConstructorForwxPlotXAxisArea()
      wxConstructorForwxPlotXAxisArea__Fv
      ;wxPlotWindow::~wxPlotWindow()
      __dt__12wxPlotWindowFv
-      ;wxPlotCurve::wxPlotCurve(int,double,double)
-      __ct__11wxPlotCurveFidT2
      ;wxPlotXAxisArea::GetEventTable() const
      GetEventTable__15wxPlotXAxisAreaCFv
      ;wxPlotArea::GetEventTable() const
@@ -8613,8 +8545,8 @@ EXPORTS
      OnCompareItems__10wxTreeCtrlFRC12wxTreeItemIdT1
      ;wxTreeCtrl::CalculateLevel(wxGenericTreeItem*,wxDC&,int,int&)
      CalculateLevel__10wxTreeCtrlFP17wxGenericTreeItemR4wxDCiRi
-      ;wxTreeCtrl::OnRenameAccept()
-      OnRenameAccept__10wxTreeCtrlFv
+      ;wxArrayTreeItemIds::Empty()
+      Empty__18wxArrayTreeItemIdsFv
      ;wxConstructorForwxTreeEvent()
      wxConstructorForwxTreeEvent__Fv
      ;wxConstructorForwxTreeCtrl()
@@ -8625,6 +8557,8 @@ EXPORTS
      SetItemTextColour__10wxTreeCtrlFRC12wxTreeItemIdRC8wxColour
      ;wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId&,const wxColour&)
      SetItemBackgroundColour__10wxTreeCtrlFRC12wxTreeItemIdRC8wxColour
+      ;wxTreeCtrl::OnRenameAccept()
+      OnRenameAccept__10wxTreeCtrlFv
      ;wxTreeCtrl::GetStateImageList() const
      GetStateImageList__10wxTreeCtrlCFv
      ;wxTreeCtrl::GetCount() const
@@ -8781,12 +8715,10 @@ EXPORTS
      PaintLevel__10wxTreeCtrlFP17wxGenericTreeItemR4wxDCiRi
      ;wxTreeCtrl::AddRoot(const wxString&,int,int,wxTreeItemData*)
      AddRoot__10wxTreeCtrlFRC8wxStringiT2P14wxTreeItemData
-      ;wxArrayTreeItemIds::DoEmpty()
-      DoEmpty__18wxArrayTreeItemIdsFv
-      ;wxArrayTreeItemIds::~wxArrayTreeItemIds()
-      __dt__18wxArrayTreeItemIdsFv
      ;wxTreeCtrl::SetItemImage(const wxTreeItemId&,int,wxTreeItemIcon)
      SetItemImage__10wxTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
+      ;wxArrayTreeItemIds::~wxArrayTreeItemIds()
+      __dt__18wxArrayTreeItemIdsFv
      ;wxTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
      SelectItem__10wxTreeCtrlFRC12wxTreeItemIdUlT2
      ;wxGenericTreeItem::Reset()
@@ -8917,8 +8849,8 @@ EXPORTS
      __as__18wxHtmlBookRecArrayFRC18wxHtmlBookRecArray
      ;HP_TagHandler::WriteOut(wxHtmlContentsItem*&,int&)
      WriteOut__13HP_TagHandlerFRP18wxHtmlContentsItemRi
-      ;wxHtmlBookRecArray::DoEmpty()
-      DoEmpty__18wxHtmlBookRecArrayFv
+      ;wxHtmlBookRecArray::Empty()
+      Empty__18wxHtmlBookRecArrayFv
      ;wxHtmlBookRecArray::Add(const wxHtmlBookRecord&)
      Add__18wxHtmlBookRecArrayFRC16wxHtmlBookRecord
      ;wxHtmlHelpData::SaveCachedBook(wxHtmlBookRecord*,wxOutputStream*)
@@ -9214,8 +9146,8 @@ EXPORTS
      DoCopy__16HtmlHistoryArrayFRC16HtmlHistoryArray
      ;HtmlHistoryArray::Add(const HtmlHistoryItem&)
      Add__16HtmlHistoryArrayFRC15HtmlHistoryItem
-      ;HtmlHistoryArray::DoEmpty()
-      DoEmpty__16HtmlHistoryArrayFv
+      ;HtmlHistoryArray::Empty()
+      Empty__16HtmlHistoryArrayFv
      ;wxConstructorForwxHtmlWinModule()
      wxConstructorForwxHtmlWinModule__Fv
      ;wxHtmlWindow::HistoryClear()
@@ -9393,14 +9325,14 @@ EXPORTS
      __ct__22wxHtmlImageMapAreaCellFQ2_22wxHtmlImageMapAreaCell8celltypeR8wxStringd
      ;wxHtmlImageMapAreaCell::GetLink(int,int) const
      GetLink__22wxHtmlImageMapAreaCellCFiT1
+      ;CoordArray::Empty()
+      Empty__10CoordArrayFv
      ;wxHtmlImageMapCell::Find(int,const void*) const
      Find__18wxHtmlImageMapCellCFiPCv
      ;HTML_ModuleImage::sm_classHTML_ModuleImage
      sm_classHTML_ModuleImage__16HTML_ModuleImage
      ;_link_dummy_func_m_image()
      _link_dummy_func_m_image__Fv
-      ;CoordArray::DoEmpty()
-      DoEmpty__10CoordArrayFv
      ;wxHtmlImageCell::wxHtmlImageCell(wxFSFile*,int,int,double,int,wxString)
      __ct__15wxHtmlImageCellFP8wxFSFileiT2dT28wxString
      __vft18wxHtmlImageMapCell8wxObject
@@ -9597,11 +9529,13 @@ EXPORTS
      wxTheApp
      ;wxApp::sm_classwxApp
      sm_classwxApp__5wxApp
-      ;wxConstructorForwxApp()
-      wxConstructorForwxApp__Fv
+      ;wxMsgArray::Empty()
+      Empty__10wxMsgArrayFv
      ;wxWakeUpIdle()
      wxWakeUpIdle__Fv
      wxSTD_MDICHILDFRAME_ICON
+      ;wxConstructorForwxApp()
+      wxConstructorForwxApp__Fv
      vHabmain
      ;wxApp::~wxApp()
      __dt__5wxAppFv
@@ -9639,6 +9573,8 @@ EXPORTS
      DoCopy__10wxMsgArrayFRC10wxMsgArray
      ;wxMsgArray::operator=(const wxMsgArray&)
      __as__10wxMsgArrayFRC10wxMsgArray
+      ;wxApp::GetEventTable() const
+      GetEventTable__5wxAppCFv
      ;wxYield()
      wxYield__Fv
      wxSTD_FRAME_ICON
@@ -9649,10 +9585,6 @@ EXPORTS
      MainLoop__5wxAppFv
      ;wxApp::Initialized()
      Initialized__5wxAppFv
-      ;wxApp::GetEventTable() const
-      GetEventTable__5wxAppCFv
-      ;wxMsgArray::DoEmpty()
-      DoEmpty__10wxMsgArrayFv
      wxFrameClassNameNoRedraw
      ;wxSetInstance(unsigned long)
      wxSetInstance__FUl
@@ -10136,10 +10068,10 @@ EXPORTS
      sm_classwxCursor__8wxCursor
      ;wxCursor::FreeResource(unsigned long)
      FreeResource__8wxCursorFUl
-      ;wxSetCursor(const wxCursor&)
-      wxSetCursor__FRC8wxCursor
      ;wxCursor::~wxCursor()
      __dt__8wxCursorFv
+      ;wxSetCursor(const wxCursor&)
+      wxSetCursor__FRC8wxCursor
      ;wxCursor::wxCursor(const char*,int,int,int,int,const char*)
      __ct__8wxCursorFPCciN32T1
      __vft15wxCursorRefData15wxObjectRefData
@@ -10200,13 +10132,13 @@ EXPORTS
      wxITALIC_FONT
      wxGREY_BRUSH
      wxWHITE
-      wxBLACK_PEN
+      wxHOURGLASS_CURSOR
      wxScrollBarNameStr
      wxSTANDARD_CURSOR
      wxMessageBoxCaptionStr
-      wxHOURGLASS_CURSOR
      wxComboBoxNameStr
      wxCROSS_CURSOR
+      wxBLACK_PEN
      wxTopLevelWindows
      wxTRANSPARENT_BRUSH
      wxWHITE_BRUSH
@@ -10475,8 +10407,6 @@ EXPORTS
      RemoveAt__13wxArrayDCInfoFUi
      ;wxPaintDC::FindInCache(unsigned int*) const
      FindInCache__9wxPaintDCCFPUi
-      ;wxArrayDCInfo::DoEmpty()
-      DoEmpty__13wxArrayDCInfoFv
      ;wxWindowDC::~wxWindowDC()
      __dt__10wxWindowDCFv
      ;wxClientDC::~wxClientDC()
@@ -10493,6 +10423,8 @@ EXPORTS
      wxConstructorForwxClientDC__Fv
      ;wxWindowDC::wxWindowDC()
      __ct__10wxWindowDCFv
+      ;wxArrayDCInfo::Empty()
+      Empty__13wxArrayDCInfoFv
      ;wxArrayDCInfo::wxArrayDCInfo(const wxArrayDCInfo&)
      __ct__13wxArrayDCInfoFRC13wxArrayDCInfo
      ;wxWindowDC::sm_classwxWindowDC
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -10,7 +10,7 @@
 WX_LINGUAS := `ls *.po 2> /dev/null | sed -n 's/\(wxstd\)\?\.po//p'`

 # the programs we use (TODO: use configure to detect them)
-MSGFMT=msgfmt --verbose
+MSGFMT=msgfmt
 MSGMERGE=msgmerge
 XGETTEXT=xgettext
 XARGS=xargs
--- a/locale/cs.po
+++ b/locale/cs.po
--- a/locale/da.po
+++ b/locale/da.po
--- a/locale/de.po
+++ b/locale/de.po
--- a/locale/fi.po
+++ b/locale/fi.po
--- a/locale/fr.po
+++ b/locale/fr.po
--- a/locale/it.po
+++ b/locale/it.po
--- a/Show More
+++ b/Show More