Add missing wxUSE_MARKUP checks in wxOSX code.

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

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index bee4785719f1478ad3fd515ab2029a3c3d5c7753..89fcbec894dd4c83efc6981bb0a5135328602610 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,20 +1,29 @@
-
-   Welcome to wxWidgets/Gtk 2.5
-
-You have downloaded version 2.5 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.2.x and even
-GTK 2.4.x are used. 
+   Welcome to wxWidgets for GTK+
+   -----------------------------
+
+You have downloaded the GTK+ port of the wxWidgets GUI library.
+
+It is required to use at least GTK+ 2.4 and some features are 
+only available when using GTK+ 2.8 or higher. Note that if you
+compile wxWidgets against GTK+ 2.8 your app will still work
+with older GTK+ version down to version 2.4 as wxWidgets
+tests for the presence of newer features at run-time and it
+will fall back to a generic implementation if these features
+are not present in the GTK+ version used.
+
+wxWidgets 2.8 still supports GTK+ 1.2, but no developement
+is done on that port anymore and support for GTK+ 1.2 will
+probably be dropped entirely. Indeed, one of the major steps
+in the developement cycle leading up to wxWidgets 2.8 was
+that the codebase for GTK+ 1.2 and GTK+ 2.0 were separated
+so that improvements and clean-ups to the GTK+ 2.0 port 
+could be done without caring for GTK+ 1.2.
 
 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
+                  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
@@ -22,13 +31,13 @@ many systems:
 
     mkdir build_gtk
     cd build_gtk
-    ../configure --with-gtk
+    ../configure
     make
     su <type root password>
     make install
     ldconfig
 
-In order to use wxGTK with GTK 2.0 you need to use --enable-gtk2
+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.
@@ -39,7 +48,6 @@ 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,
 please send a bug report to one of our mailing list, INCLUDING 
@@ -52,9 +60,7 @@ 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.
-
-wxWidgets/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.