Corrected CVS commit clash; small doc changes (removed Windows 3.1 reference since

it's probably broken by now)

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

diff --git a/distrib/msw/univ.rsp b/distrib/msw/univ.rsp
index 2307483fdde385fd98c2241b4169719727d1b806..cbe44c9f9d928604f32cd4dea715f4d578192dd9 100644 (file)
--- a/distrib/msw/univ.rsp
+++ b/distrib/msw/univ.rsp
@@ -8,7 +8,6 @@ src/univ/*.c
 src/univ/*.lst
 src/univ/themes/*.cpp
 
 src/univ/*.lst
 src/univ/themes/*.cpp
 

-microwindows.patches
-

 docs/microwin/readme.txt
 docs/microwin/readme.txt

+docs/microwin/microwindows.patches

 
 

diff --git a/docs/microwin/readme.txt b/docs/microwin/readme.txt
index 2760e3bc55dd3348489addef4a4a1e32e3b1291c..457c73ed585774ce2764826a973cddde1d3648a4 100644 (file)
--- a/docs/microwin/readme.txt
+++ b/docs/microwin/readme.txt
@@ -1,7 +1,7 @@
 wxMicroWindows port
 ===================
 
 wxMicroWindows port
 ===================
 

-Julian Smart 2001-07-02
+Julian Smart 2001-12-08

 
 This is a port of wxWindows to MicroWindows, under Linux.
 Widgets are supplied by the wxUniversal project, while the
 
 This is a port of wxWindows to MicroWindows, under Linux.
 Widgets are supplied by the wxUniversal project, while the


@@ -26,7 +26,7 @@ Installation
 
 MicroWindows:
 
 
 MicroWindows:
 

-- unarchive MicroWindows 0.89pre7
+- unarchive MicroWindows 0.89pre8

 
 - change 'config' to use X11 and any other options you feel fit.
   Suggestions for changes to the defaults:
 
 - change 'config' to use X11 and any other options you feel fit.
   Suggestions for changes to the defaults:


@@ -39,13 +39,14 @@ MicroWindows:
 
 - apply microwindows.patches (from wxWindows:
   docs/microwin/microwindows.patches) to fix PeekMessage
 
 - apply microwindows.patches (from wxWindows:
   docs/microwin/microwindows.patches) to fix PeekMessage

-  and other issues
+  and other issues. If the patch doesn't apply automatically,
+  you may need to apply it by hand

 
 - compile by typing 'make' from within the MicroWindows src directory
 
 wxMicroWindows:
 
 
 - compile by typing 'make' from within the MicroWindows src directory
 
 wxMicroWindows:
 

-- Download wxMSW 2.3.3 or greater, or get it from CVS
+- Download wxMSW 2.3.2 or greater, or get it from CVS

 
 - Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if
   include/wx/setup.h doesn't exist
 
 - Copy include/wx/msw/setup_microwin.h to include/wx/setup.h if
   include/wx/setup.h doesn't exist


@@ -53,11 +54,11 @@ wxMicroWindows:
 - change the TOP variable at the top of src/msw/makefile.mic
   to reflect where MicroWindows is installed
 
 - change the TOP variable at the top of src/msw/makefile.mic
   to reflect where MicroWindows is installed
 

-- type 'make all' from src/msw. To clean, use cleanwx and NOT clean
-  since that will clean MicroWindows itself
+- type 'make -f makefile.mic all' from src/msw. To clean, use
+  cleanwx and NOT clean since that will clean MicroWindows itself

 
 - to make the sample, cd into samples/minimal, edit the TOP variable,
 
 - to make the sample, cd into samples/minimal, edit the TOP variable,

-  and type 'make all'
+  and type 'make -f makefile.mic all'

 
 Running 'minimal' runs the virtual MicroWindows desktop
 and the minimal sample, since in a MicroWindows WIN32 application
 
 Running 'minimal' runs the virtual MicroWindows desktop
 and the minimal sample, since in a MicroWindows WIN32 application

diff --git a/docs/readme.txt b/docs/readme.txt
index be2fb1c157e2acad39bbc74f25239e812575be88..11c82410ba755f552d19b12870265ddf95694bbf 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -17,7 +17,7 @@ TCP/IP applications, thread handling, and more. Where certain
 features are not available on a platform, such as MDI and tree
 controls on Unix, they are emulated.
 
 features are not available on a platform, such as MDI and tree
 controls on Unix, they are emulated.
 

-A detailed 1400-page reference manual is supplied in HTML, PDF
+A detailed 1700-page reference manual is supplied in HTML, PDF

 and Windows Help form: see the docs hierarchy.
 
 For a quick start, point your Web browser at docs/html/index.htm
 and Windows Help form: see the docs hierarchy.
 
 For a quick start, point your Web browser at docs/html/index.htm


@@ -33,7 +33,7 @@ Platforms supported
 
 wxWindows 2 currently supports the following platforms:
 
 
 wxWindows 2 currently supports the following platforms:
 

-- Windows 3.1, Windows 95/98, Windows NT, Windows 2000
+- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP

 - Most Unix variants with Motif/Lesstif
 - Most Unix variants with GTK+
 - MacOS
 - Most Unix variants with Motif/Lesstif
 - Most Unix variants with GTK+
 - MacOS