Sync wxGTK docs from WX_2_6_BRANCH to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 7f0b1c83421cbcd85866293099488e9c7b5519c6..8fe7903d79206b280ba8abd755ac192112f7972d 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
 
   When sending bug reports tell us what version of wxWidgets you are
   using (including the beta) and what compiler on what system. One
 
   When sending bug reports tell us what version of wxWidgets you are
   using (including the beta) and what compiler on what system. One

-  example: wxGTK 2.6.2, gcc 2.95.4, Redhat 6.2
+  example: wxGTK 2.6.3, gcc 3.4.5, Fedora Core 4

 
 * The simplest case
 -------------------
 
 * The simplest case
 -------------------


@@ -118,8 +118,9 @@ g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
 ---------------
 
 wxWidgets/GTK+ requires the GTK+ library to be installed on your system. It has
 ---------------
 
 wxWidgets/GTK+ requires the GTK+ library to be installed on your system. It has

-to be a stable version, preferably version 1.2.10 (at least 1.2.3 is required,
-1.2.7 is strongly recommended).
+to be a stable version, preferably GTK+ 2.x.y, where x is an even number.
+GTK+ version 1.2 is highly discouraged, but if you decide to still use it,
+please use version 1.2.10 (at least 1.2.3 is required, 1.2.7 is strongly recommended).

 
 You can get the newest version of the GTK+ from the GTK+ homepage at:
 
 
 You can get the newest version of the GTK+ from the GTK+ homepage at:
 

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 43ddd06918ade53d2fb3cc9e41a03218f5c3b9a6..8d964b59a3bcf2dd14d62d265559678dbf17ab33 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -7,8 +7,8 @@ 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
 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. 
+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
 
 More info about the wxWidgets project (including all the
 other ports and version of wxWidgets) can be found at the

diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt
index 2e22f009769f89ec19aabe62dc2c7cd85e78e796..9bc83bdf500485c5fb9c480a92ed710eabb4971a 100644 (file)
--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
@@ -1,4 +1,4 @@
 
 

-This document it always out of date. Please
+This document is always out of date. Please

 see the bug list on SourceForge or one of
 the mailing lists.
\ No newline at end of file
 see the bug list on SourceForge or one of
 the mailing lists.
\ No newline at end of file

diff --git a/docs/latex/wx/wxgtk.tex b/docs/latex/wx/wxgtk.tex
index 9a53594b2fb1de684662ff5d53ea80cb3fb98ac6..f109aa079af659255139de010c3b327232b97e4c 100644 (file)
--- a/docs/latex/wx/wxgtk.tex
+++ b/docs/latex/wx/wxgtk.tex
@@ -1,22 +1,32 @@
 \section{wxGTK port}\label{wxgtkport}
 
 \section{wxGTK port}\label{wxgtkport}
 

-wxGTK is a port of wxWidgets using the GTK+ library available
-from www.gtk.org. It makes use of GTK+'s native widgets wherever
-possible and uses wxWidgets' generic controls when needed. GTK+
-itself has been ported to a number of systems, but so far only the
-original X11 version is supported. Support for the recently released
-GTK+ 2.0 including Unicode support is work in progress.
+wxGTK is a port of wxWidgets using the GTK+ library.
+It makes use of GTK+'s native widgets wherever possible and uses
+wxWidgets' generic controls when needed. GTK+ itself has been
+ported to a number of systems, but so far only the original X11
+version is supported. Support for other GTK+ backends is planned,
+such as the new DirectFB backend.

 
 

-You will need GTK+ 1.2.3 or higher which is available from:
+All work is being done on GTK+ version 2.0 and above. Support for
+GTK+ 1.2 will be deprecated in a later release.
+
+You will need GTK+ 2.0 or higher which is available from:

 
 \urlref{http://www.gtk.org}{http://www.gtk.org}
 
 
 \urlref{http://www.gtk.org}{http://www.gtk.org}
 

+The newer version of GTK+ you use, the more native widgets and
+features will be utilized. We have gone to a great extent to
+allow compiling wxWidgets applications with a latest version of
+GTK+, with the resulting binary working on systems even with a
+much lower version of GTK+. You will have to ensure that the
+application is launched with lazy symbol binding for that.
+

 In order to configure wxWidgets to compile wxGTK you will 
 In order to configure wxWidgets to compile wxGTK you will 

-need to type:
+need use the {\tt --with-gtk} argument to the {\tt configure} script.
+This is the default for many systems.

 
 

-\begin{verbatim}
-  configure --with-gtk
-\end{verbatim}
+GTK+ 1.2 can still be used, albeit discouraged. For that you can
+pass {\tt --with-gtk=1} to the {\tt configure} script.

 
 For further information, please see the files in docs/gtk
 in the distribution.
 
 For further information, please see the files in docs/gtk
 in the distribution.