added missing methods/removed duplicated base methods

[wxWidgets.git] / docs / msw / install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 100b84750dd0457789b778e980bb9aee08011a61..138ee16b0a3b5445b8fb28ca1a58d5f3dc5c175a 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,9 +1,9 @@
 
 

-Installing wxWindows 2.2
+Installing wxWindows 2.3

 ------------------------
 
 ------------------------
 

-This is wxWindows 2.2 for Microsoft Windows 3.1, 95, 98 and
-Windows NT/Windows 2000. This is an official, stable release.
+This is wxWindows 2.3 for Microsoft Windows 3.1, 95, 98 and
+Windows NT/Windows 2000. This is an unstable development release.

 
 IMPORTANT NOTE: If you experience problems installing, please
 re-read this instructions and other related files (changes.txt,
 
 IMPORTANT NOTE: If you experience problems installing, please
 re-read this instructions and other related files (changes.txt,


@@ -288,7 +288,7 @@ samples, and not all samples. The remaining samples can be made
 with the makefiles. See also the demos hierarchy which doesn't
 have any BC++ project files yet.
 
 with the makefiles. See also the demos hierarchy which doesn't
 have any BC++ project files yet.
 

-Note (2): to make the png, xpm, zlib, jpeg and tiff libraries (needed for
+Note (2): to make the png, zlib, jpeg and tiff libraries (needed for

 some samples) you need to compile them with bc32.ide.
 
 Note (3): the debug version of the wxWindows library is about 40 MB, and the
 some samples) you need to compile them with bc32.ide.
 
 Note (3): the debug version of the wxWindows library is about 40 MB, and the


@@ -309,7 +309,7 @@ issues concerning the compiler installation:
 
 2. Make sure that you downloaded and installed the service pack 1 
    for Borland C++ 5.5.  This SP1 can be downloaded from:
 
 2. Make sure that you downloaded and installed the service pack 1 
    for Borland C++ 5.5.  This SP1 can be downloaded from:

-   http://www.borland.com/devsupport/bcppbuilder/file_supplements.html
+   http://www.borland.com/devsupport/bcppbuilder/patches/#freecompiler55

 
    IMPORTANT:
    When installing SP1, make sure that you extract (UnZip) the files 
 
    IMPORTANT:
    When installing SP1, make sure that you extract (UnZip) the files 


@@ -412,15 +412,6 @@ Watcom C++.
 Note (3): if Watcom can't read the precompiled header when
 building a sample, try deleting src\msw\watcom.pch and
 compiling the sample again.
 Note (3): if Watcom can't read the precompiled header when
 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
-src\xpm\xpmi.h:
-
-// Added by JACS for Watcom C++/wxWindows compilation (no popen/pclose functions)
-#ifdef __WATCOMC__
-#define NO_ZPIPE
-#endif

 
 Metrowerks CodeWarrior compilation
 ----------------------------------
 
 Metrowerks CodeWarrior compilation
 ----------------------------------