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 75cf00bdbfae420e22a99fc34d672f069fc99bf6..8d964b59a3bcf2dd14d62d265559678dbf17ab33 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,52 +1,64 @@
 
 

-  Welcome to wxWindows for GTK 1.0,
+   Welcome to wxWidgets 2.6 for GTK+
+
+You have downloaded version 2.6 of the GTK+ port of the 
+wxWidgets GUI library.
+
+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 wxWidgets project (including all the
+other ports and version of wxWidgets) can be found at the
+main wxWidgets homepage at:
+
+                  http://www.wxwidgets.org

   
   

-you have downloaded the first beta version of the upcoming
-release 2.0 of the GTK+ 1.0 port of wxWindows library.
- 

 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on
 Information on how to install can be found in the file 
 INSTALL.txt, but if you cannot wait, this should work on

-all systems
+many systems:
+
+    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.

 
 

-configure --without-threads
-make
-su (PASSWORD)
-make install
+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
+
+When you run into problems, please read the INSTALL.txt and 

 follow those instructions. If you still don't have any success,
 follow those instructions. If you still don't have any success,

-please send a bug report to one of our mailing lists (see
-my homepage) INCLUDING 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...
-
-This is the beta release which means that we have a feature
-freeze. We'll move up to versin 2.0 rather soon and from then
-on there will be no more binary incompatible changes. We might
-add more classes, but none that would alter the behaviour of
-the existing ones. The library produced by the install process
-of the final version will be called libwx_gtk_1_0.a (static)
-and libwx_gtk_1_0.so.2.0.0 (shared) so that once a version
-of wxWindows/Gtk for GTK 1.2 comes out we'll change the name
-of the library to avoid linking problems.
-
-More information is available from my homepage at
-
-  http://wesley.informatik.uni-freiburg.de/~wxxt
-  
+please send a bug report to one of our mailing list, INCLUDING 
+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...
+

 Please send problems concerning installation, feature requests, 
 Please send problems concerning installation, feature requests, 

-bug reports or comments to either the wxGTK mailing list or to
-the wxWindows developers 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.

 
 

-wxWindows/Gtk 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 purpose.
+Do NOT send any comments directly to me.
+
+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.

 
   Regards,
 
     Robert Roebling
 
 
   Regards,
 
     Robert Roebling
 

-
-