Small changes to peripheral files

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index e3363e1c8bb5e55cdaf1fe584a6e3f8904a6f754..9e6c68bdb1bf9b905b05f4667661063a369ae40e 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -97,15 +97,13 @@ unzip32 -o ..\wx200gen.zip
 unzip32 -o ..\wx200vc.zip
 unzip32 -o ..\wx200bc.zip
 unzip32 -o ..\wx200hlp.zip
 unzip32 -o ..\wx200vc.zip
 unzip32 -o ..\wx200bc.zip
 unzip32 -o ..\wx200hlp.zip

+Rem Need Word file, for Remstar DB classes
+unzip32 -o ..\wx200wrd.zip

 unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 
 unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 

-rem unzip32 -o ..\wx200doc.zip
-rem unzip32 -o ..\wx200bc.zip
-rem unzip32 -o ..\wx200cw.zip
-

 rem Now delete a few files that are unnecessary
 erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
 erase /SY Makefile.in
 rem Now delete a few files that are unnecessary
 erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh
 erase /SY Makefile.in

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index f5fafc6817f736ba44f5fe3baa1ca8b4b106c6fb..64eb490cc7b594948ad441a1bdfbb2f662606b73 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -2,32 +2,11 @@
 Installing wxWindows 2.1
 ------------------------
 
 Installing wxWindows 2.1
 ------------------------
 

-[Notes from Robert Roebling for snapshot 8]
-
-This is a not-so-well tested snapshot release of wxWindows 2.1 for
+This is a snapshot release of wxWindows 2.1 for

 Microsoft Windows 95, 98 and NT. This is not a production release,
 although a huge number of bugs found in wxWindows 2.0 have been
 fixed.
 
 Microsoft Windows 95, 98 and NT. This is not a production release,
 although a huge number of bugs found in wxWindows 2.0 have been
 fixed.
 

-There have not been major changes in the way to build the library, 
-although the creation of the various makefiles has been automatized. 
-I myself use the GNU MingGW32 compiler from 
-
-  http://www.cygnus.com 
-  
-using the GNU make program from 
-
-  http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
-  
-and I have not tested any other compiler, but other developers use
-the makefiles for Borland C++, MS-Visual C++ 5.0 and 6.0 and probably
-Metrowerks C++.
-
-Expect problems.
-
-Installing wxWindows 2.0
-------------------------
-

 IMPORTANT NOTE: If you experience problems installing, please
 re-read this instructions and other related files (todo.txt,
 bugs.txt etc.) carefully before mailing wxwin-users or
 IMPORTANT NOTE: If you experience problems installing, please
 re-read this instructions and other related files (todo.txt,
 bugs.txt etc.) carefully before mailing wxwin-users or

diff --git a/docs/readme.txt b/docs/readme.txt
index 89d7f72af9510f2416b38c7cccc378ce7d100dec..616cda1de0063f7be6b1d75b83fe14fe4c974fd4 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,5 +1,5 @@
-wxWindows 2.1
--------------
+wxWindows 2.1.10
+----------------

 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where


@@ -23,13 +23,17 @@ Changes in this release
 
 These are the major improvements:
 
 
 These are the major improvements:
 

-wxWindows 2.1
-=============
+wxWindows 2.1.10
+================

 
 

+- Numerous bug fixes and consistency improvements.
+- Further samples.
+- Factoring out of some code into base classes, for easier
+  maintenance.

 - Integration of wxHTML widget and help controller into
   wxWindows. wxHTML allows HTML viewing and printing.
 - New classes wxChrono, wxDialUpManager, wxFontEnumerator,
 - Integration of wxHTML widget and help controller into
   wxWindows. wxHTML allows HTML viewing and printing.
 - New classes wxChrono, wxDialUpManager, wxFontEnumerator,

-  TODO
+  wxWizard, etc.

 - wxSocket and wxThread classes rewritten.
 - Documentation improvements.
 
 - wxSocket and wxThread classes rewritten.
 - Documentation improvements.
 


@@ -41,6 +45,8 @@ wxWindows 2 currently supports the following platforms:
 - Windows 3.1, Windows 95/98, Windows NT
 - Most Unix variants with Motif/Lesstif
 - Most Unix variants with GTK+
 - Windows 3.1, Windows 95/98, Windows NT
 - Most Unix variants with Motif/Lesstif
 - Most Unix variants with GTK+

+- Mac (not covered here: please see the wxWindows web site
+  for details)

 
 Most popular C++ compilers are supported; see the release notes
 (available via docs/html/index.htm) for details.
 
 Most popular C++ compilers are supported; see the release notes
 (available via docs/html/index.htm) for details.


@@ -92,7 +98,12 @@ wxWindows for Motif distribution
 
 wxMotif-2.x.x.tgz       wxMotif source distribution. You will
                         need the HTML and/or PDF documentation
 
 wxMotif-2.x.x.tgz       wxMotif source distribution. You will
                         need the HTML and/or PDF documentation

-                        from the zip set (above).
+   -- OR --             from the zip set (above).
+
+wx200gen.zip
+wx200msw.zip
+wx200mot.zip
+jpeg.zip

 
 wxWindows for Windows distribution
 ----------------------------------
 
 wxWindows for Windows distribution
 ----------------------------------


@@ -109,11 +120,6 @@ As well as the core source, the Windows setup contains:
 setup.exe               Setup file (Windows 95/98, NT)
 setup.*                 Other setup files
 
 setup.exe               Setup file (Windows 95/98, NT)
 setup.*                 Other setup files
 

-wxWindows for Mac distribution
-------------------------------
-
-TODO
-

 Installation
 ------------
 
 Installation
 ------------
 

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 7a021d35c692c5aa55e11bb7a723d411fe94cb6e..c50bb47991d1f4e7cb67cd26b46702579d8da174 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -284,6 +284,10 @@ SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\menucmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc6.dsp b/src/wxvc6.dsp
index 294fd1e5f436e5669e1445a4618089d0c009de1c..900daddad3eb4b22526108026d61fcc9c3d4682f 100644 (file)
--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -290,6 +290,10 @@ SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\menucmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 8dd7b4f53692257bf6dc8dada1911e328ce8e06b..9469d61e9ed6369b04460c009c234c17003fe69d 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -292,6 +292,10 @@ SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\menucmn.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\mimetype.cpp
 # End Source File
 # Begin Source File