This commit was manufactured by cvs2svn to create tag

'WX_2_2_SECOND_MERGE'.

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

.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

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
 ----------------------------------------
 

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

configure

@@ -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
 

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
 

contrib/include/wx/stc/stc.h

@@ -237,7 +237,6 @@ public:
     wxSTC_UndoType GetUndoCollection();
     void     BeginUndoAction();
     void     EndUndoAction();
-    void     SetSavePoint();
 
 
     // Selection and information

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() {

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());
 }
 
 

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

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
 

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.2), 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

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.
 

debian/libwxgtk-python.docs

@@ -1,3 +1,3 @@
 wxPython/README.txt
 wxPython/CHANGES.txt
-
+docs/licence.txt

debian/rules

@@ -69,27 +69,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,19 +97,19 @@ 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 \
+	@for f in dirs docs files; do \
 		echo "generating control file $(package_i18n).$$f"; \
 		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
 	done;
@@ -117,7 +117,7 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 		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;
@@ -419,7 +419,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

debian/wxwin-doc.docs

@@ -1,2 +1,2 @@
+docs/licendoc.txt
 docs/wxWindows-manual.html
-

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
-

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

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 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 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 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 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

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

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 /out:"BaseDllRelease/wxbase221.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /machine:I386 /out:"BaseDllRelease/wxbase221.dll"
 
 !ELSEIF  "$(CFG)" == "wxBaseDll - Win32 Debug"
 
@@ -97,8 +97,8 @@ 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
@@ -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 /out:"BaseDllDebug/wxbase221d.dll"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /version:2.2 /dll /debug /machine:I386 /pdbtype:sept /out:"BaseDllDebug/wxbase221d.dll"
 
 !ENDIF 
 

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,21 +69,21 @@ 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" /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" /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"
@@ -113,24 +92,24 @@ 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\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 /out:"ReleaseDll/wxmsw221.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 /out:"ReleaseDll/wxmsw221.dll"
 
-!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 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" /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"
@@ -139,15 +118,15 @@ 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\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 /out:"DebugDll/wxmsw221d.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 /out:"DebugDll/wxmsw221d.dll"
 
 !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
@@ -166,15 +145,23 @@ 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"
+
 # ADD CPP /W1
 # 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

distrib/msw/tmake/vcapp.t

@@ -36,34 +36,17 @@
 	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_SUFFIX="d";
 	$DLL_OR_LIB=(Config("wxbase") ? "wxbase" : "wxmsw") . "221";
 	$DLL_FLAGS="/D WXUSINGDLL ";
 	$EXTRA_LIBS="";
-
-	$project{"TARGET"} .= "Dll";
-	$project{"MAKEFILE"} .= "Dll";
     }
     else {
 	$DLL="";
-	$DEBUG_SUFFIX="";
-	$DLL_OR_LIB=Config("wxbase") ? "wxBase" : "wxWindows";
+	$DLL_SUFFIX="";
+	$DLL_OR_LIB="wxWindows";
 	$DLL_FLAGS=" ";
 	#! actually this depends on the contents of setup.h
 	$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
@@ -87,8 +70,8 @@
 	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 ";
+	    $vc_link_release = "$WXDIR\\Release$DLL\\$DLL_OR_LIB.lib ";
+	    $vc_link_debug = "$WXDIR\\Debug$DLL\\$DLL_OR_LIB$DLL_SUFFIX.lib ";
 	    foreach ( split(/ /, $EXTRA_LIBS) ) {
 		$vc_link_release .= "$WXDIR\\src\\$_\\Release\\$_.lib ";
 		$vc_link_debug .= "$WXDIR\\src\\$_\\Debug\\$_.lib ";
@@ -97,7 +80,12 @@
 	$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;
+	foreach ( split(/ /, Project('LIBPATH')) ) {
+	    $vc_link_release .= " /libpath:$_\\Release";
+	    $vc_link_debug .= " /libpath:$_\\Debug";
+	}
+
+	$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 +94,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\\$DLL_OR_LIB.lib ";
+	    $vc_link_debug = "$WXDIR\\Base${DLL}Debug\\$DLL_OR_LIB" . "d.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 +122,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 +220,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#$ $text = "$DLL" . '"'
+# PROP BASE Intermediate_Dir "Release#$ $text = "$DLL" . '"'
 # 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#$ $text = "$DLL" . '"'
+# PROP Intermediate_Dir "Release#$ $text = "$DLL" . '"'
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_RELEASE");
@@ -266,13 +248,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#$ $text = "$DLL" . '"'
+# PROP BASE Intermediate_Dir "Debug#$ $text = "$DLL" . '"'
 # 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#$ $text = "$DLL" . '"'
+# PROP Intermediate_Dir "Debug#$ $text = "$DLL" . '"'
 #$ Config("windows") && ($text='# PROP Ignore_Export_Lib 0');
 # PROP Target_Dir ""
 # ADD BASE CPP #$ Expand("VC_BASE_CPP_DEBUG");

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

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

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
 

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!

docs/base/todo.txt

@@ -1,5 +0,0 @@
-
-TODO for wxBase 2
------------------
-
-better BeOS support.

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
 -----
 

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.

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>

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>

docs/html/news.htm

@@ -23,11 +23,9 @@ News
 <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.
+open source and merge it with wxStudio.
 </ul>
 
 <H3><a name="release2_2_0">July 9th, 2000</H3><P>

docs/html/platform.htm

@@ -93,7 +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>
+<tr> <td>wxMotif with xlC (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>

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
+   --------------------------

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}}}

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

docs/latex/wx/database.tex

@@ -18,8 +18,8 @@ The connection may be closed and reopened.
 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}
+See details of these classes in:
+\helpref{wxDB}{wxdb}, \helpref{wxTable}{wxtable}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

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}
 

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}

docs/latex/wx/postscpt.tex

@@ -35,12 +35,6 @@ 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}
 
@@ -49,3 +43,9 @@ Return resolution used in PostScript output. See
 Set resolution (in pixels per inch) that will be used in PostScript
 output. Default is 720ppi.
 
+\membersection{wxPostScriptDC::GetResolution}\label{wxpostscriptdcgetresolution}
+
+\func{static int}{GetResolution}{\void}
+
+Return resolution used in PostScript output. See 
+\helpref{SetResolution}{wxpostscriptdcsetresolution}.

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.
 

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

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
 

include/wx/cmdline.h

@@ -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

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 );
 

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 );
 

include/wx/stc/stc.h

@@ -237,7 +237,6 @@ public:
     wxSTC_UndoType GetUndoCollection();
     void     BeginUndoAction();
     void     EndUndoAction();
-    void     SetSavePoint();
 
 
     // Selection and information

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

locale/cs.po

@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.2\n"
-"POT-Creation-Date: 2000-08-13 16:29+0200\n"
+"POT-Creation-Date: 2000-07-09 00:08+0200\n"
 "PO-Revision-Date: 2000-06-17 19:23+0200\n"
 "Last-Translator: Vaclav Slavik <v.slavik@volny.cz>\n"
-"Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
+"Language-Team: wxWindows Team <wx-devel@wxwindows.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -32,11 +32,11 @@ msgstr ""
 msgid " (error %ld: %s)"
 msgstr " (chyba %ld: %s)"
 
-#: ../src/common/docview.cpp:1206
+#: ../src/common/docview.cpp:1204
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:490
+#: ../src/html/htmprint.cpp:491
 msgid " Preview"
 msgstr " - n<>hled"
 
@@ -138,11 +138,11 @@ msgstr "&Dal
 msgid "&Next Tip"
 msgstr "&Dal<61><6C> tip"
 
-#: ../src/common/docview.cpp:1945 ../src/common/docview.cpp:1956
+#: ../src/common/docview.cpp:1900 ../src/common/docview.cpp:1911
 msgid "&Redo"
 msgstr "&Zopakovat"
 
-#: ../src/common/docview.cpp:1939 ../src/common/docview.cpp:1966
+#: ../src/common/docview.cpp:1894 ../src/common/docview.cpp:1921
 msgid "&Redo "
 msgstr "&Zopakovat "
 
@@ -154,15 +154,15 @@ msgstr "&Ulo
 msgid "&Show tips at startup"
 msgstr "&Zobrazit tipy p<>i spu<70>t<EFBFBD>n<EFBFBD>"
 
-#: ../src/common/docview.cpp:1951
+#: ../src/common/docview.cpp:1906
 msgid "&Undo"
 msgstr "Z&p<>t"
 
-#: ../src/common/docview.cpp:1926
+#: ../src/common/docview.cpp:1881
 msgid "&Undo "
 msgstr "Z&p<>t "
 
-#: ../src/msw/mdi.cpp:1280 ../src/msw/mdi.cpp:1287
+#: ../src/msw/mdi.cpp:1270 ../src/msw/mdi.cpp:1277
 msgid "&Window"
 msgstr "&Okno"
 
@@ -181,7 +181,7 @@ msgstr "'%s' je neplatn
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' nen<65> spr<70>vn<76> <20><>seln<6C> hodnota pro volbu '%s'."
 
-#: ../src/common/intl.cpp:412
+#: ../src/common/intl.cpp:395
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' nen<65> katalog p<>eklad<61>."
@@ -254,11 +254,11 @@ msgstr "Ob
 msgid ": file does not exist!"
 msgstr ": soubor neexistuje!"
 
-#: ../src/common/fontmap.cpp:475
+#: ../src/common/fontmap.cpp:462
 msgid ": unknown charset"
 msgstr ": nezn<7A>m<EFBFBD> znakov<6F> sada"
 
-#: ../src/common/fontmap.cpp:668
+#: ../src/common/fontmap.cpp:651
 msgid ": unknown encoding"
 msgstr ": nezn<7A>m<EFBFBD> k<>dov<6F>n<EFBFBD>"
 
@@ -314,7 +314,7 @@ msgstr ""
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "str<74>nka A3, 297 x 420 mm"
 
-#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2533
+#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2516
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "str<74>nka A4, 210 x 297 mm"
 
@@ -481,7 +481,7 @@ msgstr "Ob
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "Ob<4F>lka C65, 114 x 229 mm"
 
-#: ../src/msw/thread.cpp:222
+#: ../src/mac/thread.cpp:179 ../src/msw/thread.cpp:222
 msgid "Can not create event object."
 msgstr "Nemohu vytvo<76>it object ud<75>losti."
 
@@ -489,7 +489,11 @@ msgstr "Nemohu vytvo
 msgid "Can not create mutex"
 msgstr "Nemohu vytvo<76>it mutex."
 
-#: ../src/common/filefn.cpp:1287 ../src/msw/dir.cpp:294
+#: ../src/mac/thread.cpp:92
+msgid "Can not create mutex."
+msgstr "Nemohu vytvo<76>it mutex."
+
+#: ../src/common/filefn.cpp:1271 ../src/msw/dir.cpp:294
 #: ../src/unix/dir.cpp:214
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
@@ -513,7 +517,7 @@ msgstr "Nemohu pozastavit vl
 msgid "Can not wait for thread termination"
 msgstr "Nemohu po<70>kat na ukon<6F>en<65> vl<76>kna"
 
-#: ../src/common/docview.cpp:1928
+#: ../src/common/docview.cpp:1883
 msgid "Can't &Undo "
 msgstr "Nemohu vz<76>t zp<7A>t"
 
@@ -555,7 +559,7 @@ msgstr "Nemohu vytvo
 msgid "Can't create thread"
 msgstr "Nemohu vytvo<76>it vl<76>kno"
 
-#: ../src/msw/window.cpp:2396
+#: ../src/msw/window.cpp:2388
 #, c-format
 msgid ""
 "Can't create window of class %s!\n"
@@ -599,7 +603,7 @@ msgstr "Nemohu vyjmenovat hodnoty kl
 msgid "Can't find current position in file '%s'"
 msgstr "Nemohu zjistit pozici v souboru '%s'"
 
-#: ../src/msw/window.cpp:2346
+#: ../src/msw/window.cpp:2338
 msgid ""
 "Can't find dummy dialog template!\n"
 "Check resource include path for finding wx.rc."
@@ -660,7 +664,7 @@ msgid "Can't set value of '%s'"
 msgstr "Nemohu nastavit hodnotu '%s'"
 
 #: ../src/common/dlgcmn.cpp:148 ../src/common/prntbase.cpp:109
-#: ../src/generic/dcpsg.cpp:2257 ../src/generic/dirdlgg.cpp:424
+#: ../src/generic/dcpsg.cpp:2241 ../src/generic/dirdlgg.cpp:424
 #: ../src/generic/filedlgg.cpp:916 ../src/generic/fontdlgg.cpp:257
 #: ../src/generic/prntdlgg.cpp:468 ../src/generic/progdlgg.cpp:179
 #: ../src/generic/proplist.cpp:523 ../src/generic/wizard.cpp:192
@@ -719,7 +723,7 @@ msgstr "Nemohu otev
 msgid "Cannot open contents file: %s"
 msgstr "Nelze otev<65><76>t soubor s obsahem: %s"
 
-#: ../src/generic/dcpsg.cpp:1599
+#: ../src/generic/dcpsg.cpp:1584
 msgid "Cannot open file for PostScript printing!"
 msgstr "Nemohu otev<65><76>t soubor k PostScriptov<6F>mu tisku!"
 
@@ -806,7 +810,7 @@ msgstr "Nemohu nal
 msgid "Could not find tab for id"
 msgstr "Nemohu naj<61>t tab k id"
 
-#: ../src/msw/textctrl.cpp:1244
+#: ../src/msw/textctrl.cpp:1191
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr "Nemohu na<6E><61>st Rich Edit DLL '%s'"
@@ -847,16 +851,20 @@ msgid "Couldn't acquire a mutex lock"
 msgstr "Nemohu z<>skat z<>mek mutexu."
 
 #: ../src/msw/dragimag.cpp:142 ../src/msw/dragimag.cpp:179
-#: ../src/msw/imaglist.cpp:152 ../src/msw/imaglist.cpp:174
-#: ../src/msw/imaglist.cpp:187
+#: ../src/msw/imaglist.cpp:153 ../src/msw/imaglist.cpp:175
+#: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
 msgstr "Nemohu p<>idat obr<62>zek do seznamu."
 
+#: ../src/mac/thread.cpp:227
+msgid "Couldn't change the state of event object."
+msgstr "Nemohu zm<7A>nit stav event object."
+
 #: ../src/msw/timer.cpp:96
 msgid "Couldn't create a timer"
 msgstr "Nemohu vytvo<76>it <20>asova<76>"
 
-#: ../src/common/dynlib.cpp:305
+#: ../src/common/dynlib.cpp:268
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Nemohu v dynamick<63> knihovn<76> nal<61>zt symbol '%s'"
@@ -870,7 +878,7 @@ msgstr "Nemohu z
 msgid "Couldn't launch DDE server '%s'."
 msgstr "Nemohu spustit DDE server '%s'."
 
-#: ../src/common/imagpng.cpp:251
+#: ../src/common/imagpng.cpp:245
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr ""
 "Nemohu na<6E><61>st PNG obr<62>zek - bu<62> je po<70>kozen<65> soubor nebo je nedostatek "
@@ -963,7 +971,7 @@ msgstr ""
 msgid "Display options dialog"
 msgstr "Zobraz<61> dialog s nastaven<65>mi"
 
-#: ../src/common/docview.cpp:440
+#: ../src/common/docview.cpp:438
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "Chcete ulo<6C>it zm<7A>ny do dokumentu %s?"
@@ -1087,7 +1095,7 @@ msgstr "Nelze zkop
 msgid "Failed to create DDE string"
 msgstr "Nelze vytvo<76>it DDE <20>e<EFBFBD>ezec"
 
-#: ../src/msw/mdi.cpp:421
+#: ../src/msw/mdi.cpp:411
 msgid "Failed to create MDI parent frame."
 msgstr "Nepoda<64>ilo se vytvo<76>it rodi<64>ovsk<73> MDI okno."
 
@@ -1171,11 +1179,11 @@ msgstr "Nepoda
 msgid "Failed to get data from the clipboard"
 msgstr "Nelze z<>skat data ze schr<68>nky"
 
-#: ../src/common/timercmn.cpp:244
+#: ../src/common/timercmn.cpp:237
 msgid "Failed to get the UTC system time."
 msgstr "Nemohu zjistit syst<73>mov<6F> UTC <20>as."
 
-#: ../src/common/timercmn.cpp:196
+#: ../src/common/timercmn.cpp:189
 msgid "Failed to get the local system time"
 msgstr "Nepoda<64>ilo se zjistit m<>stn<74> syst<73>mov<6F> <20>as"
 
@@ -1187,7 +1195,7 @@ msgstr ""
 "Nemohu p<>ipojit vl<76>kno, zji<6A>t<EFBFBD>na mo<6D>n<EFBFBD> chybn<62> alokace pam<61>ti - restartujte "
 "pros<6F>m program"
 
-#: ../src/common/dynlib.cpp:235
+#: ../src/common/dynlib.cpp:225
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "Nelze na<6E><61>st sd<73>lenou knihovnu '%s'"
@@ -1209,7 +1217,7 @@ msgstr "Nepoda
 msgid "Failed to register DDE server '%s'"
 msgstr "Nelze zaregistrovat DDE server '%s'"
 
-#: ../src/common/fontmap.cpp:520
+#: ../src/common/fontmap.cpp:507
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "Nemohu ulo<6C>it k<>dov<6F>n<EFBFBD> znakov<6F> sady '%s'."
@@ -1293,8 +1301,7 @@ msgstr "Soubor '%s' existuje, opravdu ho chcete p
 msgid "File couldn't be loaded."
 msgstr "Soubor nelze na<6E><61>st."
 
-#: ../src/common/docview.cpp:296 ../src/common/docview.cpp:332
-#: ../src/common/docview.cpp:1388
+#: ../src/common/docview.cpp:294 ../src/common/docview.cpp:330
 msgid "File error"
 msgstr "Chyba souboru"
 
@@ -1302,7 +1309,7 @@ msgstr "Chyba souboru"
 msgid "File name exists already."
 msgstr "Soubor tohoto jm<6A>na ji<6A> existuje."
 
-#: ../src/msw/filedlg.cpp:303
+#: ../src/msw/filedlg.cpp:297
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Soubory (%s)|%s"
@@ -1418,7 +1425,7 @@ msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejsk<73> (ISO-8859-8)"
 
 #: ../src/common/dlgcmn.cpp:144 ../src/generic/proplist.cpp:528
-#: ../src/html/helpfrm.cpp:208 ../src/msw/mdi.cpp:1276
+#: ../src/html/helpfrm.cpp:208 ../src/msw/mdi.cpp:1266
 msgid "Help"
 msgstr "N<>pov<6F>da"
 
@@ -1497,7 +1504,7 @@ msgstr "Kurz
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "Italsk<73> ob<6F>lka, 110 x 230 mm"
 
-#: ../src/common/imagjpeg.cpp:202
+#: ../src/common/imagjpeg.cpp:198
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: Nemohu na<6E><61>st obr<62>zek - soubor je nejsp<73><70> po<70>kozen."
 
@@ -1509,7 +1516,7 @@ msgstr "JPEG: Nemohu ulo
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/dcpsg.cpp:2248 ../src/generic/prntdlgg.cpp:441
+#: ../src/generic/dcpsg.cpp:2232 ../src/generic/prntdlgg.cpp:441
 #: ../src/generic/prntdlgg.cpp:637
 msgid "Landscape"
 msgstr "Na <20><><EFBFBD>ku"
@@ -1539,7 +1546,7 @@ msgid "Light"
 msgstr "Tenk<6E>"
 
 #: ../src/generic/filedlgg.cpp:1270 ../src/gtk/filedlg.cpp:241
-#: ../src/motif/filedlg.cpp:351 ../src/msw/filedlg.cpp:483
+#: ../src/motif/filedlg.cpp:351 ../src/msw/filedlg.cpp:475
 #, c-format
 msgid "Load %s file"
 msgstr "Na<4E><61>st soubor %s"
@@ -1676,7 +1683,7 @@ msgstr "Norm
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 palc<6C>"
 
-#: ../src/common/dlgcmn.cpp:127 ../src/generic/dcpsg.cpp:2256
+#: ../src/common/dlgcmn.cpp:127 ../src/generic/dcpsg.cpp:2240
 #: ../src/generic/dirdlgg.cpp:422 ../src/generic/filedlgg.cpp:907
 #: ../src/generic/fontdlgg.cpp:256 ../src/generic/logg.cpp:729
 #: ../src/generic/prntdlgg.cpp:467 ../src/generic/proplist.cpp:511
@@ -1805,12 +1812,12 @@ msgstr "Pros
 msgid "Please wait..."
 msgstr "<22>ekejte pros<6F>m..."
 
-#: ../src/generic/dcpsg.cpp:2247 ../src/generic/prntdlgg.cpp:440
+#: ../src/generic/dcpsg.cpp:2231 ../src/generic/prntdlgg.cpp:440
 #: ../src/generic/prntdlgg.cpp:636
 msgid "Portrait"
 msgstr "Na v<><76>ku"
 
-#: ../src/generic/dcpsg.cpp:391
+#: ../src/generic/dcpsg.cpp:377
 msgid "PostScript"
 msgstr "PostScript"
 
@@ -1818,11 +1825,11 @@ msgstr "PostScript"
 msgid "PostScript file"
 msgstr "soubor PostScript"
 
-#: ../src/generic/dcpsg.cpp:2289
+#: ../src/generic/dcpsg.cpp:2273
 msgid "PostScript:"
 msgstr "PostScript:"
 
-#: ../src/generic/dcpsg.cpp:2252
+#: ../src/generic/dcpsg.cpp:2236
 msgid "Preview Only"
 msgstr "Pouze n<>hled"
 
@@ -1838,7 +1845,7 @@ msgstr "P
 msgid "Print"
 msgstr "Vytisknout"
 
-#: ../src/common/docview.cpp:897
+#: ../src/common/docview.cpp:895
 msgid "Print Preview"
 msgstr "N<>hled tisku"
 
@@ -1866,7 +1873,7 @@ msgstr "Tiskov
 msgid "Print this page"
 msgstr "Vytiskne tuto str<74>nku"
 
-#: ../src/generic/dcpsg.cpp:2251 ../src/generic/prntdlgg.cpp:150
+#: ../src/generic/dcpsg.cpp:2235 ../src/generic/prntdlgg.cpp:150
 msgid "Print to File"
 msgstr "Tisknout do souboru"
 
@@ -1874,15 +1881,15 @@ msgstr "Tisknout do souboru"
 msgid "Print..."
 msgstr "Tisknout..."
 
-#: ../src/generic/dcpsg.cpp:2262
+#: ../src/generic/dcpsg.cpp:2246
 msgid "Printer Command: "
 msgstr "P<><50>kaz tisku: "
 
-#: ../src/generic/dcpsg.cpp:2267
+#: ../src/generic/dcpsg.cpp:2251
 msgid "Printer Options: "
 msgstr "Nastaven<65> tisk<73>rny: "
 
-#: ../src/generic/dcpsg.cpp:360
+#: ../src/generic/dcpsg.cpp:346
 msgid "Printer Settings"
 msgstr "Nastaven<65> tisk<73>rny"
 
@@ -1974,7 +1981,7 @@ msgstr "Zb
 msgid "Remove current page from bookmarks"
 msgstr "Odstran<61> tuto str<74>nku ze z<>lo<6C>ek"
 
-#: ../src/msw/filedlg.cpp:445
+#: ../src/msw/filedlg.cpp:437
 #, c-format
 msgid "Replace file '%s'?"
 msgstr "Nahradit soubor '%s'?"
@@ -1988,12 +1995,12 @@ msgid "Roman"
 msgstr "Patkov<6F>"
 
 #: ../src/generic/filedlgg.cpp:1286 ../src/gtk/filedlg.cpp:257
-#: ../src/motif/filedlg.cpp:353 ../src/msw/filedlg.cpp:484
+#: ../src/motif/filedlg.cpp:353 ../src/msw/filedlg.cpp:476
 #, c-format
 msgid "Save %s file"
 msgstr "Ulo<6C>it soubor %s"
 
-#: ../src/common/docview.cpp:249
+#: ../src/common/docview.cpp:247
 msgid "Save as"
 msgstr "Ulo<6C>it jako"
 
@@ -2035,19 +2042,19 @@ msgstr "Sekce"
 msgid "Seek error on file '%s'"
 msgstr "Chyba p<>i nastavov<6F>n<EFBFBD> pozice v souboru '%s'"
 
-#: ../src/common/docview.cpp:1469
+#: ../src/common/docview.cpp:1426
 msgid "Select a document template"
 msgstr "Vyberte <20>ablonu dokumentu"
 
-#: ../src/common/docview.cpp:1494
+#: ../src/common/docview.cpp:1449
 msgid "Select a document view"
 msgstr "Vyberte zobrazen<65> dokumentu"
 
-#: ../src/common/docview.cpp:1371 ../src/common/docview.cpp:1422
+#: ../src/common/docview.cpp:1344 ../src/common/docview.cpp:1381
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: ../src/generic/dcpsg.cpp:2250
+#: ../src/generic/dcpsg.cpp:2234
 msgid "Send to Printer"
 msgstr "Poslat na tisk<73>rnu"
 
@@ -2093,16 +2100,15 @@ msgstr "Velikost"
 msgid "Slant"
 msgstr "Sklon<6F>n<EFBFBD>"
 
-#: ../src/common/docview.cpp:306
+#: ../src/common/docview.cpp:304
 msgid "Sorry, could not open this file for saving."
 msgstr "Tento soubor nelze otev<65><76>t pro z<>pis."
 
-#: ../src/common/docview.cpp:342 ../src/common/docview.cpp:354
-#: ../src/common/docview.cpp:1390
+#: ../src/common/docview.cpp:340 ../src/common/docview.cpp:352
 msgid "Sorry, could not open this file."
 msgstr "Tento soubor nelze otev<65><76>t."
 
-#: ../src/common/docview.cpp:313
+#: ../src/common/docview.cpp:311
 msgid "Sorry, could not save this file."
 msgstr "Tento soubor nelze ulo<6C>it."
 
@@ -2151,7 +2157,7 @@ msgstr "Tabloid, 11 x 17 palc
 msgid "Teletype"
 msgstr "Psac<61> stroj"
 
-#: ../src/common/docview.cpp:1469
+#: ../src/common/docview.cpp:1426
 msgid "Templates"
 msgstr "<22>ablony"
 
@@ -2167,7 +2173,7 @@ msgstr "Thajsk
 msgid "The Computer"
 msgstr "Po<50><6F>ta<74>"
 
-#: ../src/common/fontmap.cpp:479
+#: ../src/common/fontmap.cpp:466
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -2187,7 +2193,7 @@ msgstr "Form
 msgid "The directory "
 msgstr "Adres<65><73> "
 
-#: ../src/common/fontmap.cpp:672
+#: ../src/common/fontmap.cpp:655
 #, c-format
 msgid ""
 "The encoding '%s' is unknown.\n"
@@ -2198,7 +2204,7 @@ msgstr ""
 "P<>ejete si vybrat font, kter<65> se m<> s t<>mto k<>dov<6F>n<EFBFBD>m pou<6F><75>t\n"
 "(jinak se text v tomto k<>dov<6F>n<EFBFBD> nezobraz<61> spr<70>vn<76>)?"
 
-#: ../src/common/docview.cpp:1676
+#: ../src/common/docview.cpp:1631
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
@@ -2348,8 +2354,8 @@ msgstr "Nezn
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "P<>ebyte<74>n<EFBFBD> '{' v popisu mime typu %s."
 
-#: ../src/common/docview.cpp:1923 ../src/common/docview.cpp:1938
-#: ../src/common/docview.cpp:1965
+#: ../src/common/docview.cpp:1878 ../src/common/docview.cpp:1893
+#: ../src/common/docview.cpp:1920
 msgid "Unnamed command"
 msgstr "Nepojmenovan<61> p<><70>kaz"
 
@@ -2391,7 +2397,7 @@ msgstr "Prohl
 msgid "View files as a list view"
 msgstr "Prohl<68><6C>et soubory v seznamu"
 
-#: ../src/common/docview.cpp:1494
+#: ../src/common/docview.cpp:1449
 msgid "Views"
 msgstr "Pohledy"
 
@@ -2399,7 +2405,7 @@ msgstr "Pohledy"
 msgid "Waiting for subprocess termination failed"
 msgstr "<22>ek<65>n<EFBFBD> na ukon<6F>en<65> podprocesu selhalo"
 
-#: ../src/common/docview.cpp:437 ../src/common/resource.cpp:121
+#: ../src/common/docview.cpp:435 ../src/common/resource.cpp:121
 msgid "Warning"
 msgstr "Varov<6F>n<EFBFBD>"
 
@@ -2427,7 +2433,7 @@ msgstr "Pouze cel
 msgid "Win32s on Windows 3.1"
 msgstr "Win32s na Windows 3.1"
 
-#: ../src/msw/mdi.cpp:1311
+#: ../src/msw/mdi.cpp:1301
 msgid "Window"
 msgstr "Windows 3.1"
 
@@ -2481,19 +2487,19 @@ msgstr "Windows/DOS OEM (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "Chyba p<>i z<>pisu do souboru '%s'"
 
-#: ../src/generic/dcpsg.cpp:2307
+#: ../src/generic/dcpsg.cpp:2291
 msgid "X Scaling"
 msgstr "M<><4D><EFBFBD>tko v X"
 
-#: ../src/generic/dcpsg.cpp:2316
+#: ../src/generic/dcpsg.cpp:2300
 msgid "X Translation"
 msgstr "Posunut<75> v X"
 
-#: ../src/generic/dcpsg.cpp:2311
+#: ../src/generic/dcpsg.cpp:2295
 msgid "Y Scaling"
 msgstr "M<><4D><EFBFBD>tko v Y"
 
-#: ../src/generic/dcpsg.cpp:2320
+#: ../src/generic/dcpsg.cpp:2304
 msgid "Y Translation"
 msgstr "Posunut<75> v Y"
 
@@ -2506,7 +2512,7 @@ msgstr "Ano"
 msgid "You cannot add a new directory to this section."
 msgstr "Nem<65><6D>ete p<>idat nov<6F> adres<65><73> do t<>to sekce."
 
-#: ../src/common/docview.cpp:2034
+#: ../src/common/docview.cpp:1989
 msgid "[EMPTY]"
 msgstr "[PR<50>ZDN<44>]"
 
@@ -2659,7 +2665,7 @@ msgstr "nemohu vypr
 msgid "can't get seek position on file descriptor %d"
 msgstr "nemohu zjistit pozici v deskriptoru %d"
 
-#: ../src/common/fontmap.cpp:614
+#: ../src/common/fontmap.cpp:597
 msgid "can't load any font, aborting"
 msgstr "nemohu na<6E><61>st <20><>dn<64> font, kon<6F><6E>m"
 
@@ -2716,7 +2722,7 @@ msgstr "nemohu zapisovat do deskriptoru %d"
 msgid "can't write user configuration file."
 msgstr "nemohu ulo<6C>it u<>ivatelskou konfiguraci"
 
-#: ../src/common/intl.cpp:374
+#: ../src/common/intl.cpp:357
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "katalog pro dom<6F>nu '%s' nenalezen."
@@ -2725,19 +2731,19 @@ msgstr "katalog pro dom
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:912
+#: ../src/common/cmdline.cpp:910
 msgid "date"
 msgstr "datum"
 
-#: ../src/common/datetime.cpp:3182
+#: ../src/common/datetime.cpp:3232
 msgid "eighteenth"
 msgstr "osmn<6D>ct<63>"
 
-#: ../src/common/datetime.cpp:3172
+#: ../src/common/datetime.cpp:3222
 msgid "eighth"
 msgstr "osm<73>"
 
-#: ../src/common/datetime.cpp:3175
+#: ../src/common/datetime.cpp:3225
 msgid "eleventh"
 msgstr "jeden<65>ct<63>"
 
@@ -2755,11 +2761,11 @@ msgstr "nav
 msgid "failed to flush the file '%s'"
 msgstr "nelze vypr<70>zdnit buffer souboru '%s'"
 
-#: ../src/common/datetime.cpp:3179
+#: ../src/common/datetime.cpp:3229
 msgid "fifteenth"
 msgstr "patn<74>ct<63>"
 
-#: ../src/common/datetime.cpp:3169
+#: ../src/common/datetime.cpp:3219
 msgid "fifth"
 msgstr "p<>t<EFBFBD>"
 
@@ -2788,19 +2794,19 @@ msgstr "soubor '%s',
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "soubor '%s': neo<65>ek<65>van<61> znak %c na <20><>dku %d."
 
-#: ../src/common/datetime.cpp:3165
+#: ../src/common/datetime.cpp:3215
 msgid "first"
 msgstr "prvn<76>"
 
-#: ../src/common/datetime.cpp:3178
+#: ../src/common/datetime.cpp:3228
 msgid "fourteenth"
 msgstr "<22>trn<72>ct<63>"
 
-#: ../src/common/datetime.cpp:3168
+#: ../src/common/datetime.cpp:3218
 msgid "fourth"
 msgstr "<22>tvrt<72>"
 
-#: ../src/common/timercmn.cpp:240
+#: ../src/common/timercmn.cpp:233
 msgid "gmtime() failed"
 msgstr "gmtime() selhalo"
 
@@ -2820,12 +2826,12 @@ msgstr "
 msgid "large"
 msgstr "velk<6C>"
 
-#: ../src/common/intl.cpp:569
+#: ../src/common/intl.cpp:549
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "locale '%s' nem<65><6D>e b<>t nastaveno"
 
-#: ../src/common/intl.cpp:369
+#: ../src/common/intl.cpp:352
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "hled<65>m katalog '%s' v cest<73> '%s'."
@@ -2834,19 +2840,19 @@ msgstr "hled
 msgid "medium"
 msgstr "st<73>edn<64>"
 
-#: ../src/common/datetime.cpp:3329
+#: ../src/common/datetime.cpp:3379
 msgid "midnight"
 msgstr "Tenk<6E>"
 
-#: ../src/common/timercmn.cpp:236
+#: ../src/common/timercmn.cpp:229
 msgid "mktime() failed"
 msgstr "mktime() selhalo"
 
-#: ../src/common/datetime.cpp:3183
+#: ../src/common/datetime.cpp:3233
 msgid "nineteenth"
 msgstr "devaten<65>ct<63>"
 
-#: ../src/common/datetime.cpp:3173
+#: ../src/common/datetime.cpp:3223
 msgid "ninth"
 msgstr "dev<65>t<EFBFBD>"
 
@@ -2858,11 +2864,11 @@ msgstr "
 msgid "noname"
 msgstr "bezejmenn<6E>"
 
-#: ../src/common/datetime.cpp:3328
+#: ../src/common/datetime.cpp:3378
 msgid "noon"
 msgstr "poledne"
 
-#: ../src/common/cmdline.cpp:911
+#: ../src/common/cmdline.cpp:909
 msgid "num"
 msgstr "<22><>slo"
 
@@ -2870,15 +2876,15 @@ msgstr "
 msgid "reentrancy problem."
 msgstr "probl<62>m reentrance."
 
-#: ../src/common/datetime.cpp:3166
+#: ../src/common/datetime.cpp:3216
 msgid "second"
 msgstr "druh<75>"
 
-#: ../src/common/datetime.cpp:3181
+#: ../src/common/datetime.cpp:3231
 msgid "seventeenth"
 msgstr "sedmn<6D>ct<63>"
 
-#: ../src/common/datetime.cpp:3171
+#: ../src/common/datetime.cpp:3221
 msgid "seventh"
 msgstr "sedm<64>"
 
@@ -2886,11 +2892,11 @@ msgstr "sedm
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/datetime.cpp:3180
+#: ../src/common/datetime.cpp:3230
 msgid "sixteenth"
 msgstr "<22>estn<74>ct<63>"
 
-#: ../src/common/datetime.cpp:3170
+#: ../src/common/datetime.cpp:3220
 msgid "sixth"
 msgstr "<22>est<73>"
 
@@ -2898,11 +2904,11 @@ msgstr "
 msgid "small"
 msgstr "mal<61>"
 
-#: ../src/common/cmdline.cpp:910
+#: ../src/common/cmdline.cpp:908
 msgid "str"
 msgstr "<22>et<65>zec"
 
-#: ../src/common/datetime.cpp:3174
+#: ../src/common/datetime.cpp:3224
 msgid "tenth"
 msgstr "des<65>t<EFBFBD>"
 
@@ -2910,11 +2916,11 @@ msgstr "des
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "odpov<6F><76> na transakci zp<7A>sobila nastaven<65> bitu DDE_FBUSY."
 
-#: ../src/common/datetime.cpp:3167
+#: ../src/common/datetime.cpp:3217
 msgid "third"
 msgstr "t<>et<65>"
 
-#: ../src/common/datetime.cpp:3177
+#: ../src/common/datetime.cpp:3227
 msgid "thirteenth"
 msgstr "t<>in<69>ct<63>"
 
@@ -2926,11 +2932,11 @@ msgstr "dnes"
 msgid "tomorrow"
 msgstr "v<>era"
 
-#: ../src/common/datetime.cpp:3176
+#: ../src/common/datetime.cpp:3226
 msgid "twelfth"
 msgstr "dvan<61>ct<63>"
 
-#: ../src/common/datetime.cpp:3184
+#: ../src/common/datetime.cpp:3234
 msgid "twentieth"
 msgstr "dvac<61>t<EFBFBD>"
 
@@ -2957,16 +2963,16 @@ msgstr "nezn
 msgid "unknown-%d"
 msgstr "nezname-%d"
 
-#: ../src/common/docview.cpp:406
+#: ../src/common/docview.cpp:404
 msgid "unnamed"
 msgstr "nepojmenovan<61>"
 
-#: ../src/common/docview.cpp:1188
+#: ../src/common/docview.cpp:1186
 #, c-format
 msgid "unnamed%d"
 msgstr "nepojmenovan<61>%d"
 
-#: ../src/common/intl.cpp:379
+#: ../src/common/intl.cpp:362
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "pou<6F><75>v<EFBFBD>m katalog '%s' z '%s'."
@@ -2979,7 +2985,7 @@ msgstr "velmi velk
 msgid "very small"
 msgstr "velmi mal<61>"
 
-#: ../src/common/timercmn.cpp:267
+#: ../src/common/timercmn.cpp:260
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay selhalo."
 
@@ -2996,7 +3002,7 @@ msgstr "wxSocket: nezn
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr "wxWindows nemohou otev<65><76>t displej pro '%s': ukon<6F>uji."
 
-#: ../src/common/filefn.cpp:1230
+#: ../src/common/filefn.cpp:1214
 msgid "wxWindows: error finding temporary file name.\n"
 msgstr "wxWindows: chyba p<>i hled<65>n<EFBFBD> jm<6A>na do<64>asn<73>ho souboru.\n"
 
@@ -3004,12 +3010,6 @@ msgstr "wxWindows: chyba p
 msgid "yesterday"
 msgstr "v<>era"
 
-#~ msgid "Can not create mutex."
-#~ msgstr "Nemohu vytvo<76>it mutex."
-
-#~ msgid "Couldn't change the state of event object."
-#~ msgstr "Nemohu zm<7A>nit stav event object."
-
 #~ msgid "Previewing"
 #~ msgstr "Vytv<74><76><EFBFBD>m n<>hled"
 

samples/console/console.cpp

@@ -35,28 +35,28 @@
 
 // what to test (in alphabetic order)?
 
-#define TEST_ARRAYS
-#define TEST_CMDLINE
-#define TEST_DATETIME
-#define TEST_DIR
-#define TEST_DLLLOADER
-#define TEST_EXECUTE
+//#define TEST_ARRAYS
+//#define TEST_CMDLINE
+//#define TEST_DATETIME
+//#define TEST_DIR
+//#define TEST_DLLLOADER
+//#define TEST_EXECUTE
 #define TEST_FILE
-#define TEST_FILECONF
-#define TEST_HASH
-#define TEST_LIST
-#define TEST_LOG
-#define TEST_LONGLONG
-#define TEST_MIME
-#define TEST_INFO_FUNCTIONS
-#define TEST_SOCKETS
-#define TEST_STRINGS
-#define TEST_THREADS
-#define TEST_TIMER
+//#define TEST_FILECONF
+//#define TEST_HASH
+//#define TEST_LIST
+//#define TEST_LOG
+//#define TEST_LONGLONG
+//#define TEST_MIME
+//#define TEST_INFO_FUNCTIONS
+//#define TEST_SOCKETS
+//#define TEST_STRINGS
+//#define TEST_THREADS
+//#define TEST_TIMER
 //#define TEST_VCARD            -- don't enable this (VZ)
-#define TEST_WCHAR
-#define TEST_ZIP
-#define TEST_ZLIB
+//#define TEST_WCHAR
+//#define TEST_ZIP
+//#define TEST_ZLIB
 
 // ----------------------------------------------------------------------------
 // test class for container objects
@@ -1020,7 +1020,7 @@ static void TestLongLongComparison()
        -0x1234,
     };
 
-    wxLongLong lls[2];
+    wxLongLongWx lls[2];
     lls[0] = ls[0];
     lls[1] = ls[1]; 
 
@@ -1613,7 +1613,6 @@ static void TestUtf8()
 "ont à cœur de pouvoir utiliser tous leurs caractères ! :)";
 #endif
 
-#if wxUSE_WCHAR_T
     wxWCharBuffer wchBuf = testString.wc_str(wxConvUTF8);
     const wchar_t *pwz = (const wchar_t *)wchBuf;
     wxString testString2(pwz, wxConvLocal);
@@ -1632,9 +1631,6 @@ static void TestUtf8()
     delete [] pwz2;
 
     printf("Encoding '%s' -> '%s'\n", psz, testString3.c_str());
-#else
-    puts("WARNING: not compiled in.");
-#endif // wxUSE_WCHAR_T
 }
 
 #endif // TEST_WCHAR
@@ -3622,7 +3618,7 @@ int main(int argc, char **argv)
 
         TestTimeZoneBug();
     }
-    if ( 1 )
+    if ( 0 )
         TestInteractive();
 #endif // TEST_DATETIME
 

samples/controls/controls.cpp

@@ -205,13 +205,6 @@ public:
         event.Skip();
     }
 
-    void OnButton(wxMouseEvent& event)
-    {
-        wxLogMessage(_T("MyButton::OnButton"));
-
-        event.Skip();
-    }
-
 private:
     DECLARE_EVENT_TABLE()
 };
@@ -490,7 +483,6 @@ END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyButton, wxButton)
     EVT_LEFT_DCLICK(MyButton::OnDClick)
-    EVT_BUTTON(-1, MyButton::OnButton)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyComboBox, wxComboBox)
@@ -667,26 +659,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
     m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
-    static const wxString choices2[] =
+    wxString choices2[] =
     {
         "First", "Second",
-    };
-
-    static const wxString choices10[] =
-    {
-        "First", "Second", "Third", "Fourth", "Fifth",
-         "Sixth", "Seventh", "Eighth", "Nineth", "Tenth"
+        /* "Third",
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 
     panel = new wxPanel(m_notebook);
-    m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
     (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
-
-    wxRadioBox *radio2 = new wxRadioBox(panel, -1, "And another one with very very long title",
-                                        wxPoint(165, 115), wxDefaultSize,
-                                        WXSIZEOF(choices10), choices10,
-                                        3, wxRA_SPECIFY_COLS);
-    radio2->SetToolTip("Test tooltip");
+    m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
 
 #if wxUSE_TOOLTIPS
     m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?");
@@ -697,11 +680,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) );
     m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) );
     (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) );
-    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(400,130), wxDefaultSize );
-    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radio&1",
-                                           wxPoint(400,170), wxDefaultSize, wxRB_GROUP );
-    rb->SetValue( TRUE );
-    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radio&2", wxPoint(460,170), wxDefaultSize );
+    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize );
+    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
+    rb->SetValue( FALSE );
+    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize );
     m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
     panel = new wxPanel(m_notebook);

samples/internat/Makefile.in

@@ -13,12 +13,12 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../..
 program_dir = samples/internat
 
-DATAFILES=\
-    fr/internat.mo fr/wxstd.mo \
-	de/internat.mo de/wxstd.mo \
-	ru/internat.mo ru/wxstd.mo
+DATAFILES=fr/internat.po fr/internat.mo \
+	de/internat.po de/internat.mo \
+	fr/wxstd.po fr/wxstd.mo \
+	de/wxstd.po de/wxstd.mo
 
-DATADIRS=fr de ru
+DATADIRS=fr de
 
 PROGRAM=internat
 

samples/internat/internat.cpp

@@ -28,7 +28,6 @@
 #include "wx/intl.h"
 #include "wx/file.h"
 #include "wx/log.h"
-#include "wx/fontmap.h"
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
@@ -50,14 +49,12 @@ class MyFrame: public wxFrame
 public:
   MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h);
 
-protected:
+public:
   void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnPlay(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
-  void OnPaint(wxPaintEvent& event);
 
-private:
   DECLARE_EVENT_TABLE()
 };
 
@@ -76,8 +73,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
   EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout)
   EVT_MENU(MINIMAL_TEST, MyFrame::OnPlay)
   EVT_MENU(MINIMAL_OPEN, MyFrame::OnOpen)
-
-  EVT_PAINT(MyFrame::OnPaint)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
@@ -91,14 +86,8 @@ bool MyApp::OnInit()
   const char *langid = NULL;
   switch ( argc )
   {
-      case 4:
-          {
-              wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(argv[3]);
-              if ( enc != wxFONTENCODING_SYSTEM )
-                wxFont::SetDefaultEncoding(enc);
-          }
-
-          // fall through
+      default:
+          // ignore the other args, fall through
 
       case 3:
           language = argv[1];
@@ -214,11 +203,3 @@ void MyFrame::OnOpen(wxCommandEvent&)
   // got wxstd.mo somewhere in the search path
   wxFile file("NOTEXIST.ING");
 }
-
-void MyFrame::OnPaint(wxPaintEvent&)
-{
-    wxPaintDC dc(this);
-    wxFont font(12, wxDEFAULT, wxNORMAL, wxNORMAL);
-    dc.SetFont(font);
-    dc.DrawText(_("International wxWindows App"), 10, 10);
-}

samples/internat/ru/internat.po

@@ -1,81 +0,0 @@
-# Message catalog file template for the wxWindows i18n sample
-# Copyright (C) 1999 wxWindows development team
-# Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-msgid ""
-msgstr ""
-"Project-Id-Version: wxWindows 2.0 i18n sample\n"
-"POT-Creation-Date: 2000-08-10 15:56+0200\n"
-"PO-Revision-Date: 2000-08-10 15:56+0200\n"
-"Last-Translator: Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>\n"
-"Language-Team: <wx-translators@wxwindows.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:128
-msgid "International wxWindows App"
-msgstr "<22><><EFBFBD>΁ԁŁҁ΁<D281><CE81>ÁɁρ΁<CF81><CE81>́؁΁ρ<CE81> <20>ЁҁɁ́ρցŁ΁Ɂ<CE81> wxWindows"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:136
-msgid "&About..."
-msgstr "&<26><> <20>Ёҁρǁҁ<C781><D281>́́<CD81>..."
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:138
-msgid "E&xit"
-msgstr "&<26><><EFBFBD>فʁԁ<CA81>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:141
-msgid "&Open bogus file"
-msgstr "&<26><><EFBFBD>ԁˁҁفԁ<D981> <20>Ɓ<EFBFBD><C681>ʁ<EFBFBD>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:142
-msgid "&Play a game"
-msgstr "&<26><><EFBFBD>ρɁǁҁ<C781><D281>ԁ<EFBFBD> <20><> <20>Ɂǁҁ<C781>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:145
-msgid "&File"
-msgstr "&<26><><EFBFBD><EFBFBD><EFBFBD>ʁ<EFBFBD>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:146
-msgid "&Test"
-msgstr "&<26><><EFBFBD>ŁӁ<C581>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:169
-msgid ""
-"I18n sample\n"
-"<22><><EFBFBD><EFBFBD> 1998, 1999 Vadim Zeitlin and Julian Smart"
-msgstr ""
-"<22><><EFBFBD>ҁɁ́Ł<CD81> i18n\n"
-"<22><><EFBFBD><EFBFBD> 1998, 1999 <20><><EFBFBD><EFBFBD><EFBFBD>āɁ<C481> <20><><EFBFBD>Łʁԁ́Ɂ<CC81> <20><> <20><><EFBFBD>ցՁ́Ɂ<CC81><C981><EFBFBD> <20><><EFBFBD>́<EFBFBD><CD81>ҁ<EFBFBD>"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:171
-msgid "About Internat"
-msgstr "<22><><EFBFBD>ҁ<EFBFBD> Internat"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:176
-msgid "Enter your number:"
-msgstr "<22><><EFBFBD>ׁŁā<C581> <20>Ӂׁρ<D781> <20>ށɁӁ́<D381>:"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:177
-msgid "Try to guess my number!"
-msgstr "<22><><EFBFBD>ρЁҁρՁ<C281> <20>Ձǁ<D581><C781>ā<EFBFBD><C481>ԁ<EFBFBD> <20>́ρ<CD81> <20>ށɁӁ́<D381>!"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:185
-msgid "You've probably entered an invalid number."
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ׁŁҁ΁<D281> <20>ԁ<EFBFBD> <20>ׁׁŁ<D781> <20>΁ŁāρЁՁӁԁɁ́ρ<CD81> <20>ށɁӁ́<D381>."
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:193
-msgid "Congratulations! you've won. Here is the magic phrase:"
-msgstr "<22><><EFBFBD>ρځāҁ<C481><D281>ׁ́с<CC81>! <20><><EFBFBD><EFBFBD> <20>ׁفɁǁҁ<C781><D281>́<EFBFBD>. <20><> <20>ׁρ<D781> <20>́<EFBFBD><CD81>ǁɁށŁӁˁ<D381><CB81><EFBFBD> <20>Ɓҁ<C681><D281>ځ<EFBFBD>: "
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:194
-#, c-format
-msgid "cannot create fifo `%s'"
-msgstr "<22>΁<EFBFBD> <20>́ρǁ<CF81> <20>Ӂρځā<DA81><C481>ԁ<EFBFBD> fifo `%s'"
-
-#: /home/harms.user1/rolinsky/wxGTK-2.2.0/samples/internat/internat.cpp:197
-msgid "Result"
-msgstr "<22><><EFBFBD>ŁځՁ́؁ԁ<D881><D481><EFBFBD>"
-
-#~ msgid "Bad luck! try again..."
-#~ msgstr "<22><><EFBFBD><EFBFBD> <20>ׁŁځŁ<DA81>! <20><><EFBFBD>ρЁҁρՁ<C281> <20>Ӂ΁ρׁ<CF81>..."

samples/internat/ru/wxstd.po

@@ -1,127 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: wxWindows 2.0 i18n sample\n"
-"POT-Creation-Date: 2000-08-10 15:56+0200\n"
-"PO-Revision-Date: 2000-08-10 15:56+0200\n"
-"Last-Translator: Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>\n"
-"Language-Team: <wx-translators@wxwindows.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: file.cpp:182 hello.cpp:38
-#, c-format
-msgid "can't create file '%s'"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> '%s'"
-
-#: file.cpp:213
-#, c-format
-msgid "can't open file '%s'"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> '%s'"
-
-#: file.cpp:227
-#, c-format
-msgid "can't close file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:244
-#, c-format
-msgid "can't read from file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:258
-#, c-format
-msgid "can't write to file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:271
-#, c-format
-msgid "can't flush file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:308
-#, c-format
-msgid "can't seek on file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:322
-#, c-format
-msgid "can't get seek position on file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:355
-#, c-format
-msgid "can't find length of file on file descriptor %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: intl.cpp:139
-#, c-format
-msgid "catalog file for domain '%s' not found."
-msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-#: intl.cpp:177
-#, c-format
-msgid "'%s' is not a valid message catalog."
-msgstr "'%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-#: intl.cpp:330 intl.cpp:334
-#, c-format
-msgid "locale '%s' can not be set."
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-#: intl.cpp:431 intl.cpp:435
-#, c-format
-msgid "string '%s' not found in domain '%s' for locale '%s'."
-msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'."
-
-#: intl.cpp:434 intl.cpp:438
-#, c-format
-msgid "string '%s' not found in locale '%s'."
-msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'."
-
-#: log.cpp:104
-#, c-format
-msgid " (error %ld: %s)"
-msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld: %s)"
-
-#: log.cpp:165
-msgid "Debug: "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
-
-#: log.cpp:171
-msgid "Fatal error: "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
-
-#: log.cpp:172
-msgid "Program aborted.\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-
-#: log.cpp:177
-msgid "Error: "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
-
-#: log.cpp:181
-msgid "Warning: "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: "
-
-#: log.cpp:268
-#, c-format
-msgid "Assert failed in file %s at line %d"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> assert <20> <20><><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
-
-#: file.cpp:303
-msgid "unknown seek origin"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-msgid "looking for catalog '%s' in path '%s'."
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD> '%s'."
-
-#: intl.cpp:378
-msgid "no message catalog list"
-msgstr "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-
-msgid "OK"
-msgstr "OK"
-
-msgid "Cancel"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

samples/mdi/mdi.cpp

@@ -81,11 +81,6 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
     EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
     EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
     EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
-    EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition)
-    EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize)
-
-    EVT_SIZE(MyChild::OnSize)
-    EVT_MOVE(MyChild::OnMove)
 
     EVT_CLOSE(MyChild::OnClose)
 END_EVENT_TABLE()
@@ -241,9 +236,6 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 
     option_menu->Append(MDI_REFRESH, "&Refresh picture");
     option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
-    option_menu->AppendSeparator();
-    option_menu->Append(MDI_CHANGE_POSITION, "Move frame\tCtrl-M");
-    option_menu->Append(MDI_CHANGE_SIZE, "Resize frame\tCtrl-S");
 
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(MDI_ABOUT, "&About");
@@ -251,7 +243,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     wxMenuBar *menu_bar = new wxMenuBar;
 
     menu_bar->Append(file_menu, "&File");
-    menu_bar->Append(option_menu, "&Child");
+    menu_bar->Append(option_menu, "&Options");
     menu_bar->Append(help_menu, "&Help");
 
     // Associate the menu bar with the frame
@@ -430,16 +422,6 @@ void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
         canvas->Refresh();
 }
 
-void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event))
-{
-    Move(10, 10);
-}
-
-void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event))
-{
-    SetClientSize(100, 100);
-}
-
 void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_title = _T("Canvas Frame");
@@ -461,33 +443,6 @@ void MyChild::OnActivate(wxActivateEvent& event)
         canvas->SetFocus();
 }
 
-void MyChild::OnMove(wxMoveEvent& event)
-{
-    // VZ: here everything is totally wrong under MSW, the positions are
-    //     different and both wrong (pos2 is off by 2 pixels for me which seems
-    //     to be the width of the MDI canvas border)
-    wxPoint pos1 = event.GetPosition(),
-            pos2 = GetPosition();
-    wxLogStatus("position from event: (%d, %d), from frame (%d, %d)",
-                pos1.x, pos1.y, pos2.x, pos2.y);
-
-    event.Skip();
-}
-
-void MyChild::OnSize(wxSizeEvent& event)
-{
-    // VZ: under MSW the size event carries the client size (quite
-    //     unexpectedly) *except* for the very first one which has the full
-    //     size... what should it really be? TODO: check under wxGTK
-    wxSize size1 = event.GetSize(),
-           size2 = GetSize(),
-           size3 = GetClientSize();
-    wxLogStatus("size from event: %dx%d, from frame %dx%d, client %dx%d",
-                size1.x, size1.y, size2.x, size2.y, size3.x, size3.y);
-
-    event.Skip();
-}
-
 void MyChild::OnClose(wxCloseEvent& event)
 {
     if ( canvas && canvas->IsDirty() )

samples/mdi/mdi.h

@@ -65,11 +65,7 @@ public:
 
     void OnRefresh(wxCommandEvent& event);
     void OnChangeTitle(wxCommandEvent& event);
-    void OnChangePosition(wxCommandEvent& event);
-    void OnChangeSize(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnMove(wxMoveEvent& event);
     void OnClose(wxCloseEvent& event);
 
     DECLARE_EVENT_TABLE()
@@ -82,8 +78,6 @@ enum
     MDI_NEW_WINDOW,
     MDI_REFRESH,
     MDI_CHANGE_TITLE,
-    MDI_CHANGE_POSITION,
-    MDI_CHANGE_SIZE,
     MDI_CHILD_QUIT,
     MDI_ABOUT
 };

samples/menu/menu.cpp

@@ -77,7 +77,6 @@ public:
     void OnRightDown(wxMouseEvent& event);
 
     void OnUpdateCheckMenuItemUI(wxUpdateUIEvent& event);
-    void OnUpdatePopup(wxUpdateUIEvent& event) { event.Enable(FALSE); }
 
 private:
     wxMenu *CreateDummyMenu(wxString *title);
@@ -110,17 +109,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-class MyPopupMenu : public wxMenu
-{
-public:
-    MyPopupMenu(const wxString& title) : wxMenu(title) { }
-
-    void OnUpdateUI(wxUpdateUIEvent& event) { event.Enable(FALSE); }
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -157,8 +145,6 @@ enum
 
     Menu_Popup_ToBeDeleted = 2000,
     Menu_Popup_ToBeGreyed,
-    Menu_Popup_ToBeGreyed2,
-    Menu_Popup_ToBeGreyed3,
     Menu_Popup_ToBeChecked,
     Menu_Popup_Submenu,
 
@@ -196,8 +182,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     EVT_UPDATE_UI(Menu_Menu_Check, MyFrame::OnUpdateCheckMenuItemUI)
 
-    EVT_UPDATE_UI(Menu_Popup_ToBeGreyed3, MyFrame::OnUpdatePopup)
-
     EVT_RIGHT_DOWN(MyFrame::OnRightDown)
 END_EVENT_TABLE()
 
@@ -205,10 +189,6 @@ BEGIN_EVENT_TABLE(MyEvtHandler, wxEvtHandler)
     EVT_MENU(-1, MyEvtHandler::OnMenuEvent)
 END_EVENT_TABLE()
 
-BEGIN_EVENT_TABLE(MyPopupMenu, wxMenu)
-    EVT_UPDATE_UI(Menu_Popup_ToBeGreyed2, MyPopupMenu::OnUpdateUI)
-END_EVENT_TABLE()
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -638,7 +618,7 @@ void MyFrame::OnGetMenuItemInfo(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnRightDown(wxMouseEvent &event )
 {
-    MyPopupMenu menu("Test popup");
+    wxMenu menu("Test popup");
 
     menu.Append(Menu_Help_About, "&About");
     menu.Append(Menu_Popup_Submenu, "Submenu", CreateDummyMenu(NULL));
@@ -646,10 +626,6 @@ void MyFrame::OnRightDown(wxMouseEvent &event )
     menu.Append(Menu_Popup_ToBeChecked, "To be checked", "", TRUE);
     menu.Append(Menu_Popup_ToBeGreyed, "To be greyed");
     menu.AppendSeparator();
-    // VZ: don't search for the word autogreyed in the dictionary...
-    menu.Append(Menu_Popup_ToBeGreyed2, "To be autogreyed");
-    menu.Append(Menu_Popup_ToBeGreyed3, "This one too");
-    menu.AppendSeparator();
     menu.Append(Menu_File_Quit, "E&xit");
 
     menu.Delete(Menu_Popup_ToBeDeleted);

src/common/cmdline.cpp

@@ -155,7 +155,7 @@ struct wxCmdLineParserData
 
     // methods
     wxCmdLineParserData();
-    void SetArguments(int argc, wxChar **argv);
+    void SetArguments(int argc, char **argv);
     void SetArguments(const wxString& cmdline);
 
     int FindOption(const wxString& name);
@@ -180,7 +180,7 @@ wxCmdLineParserData::wxCmdLineParserData()
 #endif
 }
 
-void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
+void wxCmdLineParserData::SetArguments(int argc, char **argv)
 {
     m_arguments.Empty();
 
@@ -237,7 +237,7 @@ void wxCmdLineParser::Init()
     m_data = new wxCmdLineParserData;
 }
 
-void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
+void wxCmdLineParser::SetCmdLine(int argc, char **argv)
 {
     m_data->SetArguments(argc, argv);
 }
@@ -862,13 +862,12 @@ void wxCmdLineParser::Usage()
         }
     }
 
-    wxString fullmsg;
     if ( !!m_data->m_logo )
     {
-        fullmsg << m_data->m_logo << _T('\n');
+        wxLogMessage(m_data->m_logo);
     }
 
-    fullmsg << brief << _T('\n');
+    wxLogMessage(brief);
 
     // now construct the detailed help message
     size_t len, lenMax = 0;
@@ -890,8 +889,7 @@ void wxCmdLineParser::Usage()
                  << _T('\n');
     }
 
-    fullmsg << detailed;
-    wxLogMessage(fullmsg);
+    wxLogMessage(detailed);
 }
 
 // ----------------------------------------------------------------------------

src/common/fontmap.cpp

@@ -140,15 +140,15 @@ static const wxChar* gs_encodingNames[] =
     wxT( "iso8859-14" ),
     wxT( "iso8859-15" ),
     wxT( "koi8-r" ),
-    wxT( "windows-1250" ),
-    wxT( "windows-1251" ),
-    wxT( "windows-1252" ),
-    wxT( "windows-1253" ),
-    wxT( "windows-1254" ),
-    wxT( "windows-1255" ),
-    wxT( "windows-1256" ),
-    wxT( "windows-1257" ),
-    wxT( "windows-437" ),
+    wxT( "windows1250" ),
+    wxT( "windows1251" ),
+    wxT( "windows1252" ),
+    wxT( "windows1253" ),
+    wxT( "windows1254" ),
+    wxT( "windows1255" ),
+    wxT( "windows1256" ),
+    wxT( "windows1257" ),
+    wxT( "windows437" ),
 };
 
 // ----------------------------------------------------------------------------
@@ -438,14 +438,10 @@ wxFontEncoding wxFontMapper::CharsetToEncoding(const wxString& charset,
                 }
             }
         }
-        else if ( cs.Left(7) == wxT("WINDOWS") )
+        else if ( cs.Left(8) == wxT("WINDOWS-") )
         {
-            const wxChar *p = cs.c_str() + 7;
-            if ( *p == wxT('-') )
-                p++;
-
             int value;
-            if ( wxSscanf(p, wxT("%u"), &value) == 1 )
+            if ( wxSscanf(cs.c_str() + 8, wxT("%u"), &value) == 1 )
             {
                 if ( value >= 1250 )
                 {

src/common/gdicmn.cpp

@@ -395,23 +395,6 @@ void wxInitializeStockObjects ()
   wxBLUE = new wxColour ("BLUE");
   wxGREEN = new wxColour ("GREEN");
   wxCYAN = new wxColour ("CYAN");
-
-  // VZ: Here is why this colour is treated specially: normally, wxLIGHT_GREY
-  //     is the window background colour and it is also used as the
-  //     "transparent" colour in the bitmaps - for example, for the toolbar
-  //     bitmaps. In particular, the mask creation code in tbar95.cpp assumes
-  //     this - but it fails under Win2K where the system 3D colour is not
-  //     0xc0c0c0 (usual light grey) but 0xc6c3c6. To make everything work as
-  //     expected there we have to define wxLIGHT_GREY accordingly - another
-  //     solution would be to hack wxMask::Create()...
-#ifdef __WIN32__
-  int majOs, minOs;
-  if ( wxGetOsVersion(&majOs, &minOs) == wxWINDOWS_NT && (majOs == 5) )
-  {
-      wxLIGHT_GREY = new wxColour(0xc6c3c6);
-  }
-  else
-#endif // MSW
   wxLIGHT_GREY = new wxColour ("LIGHT GREY");
 
   wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);

src/common/intl.cpp

@@ -308,13 +308,11 @@ static wxString GetFullSearchPath(const wxChar *lang)
     // FIXME it should be the directory of the executable
     searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
 
-#ifdef __UNIX_LIKE__
     // and finally add some standard ones
     searchPath
         << GetAllMsgCatalogSubdirs(wxT("/usr/share/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/lib/locale"), lang)
         << GetAllMsgCatalogSubdirs(wxT("/usr/local/share/locale"), lang);
-#endif // __UNIX_LIKE__
 
     return searchPath;
 }
@@ -331,21 +329,6 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0, bool b
       szName = szName.Left(szName.Find(wxT('.')));
 
   wxString searchPath = GetFullSearchPath(szDirPrefix);
-
-#ifdef __UNIX_LIKE__
-  if ( szName == "wxstd" )
-  {
-    // WXDIR is the env var holding the installation directory of wxWindows
-    const wxChar *pszWxDir = wxGetenv(wxT("WXDIR"));
-    if ( pszWxDir )
-    {
-        wxString strWxLoc;
-        strWxLoc << pszWxDir << wxFILE_SEP_PATH << wxT("share/locale");
-        searchPath << GetAllMsgCatalogSubdirs(strWxLoc, szDirPrefix);
-    }
-  }
-#endif // __UNIX_LIKE__
-
   const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
   if ( sublocale )
   {
@@ -563,11 +546,7 @@ bool wxLocale::Init(const wxChar *szName,
   }
   m_pszOldLocale = wxSetlocale(LC_ALL, szLocale);
   if ( m_pszOldLocale == NULL )
-  {
-    // this is not an error as most systems don't support anything but "C"
-    // anyhow
-    wxLogVerbose(_("locale '%s' can not be set."), szLocale);
-  }
+    wxLogError(_("locale '%s' can not be set."), szLocale);
 
   // the short name will be used to look for catalog files as well,
   // so we need something here
@@ -665,9 +644,11 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
 
     return (wxMB2WXbuf)(szOrigString);
   }
-
-  return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
-                                   // a macro similar to wxConvertMB2WX could be written for that
+  else
+  {
+    return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
+                                     // a macro similar to wxConvertMB2WX could be written for that
+  }
 
   #undef szOrgString
 }
@@ -675,7 +656,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
 // find catalog by name in a linked list, return NULL if !found
 wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
 {
-  // linear search in the linked list
+// linear search in the linked list
   wxMsgCatalog *pMsgCat;
   for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) {
     if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )

src/common/menucmn.cpp

@@ -346,10 +346,10 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
 {
     if ( !source && GetInvokingWindow() )
         source = GetInvokingWindow()->GetEventHandler();
-
-    wxEvtHandler *self = GetEventHandler();
     if ( !source )
-        source = self;
+        source = GetEventHandler();
+    if ( !source )
+        source = this;
 
     wxMenuItemList::Node* node = GetMenuItems().GetFirst();
     while ( node )
@@ -361,16 +361,7 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
             wxUpdateUIEvent event(id);
             event.SetEventObject( source );
 
-            // let the invoking window process the event and fall back to the
-            // menu itself if it didn't
-            bool processed = source->ProcessEvent(event);
-            if ( !processed && source != self )
-            {
-                event.SetEventObject( self );
-                processed = self->ProcessEvent(event);
-            }
-
-            if ( processed )
+            if ( source->ProcessEvent(event) )
             {
                 // if anything changed, update the chanegd attribute
                 if (event.GetSetText())

src/common/wxchar.cpp

@@ -171,10 +171,6 @@ int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
 #ifndef wxStrtok
 WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
-  if (!(save_ptr && *save_ptr)) {
-    return (wxChar *) NULL;
-  }
-
   if (!psz) psz = *save_ptr;
   psz += wxStrspn(psz, delim);
   if (!*psz) {

src/gtk/app.cpp

@@ -186,14 +186,8 @@ void wxapp_install_idle_handler()
 
 #if wxUSE_THREADS
 
-static int g_threadUninstallLevel = 0;
-
 void wxapp_install_thread_wakeup()
 {
-    g_threadUninstallLevel++;
-    
-    if (g_threadUninstallLevel != 1) return;
-
     if (wxTheApp->m_wakeUpTimerTag) return;
 
     wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL );
@@ -201,10 +195,6 @@ void wxapp_install_thread_wakeup()
 
 void wxapp_uninstall_thread_wakeup()
 {
-    g_threadUninstallLevel--;
-    
-    if (g_threadUninstallLevel != 0) return;
-
     if (!wxTheApp->m_wakeUpTimerTag) return;
 
     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );

src/gtk/dnd.cpp

@@ -226,11 +226,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 
-    /* reset the block here as someone might very well
-       show a dialog as a reaction to a drop and this
-       wouldn't work without events */
-    g_blockEventsOnDrag = FALSE;
-    
     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)
@@ -741,12 +736,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
 
-    // still in drag
-    if (g_blockEventsOnDrag)
-        return (wxDragResult) wxDragNone;
-    
     // disabled for now
-    g_blockEventsOnDrag = TRUE;
+    g_blockEventsOnDrag = FALSE;
 
     RegisterWindow();
 
@@ -815,7 +806,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 #endif
 
     g_blockEventsOnDrag = FALSE;
-    
+
     UnregisterWindow();
 
     return m_retValue;

src/gtk1/app.cpp

@@ -186,14 +186,8 @@ void wxapp_install_idle_handler()
 
 #if wxUSE_THREADS
 
-static int g_threadUninstallLevel = 0;
-
 void wxapp_install_thread_wakeup()
 {
-    g_threadUninstallLevel++;
-    
-    if (g_threadUninstallLevel != 1) return;
-
     if (wxTheApp->m_wakeUpTimerTag) return;
 
     wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL );
@@ -201,10 +195,6 @@ void wxapp_install_thread_wakeup()
 
 void wxapp_uninstall_thread_wakeup()
 {
-    g_threadUninstallLevel--;
-    
-    if (g_threadUninstallLevel != 0) return;
-
     if (!wxTheApp->m_wakeUpTimerTag) return;
 
     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );

src/gtk1/dnd.cpp

@@ -226,11 +226,6 @@ static gboolean target_drag_drop( GtkWidget *widget,
     if (context->suggested_action == GDK_ACTION_COPY) result = wxDragCopy;
 */
 
-    /* reset the block here as someone might very well
-       show a dialog as a reaction to a drop and this
-       wouldn't work without events */
-    g_blockEventsOnDrag = FALSE;
-    
     bool ret = drop_target->OnDrop( x, y );
 
     if (!ret)
@@ -741,12 +736,8 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
     if (m_data->GetFormatCount() == 0)
         return (wxDragResult) wxDragNone;
 
-    // still in drag
-    if (g_blockEventsOnDrag)
-        return (wxDragResult) wxDragNone;
-    
     // disabled for now
-    g_blockEventsOnDrag = TRUE;
+    g_blockEventsOnDrag = FALSE;
 
     RegisterWindow();
 
@@ -815,7 +806,7 @@ wxDragResult wxDropSource::DoDragDrop( bool allowMove )
 #endif
 
     g_blockEventsOnDrag = FALSE;
-    
+
     UnregisterWindow();
 
     return m_retValue;

src/makeb32.env

@@ -43,7 +43,7 @@ DLL=0
 
 !if "$(WXMAKINGDLL)" == "1"
 DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx221.lib
+WXLIB= $(WXLIBDIR)\wx220.lib
 
 !else
 
@@ -51,7 +51,7 @@ LINK_FLAGS= /aa /c
 
 !if "$(WXUSINGDLL)" == "1"
 DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL
-WXLIB= $(WXLIBDIR)\wx221.lib
+WXLIB= $(WXLIBDIR)\wx220.lib
 !else
 DLL_FLAGS=
 WXLIB= $(WXLIBDIR)\wx32.lib

src/makeg95.env

@@ -18,7 +18,7 @@ MINGW32=1
 MINGW32VERSION=2.95
 
 # If building DLL, the version
-WXVERSION=22_1
+WXVERSION=22_0
 
 # Say yes if you have a "modern" linker that supports --shared option.
 # Note that you're probably going to wait forever for dlltool/gcc/etc

src/makelib.g95

@@ -7,7 +7,7 @@
 #
 # Include file for Cygwin/Mingw32 libraries
 
-# WXDIR = $(WXWIN)
+WXDIR = $(WXWIN)
 
 # All common UNIX compiler flags and options are now in
 # this central makefile.

src/makevc.env

@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=22_1
+WXVERSION=22_0
 WIN95=1
 
 !if "$(WIN95)" == "0"

src/msw/clipbrd.cpp

@@ -815,14 +815,14 @@ bool wxClipboard::GetData( wxDataObject& data )
         }
 #endif // wxUSE_METAFILE
     }
-
-    return FALSE;
 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );
+#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 
     return FALSE;
-#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
+#else
+//    #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD
 

src/msw/dialup.cpp

@@ -551,7 +551,7 @@ void wxDialUpManagerMSW::CleanUpThreadData()
     {
         if ( !SetEvent(m_data.hEventQuit) )
         {
-            wxLogLastError(_T("SetEvent(RasThreadQuit)"));
+            wxLogLastError("SetEvent(RasThreadQuit)");
         }
 
         CloseHandle(m_hThread);

src/msw/frame.cpp

@@ -523,10 +523,9 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         // Save the number of fields in the statusbar
         if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
         {
-            //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
-            //SetStatusBar((wxStatusBar*) NULL);
-            //delete theStatusBar;
-            theStatusBar->Show(FALSE);
+            m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+            SetStatusBar((wxStatusBar*) NULL);
+            delete theStatusBar;
         }
         else
             m_fsStatusBarFields = 0;
@@ -588,14 +587,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
             theToolBar->Show(TRUE);
         }
 
-        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0))
+        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
         {
-            //CreateStatusBar(m_fsStatusBarFields);
-            if (GetStatusBar())
-            {
-                GetStatusBar()->Show(TRUE);
-                PositionStatusBar();
-            }
+            CreateStatusBar(m_fsStatusBarFields);
+            PositionStatusBar();
         }
 
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))

src/msw/gsockmsw.c

@@ -58,14 +58,8 @@
 #  pragma warning(default:4115) /* named type definition in parentheses */
 #endif
 
-/* VZ: I don't know if _T() macro is always defined here? */
-#ifdef _UNICODE
-#define CLASSNAME  L"_GSocket_Internal_Window_Class"
-#define WINDOWNAME L"_GSocket_Internal_Window_Name"
-#else /* !Unicode */
 #define CLASSNAME  "_GSocket_Internal_Window_Class"
 #define WINDOWNAME "_GSocket_Internal_Window_Name"
-#endif /* Unicode/!Unicode */
 
 /* Maximum number of different GSocket objects at a given time.
  * This value can be modified at will, but it CANNOT be greater

src/msw/ole/dropsrc.cpp

@@ -222,7 +222,8 @@ wxDragResult wxDropSource::DoDragDrop(bool bAllowMove)
   }
   else {
     if ( FAILED(hr) ) {
-      wxLogSysError(wxT("Drag & drop operation failed."));
+      wxLogApiError("DoDragDrop", hr);
+      wxLogError(wxT("Drag & drop operation failed."));
     }
     else {
       wxLogDebug(wxT("Unexpected success return code %08lx from DoDragDrop."),

src/msw/ole/droptgt.cpp

@@ -309,7 +309,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
 {
     HRESULT hr = ::CoLockObjectExternal(m_pIDropTarget, TRUE, FALSE);
     if ( FAILED(hr) ) {
-        wxLogApiError(_T("CoLockObjectExternal"), hr);
+        wxLogApiError("CoLockObjectExternal", hr);
         return FALSE;
     }
 
@@ -317,7 +317,7 @@ bool wxDropTarget::Register(WXHWND hwnd)
     if ( FAILED(hr) ) {
         ::CoLockObjectExternal(m_pIDropTarget, FALSE, FALSE);
 
-        wxLogApiError(_T("RegisterDragDrop"), hr);
+        wxLogApiError("RegisterDragDrop", hr);
         return FALSE;
     }
 
@@ -332,7 +332,7 @@ void wxDropTarget::Revoke(WXHWND hwnd)
     HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
 
     if ( FAILED(hr) ) {
-        wxLogApiError(_T("RevokeDragDrop"), hr);
+        wxLogApiError("RevokeDragDrop", hr);
     }
 
     ::CoLockObjectExternal(m_pIDropTarget, FALSE, TRUE);

src/msw/printwin.cpp

@@ -89,7 +89,7 @@ wxWindowsPrinter::~wxWindowsPrinter()
 {
     // avoids mingw warning about statement with no effect (FreeProcInstance
     // doesn't do anything under Win32)
-#if !defined(__GNUWIN32__) && !defined(__WATCOMC__)
+#ifndef __GNUWIN32__
     FreeProcInstance((FARPROC) m_lpAbortProc);
 #endif
 }

src/msw/tbar95.cpp

@@ -393,8 +393,7 @@ bool wxToolBar::Realize()
     wxMemoryDC dcAllButtons;
     wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
     dcAllButtons.SelectObject(bitmap);
-    wxColour colTbar = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE);
-    dcAllButtons.SetBackground(wxBrush(colTbar, wxSOLID));
+    dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH);
     dcAllButtons.Clear();
 
     m_hBitmap = bitmap.GetHBITMAP();
@@ -434,14 +433,8 @@ bool wxToolBar::Realize()
             if ( bmp.Ok() )
             {
 #if USE_BITMAP_MASKS
-                // blit the bitmap to the DC with the mask
-                wxBitmap bmpTool = tool->GetBitmap1();
-                if ( !bmpTool.GetMask() )
-                {
-                    // it doesn't have mask - create a default one
-                    bmpTool.SetMask(new wxMask(bmpTool, *wxLIGHT_GREY));
-                }
-                dcAllButtons.DrawBitmap(bmpTool, x, 0, TRUE);
+                // notice the last parameter: do use mask
+                dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE);
 #else // !USE_BITMAP_MASKS
                 HBITMAP hbmp = GetHbitmapOf(bmp);
                 HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);
@@ -478,10 +471,10 @@ bool wxToolBar::Realize()
     ::SelectObject(memoryDC, oldBitmap);
     ::DeleteDC(memoryDC);
     ::DeleteDC(memoryDC2);
+#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
     // Map to system colours
     wxMapBitmap(hBitmap, totalBitmapWidth, totalBitmapHeight);
-#endif // USE_BITMAP_MASKS/!USE_BITMAP_MASKS
 
     int bitmapId = 0;
 
@@ -1009,8 +1002,6 @@ long wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 // private functions
 // ----------------------------------------------------------------------------
 
-#if !USE_BITMAP_MASKS
-
 // These are the default colors used to map the bitmap colors to the current
 // system colors. Note that they are in BGR format because this is what Windows
 // wants (and not RGB)
@@ -1054,17 +1045,17 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
         for ( j = 0; j < height; j++)
         {
             COLORREF pixel = ::GetPixel(hdcMem, i, j);
+/*
+            BYTE red = GetRValue(pixel);
+            BYTE green = GetGValue(pixel);
+            BYTE blue = GetBValue(pixel);
+*/
+
             for ( k = 0; k < NUM_MAPS; k ++)
             {
-                int distance = 0 ;
-
-                distance = abs( GetRValue( pixel ) - GetRValue( ColorMap[k].from )) ;
-                distance = max( distance , abs(GetGValue(pixel ) - GetGValue( ColorMap[k].from ))) ;
-                distance = max( distance , abs(GetBValue(pixel ) - GetBValue( ColorMap[k].from ))) ;
-                if ( distance < 0x10 )
-                //if ( ColorMap[k].from == pixel )
+                if ( ColorMap[k].from == pixel )
                 {
-                    ::SetPixel(hdcMem, i, j, ColorMap[k].to);
+                    /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to);
                     break;
                 }
             }
@@ -1078,8 +1069,6 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 
 }
 
-#endif // USE_BITMAP_MASKS
-
 // Some experiments...
 #if 0
   // What we want to do is create another bitmap which has a depth of 4,

src/msw/version.rc

@@ -13,18 +13,10 @@
 
 #ifdef _DEBUG
     #define DLL_FLAGS 0x1L
-    #ifdef _UNICODE
-        #define DLL_SUFFIX "ud"
-    #else
-        #define DLL_SUFFIX "d"
-    #endif
+    #define DLL_SUFFIX "d"
 #else
     #define DLL_FLAGS 0x0L
-    #ifdef _UNICODE
-        #define DLL_SUFFIX "u"
-    #else
-        #define DLL_SUFFIX ""
-    #endif
+    #define DLL_SUFFIX ""
 #endif
 
 1 VERSIONINFO
@@ -51,9 +43,7 @@ BEGIN
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "wxWindows\0"
             VALUE "ProductVersion", "2.2.1\0"
-#ifdef _UNICODE
-            VALUE "SpecialBuild", "Unicode build\0"
-#endif
+            VALUE "SpecialBuild", "\0"
         END
     END
 END

src/msw/window.cpp

@@ -1329,8 +1329,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
         if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
         {
             wxPoint pt(parent->GetClientAreaOrigin());
-            x += pt.x;
-            y += pt.y;
+            x += pt.x; y += pt.y;
         }
     }
 }

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() {

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());
 }
 
 

src/tiff/makefile.vc

@@ -1,23 +1,46 @@
 
 !if "$(FINAL)" == "1"
-LIBTARGET=..\..\lib\tiff.lib
+LIBTARGET=$(WXDIR)\lib\tiff.lib
 !else
-LIBTARGET=..\..\lib\tiffd.lib
+LIBTARGET=$(WXDIR)\lib\tiffd.lib
 !endif
 
-OBJECTS= tif_aux.obj tif_close.obj tif_codec.obj tif_compress.obj tif_dir.obj tif_dirinfo.obj \
-		tif_dirread.obj tif_dirwrite.obj tif_dumpmode.obj tif_error.obj tif_fax3.obj \
-		tif_fax3sm.obj tif_flush.obj tif_getimage.obj tif_jpeg.obj tif_luv.obj tif_lzw.obj \
-		tif_next.obj tif_open.obj tif_packbits.obj tif_pixarlog.obj tif_predict.obj \
-		tif_print.obj tif_read.obj tif_strip.obj tif_swab.obj tif_thunder.obj tif_tile.obj \
-		tif_version.obj tif_warning.obj tif_win32.obj tif_write.obj tif_zip.obj
+OBJECTS= \
+		tif_aux.obj \
+		tif_close.obj \
+		tif_codec.obj \
+		tif_compress.obj \
+		tif_dir.obj \
+		tif_dirinfo.obj \
+		tif_dirread.obj \
+		tif_dirwrite.obj \
+		tif_dumpmode.obj \
+		tif_error.obj \
+		tif_fax3.obj \
+		tif_fax3sm.obj \
+		tif_flush.obj \
+		tif_getimage.obj \
+		tif_jpeg.obj \
+		tif_luv.obj \
+		tif_lzw.obj \
+		tif_next.obj \
+		tif_open.obj \
+		tif_packbits.obj \
+		tif_pixarlog.obj \
+		tif_predict.obj \
+		tif_print.obj \
+		tif_read.obj \
+		tif_strip.obj \
+		tif_swab.obj \
+		tif_thunder.obj \
+		tif_tile.obj \
+		tif_version.obj \
+		tif_warning.obj \
+		tif_win32.obj \
+		tif_write.obj \
+		tif_zip.obj \
 
-defaulttarget:
-    echo Please use the 'all' target for this makefile.
 
-clean:
-    -erase $(LIBTARGET)
-    -erase *.obj
 
 # Pull in standard variable definitions
 

src/unix/dialup.cpp

@@ -709,15 +709,15 @@ wxDialUpManagerImpl::CheckIfconfig()
 
 #if defined(__SOLARIS__) || defined (__SUNOS__)
                     // dialup device under SunOS/Solaris
-                    hasModem = wxStrstr(output, _T("ipdptp")) != NULL;
-                    hasLAN = wxStrstr(output, _T("hme")) != NULL;
+                    hasModem = strstr(output,"ipdptp") != (char *)NULL;
+                    hasLAN = strstr(output, "hme") != (char *)NULL;
 #elif defined(__LINUX__) || defined (__FREEBSD__)
-                    hasModem = wxStrstr(output, _T("ppp"))    // ppp
-                        || wxStrstr(output, _T("sl"))  // slip
-                        || wxStrstr(output, _T("pl")); // plip
-                    hasLAN = wxStrstr(output, _T("eth")) != NULL;
+                    hasModem = strstr(output,"ppp")    // ppp
+                        || strstr(output,"sl")  // slip
+                        || strstr(output,"pl"); // plip
+                    hasLAN = strstr(output, "eth") != NULL;
 #elif defined(__SGI__)  // IRIX
-                    hasModem = wxStrstr(output, _T("ppp")) != NULL; // PPP
+                    hasModem = strstr(output, "ppp") != NULL; // PPP
 #elif defined(__HPUX__)
                     // if could run ifconfig on interface, then it exists
                     hasModem = TRUE;

src/wxvc_dll.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_1.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"../lib/wx22_0.dll"
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # 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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_1d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib rpcrt4.lib winmm.lib opengl32.lib glu32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"../lib/wx22_0d.dll" /pdbtype:sept
 
 !ENDIF 
 

src/zlib/makefile.wat

@@ -25,9 +25,9 @@ LIBTARGET=..\..\lib\zlib.lib
 OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
 OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
 OBJ3=infutil$(O) inffast$(O)
-OBJP1=adler32$(O) +compress$(O) +crc32$(O) +gzio$(O) +uncompr$(O) +deflate$(O)
-OBJP2=trees$(O) +zutil$(O) +inflate$(O) +infblock$(O) +inftrees$(O) +infcodes$(O)
-OBJP3=infutil$(O) +inffast$(O)
+OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
+OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
+OBJP3=infutil$(O)+inffast$(O)
 
 # all: test
 

src/zlib/zutil.h

@@ -73,15 +73,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 
         /* target dependencies */
 
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
-#endif
-
-#if defined(MSDOS) && !defined(OS_CODE)
+#ifdef MSDOS
 #  define OS_CODE  0x00
 #  ifdef __TURBOC__
 #    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
@@ -96,6 +88,14 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
+#ifdef OS2
+#  define OS_CODE  0x06
+#endif
+
+#ifdef WIN32 /* Window 95 & Windows NT */
+#  define OS_CODE  0x0b
+#endif
+
 #if defined(VAXC) || defined(VMS)
 #  define OS_CODE  0x02
 #  define F_OPEN(name, mode) \

wxBase.dsp

@@ -40,8 +40,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
@@ -64,7 +64,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
@@ -364,5 +364,21 @@ SOURCE=.\src\msw\gsockmsw.c
 # End Source File
 
 
+# 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