diff --git a/distrib/msw/univ.rsp b/distrib/msw/univ.rsp
index cbe44c9f9d..ebb03ea24f 100644
--- a/distrib/msw/univ.rsp
+++ b/distrib/msw/univ.rsp
@@ -10,4 +10,5 @@ src/univ/themes/*.cpp
docs/microwin/readme.txt
docs/microwin/microwindows.patches
+docs/univ/*.txt
diff --git a/docs/changes.txt b/docs/changes.txt
index ada0039532..0497feedc1 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -63,12 +63,6 @@ Unix ports:
2.3.3
-----
-All:
-
-- fixes to the command line parsing error and usage messages
-- modified wxFileName::CreateTempFileName() to open the file atomically
- (if possible) and, especially, not to leak the file descriptors under Unix
-
wxMSW:
- fixed flicker in wxTreeCtrl::SetItemXXX()
@@ -106,6 +100,8 @@ All (GUI):
wxMSW:
- support for the DBCS fonts (CP 932, 936, 949, 950) (Nathan Cook)
+- new library naming convention under VC++ -- please change your application
+ project files
wxGTK:
diff --git a/docs/html/index.htm b/docs/html/index.htm
index 2cabfb0998..83f5405e6d 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -5,24 +5,13 @@
-
+
-
-
-
-
-
-
-
- |
-
-
-
-
+
Welcome to wxWindows 2, the première cross-platform GUI C++ framework. This is an index of
the plain text, HTML, Windows Help and Acrobat documentation: availability depends on what you've
@@ -76,16 +65,16 @@ downloaded from the wxWindows Web site.
-
+ |
HTML
|
-
+ |
WinHelp
|
-
+ |
MS HTML Help
|
-
+ |
PDF
|
diff --git a/docs/html/logo.gif b/docs/html/logo.gif
index 67ce9957ba..7563bc44ae 100644
Binary files a/docs/html/logo.gif and b/docs/html/logo.gif differ
diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt
index ada0d1ac24..554ed793d1 100644
--- a/docs/univ/readme.txt
+++ b/docs/univ/readme.txt
@@ -4,7 +4,7 @@
Welcome to wxUniversal!
Acknowledgements: wxUniversal wouldn't have been written without the
-generuous support of SciTech Software. Many thanks to Kendall Benett and
+generous support of SciTech Software. Many thanks to Kendall Benett and
Tom Ryan!
0. Introduction
@@ -18,20 +18,20 @@ by drawing them itself (using low level wxWindows classes). Please see
for more details about it.
The advantage of wxUniversal is that you have precise control over the
-controls appearance (it is not always possible to change all aspects of the
+controls' appearance (it is not always possible to change all aspects of the
native controls) and the theme support: the same program may be changed to
-look completely differently without changing a single line of its code but
+look completely differently without changing a single line of its code but
just changing the theme.
Another advantage is that it makes writing ports of wxWindows for other
platforms (such as OS/2, BeOS or QNX) much simpler, so it is of special
-interest to the people interested in porting wxWindows to another platform.
+interest to people interested in porting wxWindows to another platform.
- However, wxUniversal doesn't have the 100% native look and feel unlike the
+ However, wxUniversal doesn't have a 100% native look and feel unlike the
other wxWindows ports - this is the price to pay for the extra flexibility.
-1. Requirments and supported platforms
---------------------------------------
+1. Requirements and supported platforms
+---------------------------------------
wxUniversal is used together with another wxWindows port which provides the
"low level classes" mentioned above. Currently it can be built either with
@@ -47,7 +47,7 @@ toolkit.
a) Using Visual C++ 6.0
- Simply open the src/wxUniv.dsw file in MSDEV and build it.
+ Simply open the src/wxUniv.dsw file in DevStudio and build it.
b) Cygwin
@@ -55,10 +55,14 @@ b) Cygwin
c) Other compilers
- Unfortunately we don't have the makefiles for any other compilers yet.
+ Unfortunately we don't have makefiles for any other compilers yet.
Please contact us if you would like to help us with creating one for the
compiler you use.
+Note that you can use the wxUniversal classes, wxMSW and MicroWindows (from
+Century Software) to build a different variant of wxUniversal than that
+documented here. Please see docs/univ/readme.txt for further information.
+
3. Installing under Unix
------------------------
@@ -87,7 +91,7 @@ itself, namely:
* WWW page: http://www.wxwindows.org/
- Hope you will find wxUniversal useful!
+ Hope you find wxUniversal useful!
Vadim Zeitlin