don't define __cplusplus for DECCXX if it is already defined

[wxWidgets.git] / docs / readme.txt

diff --git a/docs/readme.txt b/docs/readme.txt
index 6665ca3a1d7827050f68d1e2cd7913df87c93da3..f531a11606e6a1673b0bac7b4032e8aa53eafc05 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.1.11
+wxWindows 2.1.13

 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++


@@ -21,31 +21,7 @@ important documents and samples.
 Changes in this release
 -----------------------
 
 Changes in this release
 -----------------------
 

-These are some of the major improvements:
-
-wxWindows 2.1.11
-================
-
-- Numerous bug fixes and consistency improvements.
-- Further samples.
-- Factoring out of some code into base classes, for easier
-  maintenance.
-- Ability to compile library in console (non-GUI) mode.
-- Integration of wxHTML widget and help controller into
-  wxWindows. wxHTML allows HTML viewing and printing.
-- New classes wxChrono, wxDialUpManager, wxFontEnumerator,
-  wxWizard, wxStaticLine, etc.
-- wxShowTip for showing 'startup tips' to the user.
-- wxSocket and wxThread classes rewritten.
-- New, consistent drag and drop API (not wxMotif).
-- Better-looking dialogs in wxGTK.
-- wxSizers reimplemented and used to specify window layout
-  for some generic dialogs.
-- New, more sophisticated wxGrid class (in beta). The old grid
-  class can still be used.
-- Text alignment options in wxStaticText.
-- wxImage class extended to read PCX and GIF files.
-- Documentation improvements.
+Please see changes.txt for details.

 
 Platforms supported
 -------------------
 
 Platforms supported
 -------------------


@@ -58,8 +34,8 @@ wxWindows 2 currently supports the following platforms:
 - Mac (not covered here: please see the wxWindows web site
   for details)
 
 - 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 install.txt
+file for each platform (available via docs/html/index.htm) for details.

 
 Files
 -----
 
 Files
 -----


@@ -92,6 +68,7 @@ wx2_x_y_vc.zip             MS VC++ 5/6 project files
 wx2_x_y_bc.zip             Borland C++ 5 project files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior 4.1 project files
 jpeg.zip                   Optional JPEG library
 wx2_x_y_bc.zip             Borland C++ 5 project files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior 4.1 project files
 jpeg.zip                   Optional JPEG library

+tiff.zip                   Optional TIFF library

 ogl3.zip                   Optional Object Graphics Library
 glcanvas.zip               Optional wxGLCanvas class (Motif, GTK, MSW)
 tex2rtf2.zip               Tex2RTF documentation tool
 ogl3.zip                   Optional Object Graphics Library
 glcanvas.zip               Optional wxGLCanvas class (Motif, GTK, MSW)
 tex2rtf2.zip               Tex2RTF documentation tool


@@ -111,7 +88,6 @@ wxMotif-2.x.y.tgz          wxMotif source distribution. You will
    -- OR --                from the zip set (above).
 
 wx2_x_y_gen.zip
    -- OR --                from the zip set (above).
 
 wx2_x_y_gen.zip

-wx2_x_y_msw.zip

 wx2_x_y_mot.zip
 jpeg.zip
 
 wx2_x_y_mot.zip
 jpeg.zip
 


@@ -156,17 +132,42 @@ For licensing information, please see the files:
 Although this may seem complex, it is there to allow authors of
 proprietary/commercial applications to use wxWindows in
 addition to those writing GPL'ed applications. In summary,
 Although this may seem complex, it is there to allow authors of
 proprietary/commercial applications to use wxWindows in
 addition to those writing GPL'ed applications. In summary,

-the licence is L-GPL plus a clause allowing unrestricted
+the licence is LGPL plus a clause allowing unrestricted

 distribution of application binaries. To answer a FAQ, you
 don't have to distribute any source if you wish to write
 distribution of application binaries. To answer a FAQ, you
 don't have to distribute any source if you wish to write

-commercial applications using wxWindows.
+commercial applications using wxWindows. 
+
+However, if you distribute wxGTK or wxMotif (with Lesstif) version
+of your application, don't forget that it is linked against
+GTK+ (or Lesstif) which is covered by LGPL *without* exception
+notice. Under Linux systems your app is probably linked
+against LGPL glibc as well. Please read carefuly LGPL, section 6.
+which describes conditions for distribution of closed source applications
+linked against LGPL library. Basically you should link dynamicaly and
+include source code of LGPL libraries with your product (unless it is
+already present in user's system - like glibc usually is).
+If compiled with --enable-odbc (Unix only), wxWindows library will 
+contain iODBC library which is covered by LGPL.
+
+If you use TIFF image handler, please see src/tiff/COPYRIGHT
+for libtiff license details.
+
+If you use JPEG image handler, documentation for your program should
+contain following sentence: "This software is based in part on the work of
+the Independent JPEG Group". See src/jpeg/README for details.
+

 
 Documentation
 -------------
 
 
 Documentation
 -------------
 

-See docs/changes.txt for a detailed history of changes to wxWindows 2.
+See docs/bugs.txt for a bug list: this file is new and will initially
+  be edited by hand, later generated from a web-based bug database.
+

 See docs/html/index.htm for an HTML index of the major documents.
 
 See docs/html/index.htm for an HTML index of the major documents.
 

+See docs/changes.txt for a detailed history of changes to wxWindows 2
+  (not up-to-date).
+

 The Windows help files are located in docs/winhelp.
 The PDF help files are located in docs/pdf.
 
 The Windows help files are located in docs/winhelp.
 The PDF help files are located in docs/pdf.
 


@@ -193,5 +194,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
 
 Good luck!
 

-The wxWindows Team, November 1999
+The wxWindows Team, February 2000