cpython (merge 3.2 -> default): Merge doc fixes from 3.2

http://hg.python.org/cpython/rev/309f12301de2 changeset: 73831:309f12301de2 parent: 73828:ab5bc05ac223 parent: 73830:bc3f1629d825 user: Antoine Pitrou <solipsis@pitrou.net> date: Sat Dec 03 21:07:50 2011 +0100 summary: Merge doc fixes from 3.2 files: Doc/faq/gui.rst | 8 ++++++-- Doc/library/othergui.rst | 21 ++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -68,8 +68,12 @@ Gtk+ ---- -PyGtk bindings for the `Gtk+ toolkit <http://www.gtk.org>`_ have been -implemented by James Henstridge; see <http://www.pygtk.org>. +The `GObject introspection bindings <https://live.gnome.org/PyGObject>`_ +for Python allow you to write GTK+ 3 applications. There is also a +`Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_. + +The older PyGtk bindings for the `Gtk+ 2 toolkit <http://www.gtk.org>`_ have +been implemented by James Henstridge; see <http://www.pygtk.org>. FLTK ---- diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -34,11 +34,17 @@ .. seealso:: - `PyGTK <http://www.pygtk.org/>`_ - is a set of bindings for the `GTK <http://www.gtk.org/>`_ widget set. It - provides an object oriented interface that is slightly higher level than - the C one. It comes with many more widgets than Tkinter provides, and has - good Python-specific reference documentation. There are also bindings to + `PyGObject <https://live.gnome.org/PyGObject>`_ + provides introspection bindings for C libraries using + `GObject <http://developer.gnome.org/gobject/stable/>`_. One of + these libraries is the `GTK+ 3 <http://www.gtk.org/>`_ widget set. + GTK+ comes with many more widgets than Tkinter provides. An online + `Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_ + is available. + + `PyGTK <http://www.pygtk.org/>`_ provides bindings for an older version + of the library, GTK+ 2. It provides an object oriented interface that + is slightly higher level than the C one. There are also bindings to `GNOME <http://www.gnome.org>`_. One well known PyGTK application is `PythonCAD <http://www.pythoncad.org/>`_. An online `tutorial <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available. @@ -55,6 +61,11 @@ with Python and Qt <http://www.qtrac.eu/pyqtbook.html>`_, by Mark Summerfield. + `PySide <http://www.pyside.org/>`_ + is a newer binding to the Qt toolkit, provided by Nokia. + Compared to PyQt, its licensing scheme is friendlier to non-open source + applications. + `wxPython <http://www.wxpython.org>`_ wxPython is a cross-platform GUI toolkit for Python that is built around the popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly wxWindows) -- Repository URL: http://hg.python.org/cpython
participants (1)
-
antoine.pitrou