revert removal of gtk1 code from common file

[wxWidgets.git] / docs / gtk / readme.txt

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 58a83d81e2f5f08e63f672d3e66aad806b5a5aff..8d964b59a3bcf2dd14d62d265559678dbf17ab33 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,31 +1,44 @@
 
-   Welcome to wxWindows/Gtk 2.3
+   Welcome to wxWidgets 2.6 for GTK+
 
-you have downloaded version 2.3 of the GTK port of the 
-wxWindows GUI library.
+You have downloaded version 2.6 of the GTK+ port of the 
+wxWidgets GUI library.
 
-wxWindows no longer supports GTK 1.0 (as did some early
-snapshots) so that you will need GTK 1.2 when using it.
-GTK 1.2.6 or above is recommended although some programs 
-will work with GTK 1.2.3 onwards. There is now beta support
-for GTK 2.0.
+wxWidgets no longer supports GTK 1.0.x (as did some early
+snapshots) and support for GTK 1.2.x will be phased out
+over time. Nearly all work is now done on GTK 2.0.x and
+quite a few of the enhancements of GTK+ 2.4.x and even
+GTK 2.8.x are used.
 
-More info about the wxWindows project (and the Windows
-and Motif ports in particular) can be found at Julian's 
-homepage at:
+More info about the wxWidgets project (including all the
+other ports and version of wxWidgets) can be found at the
+main wxWidgets homepage at:
 
-  http://www.wxwindows.org
+                  http://www.wxwidgets.org
   
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
 many systems:
 
-./configure --with-gtk
-make
-su <type root password>
-make install
-ldconfig
-exit
+    mkdir build_gtk
+    cd build_gtk
+    ../configure --with-gtk=2
+    make
+    su <type root password>
+    make install
+    ldconfig
+
+In order to use wxGTK with GTK 1.2 you need to use --with-gtk=1
+configure option. To build the library in Unicode mode (all
+strings will be wide strings and so on) you need to configure
+with GTK 2.0 and add --enable-unicode.
+
+Please note that it is strongly advised to build the library in
+a separate directory, as shown above, as it allows you to have
+different builds of it (for example with and without debug) in
+parallel. If you build in the source directory, don't forget to
+do "make clean" before changing the configuration!
+
 
 When you run into problems, please read the INSTALL.txt and 
 follow those instructions. If you still don't have any success,
@@ -34,19 +47,14 @@ A DESCRIPTION OF YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR
 VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR 
 WAS REPORTED. I know this has no effect, but I tried...
 
-The library produced by the install process will be called 
-libwx_gtk.a (static) and libwx_gtk-2.2.so.0.0.0 (shared) so 
-that once a binary incompatible version of wxWindows/Gtk comes 
-out we'll augment the library version number to avoid linking 
-problems.
-
 Please send problems concerning installation, feature requests, 
-bug reports or comments to the wxWindows users list. Information 
-on how to subscribe is available from my homepage.
+bug reports or comments to the wxWidgets users list. These can
+be found at http://www.wxwidgets.org and more specifically at 
+http://lists.wxwidgets.org.
 
 Do NOT send any comments directly to me.
 
-wxWindows/Gtk doesn't come with any guarantee whatsoever. It 
+wxWidgets doesn't come with any guarantee whatsoever. It 
 might crash your harddisk or destroy your monitor. It doesn't 
 claim to be suitable for any special or general purpose.
 
@@ -54,5 +62,3 @@ claim to be suitable for any special or general purpose.
 
     Robert Roebling
 
-
-