summaryrefslogtreecommitdiffstats
path: root/Doc/library/tkinter.rst
diff options
context:
space:
mode:
authorAndrés Delfino <34587441+andresdelfino@users.noreply.github.com>2018-04-17 05:34:35 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2018-04-17 05:34:35 (GMT)
commit4b685bf7192fff48c8effeeae4f4d64f9420ec0f (patch)
treeace39eeafe89c41d8dfe54f6dc9d5d6a1bba3635 /Doc/library/tkinter.rst
parenta00d440edb4ccf36c83673a0fb172b29c76a66e6 (diff)
downloadcpython-4b685bf7192fff48c8effeeae4f4d64f9420ec0f.zip
cpython-4b685bf7192fff48c8effeeae4f4d64f9420ec0f.tar.gz
cpython-4b685bf7192fff48c8effeeae4f4d64f9420ec0f.tar.bz2
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (GH-6479)
Diffstat (limited to 'Doc/library/tkinter.rst')
-rw-r--r--Doc/library/tkinter.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 6d90e43..b99dc8e 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -783,12 +783,13 @@ Menu indexes (menu.invoke(), menu.entryconfig(), etc.)
Images
^^^^^^
-Bitmap/Pixelmap images can be created through the subclasses of
-:class:`tkinter.Image`:
+Images of different formats can be created through the corresponding subclass
+of :class:`tkinter.Image`:
-* :class:`BitmapImage` can be used for X11 bitmap data.
+* :class:`BitmapImage` for images in XBM format.
-* :class:`PhotoImage` can be used for GIF and PPM/PGM color bitmaps.
+* :class:`PhotoImage` for images in PGM, PPM, GIF and PNG formats. The latter
+ is supported starting with Tk 8.6.
Either type of image is created through either the ``file`` or the ``data``
option (other options are available as well).