summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-15 03:59:46 (GMT)
commit4969f709cc07088a40574c05724d83cddc8fafc7 (patch)
treeddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Lib/tkinter
parentc48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff)
parent42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff)
downloadcpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz
cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2
#11515: Merge with 3.1.
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/__init__.py2
-rw-r--r--Lib/tkinter/tix.py2
-rw-r--r--Lib/tkinter/ttk.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 2fa1712..e54c53f 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1649,7 +1649,7 @@ class Wm:
class Tk(Misc, Wm):
"""Toplevel widget of Tk which represents mostly the main window
- of an appliation. It has an associated Tcl interpreter."""
+ of an application. It has an associated Tcl interpreter."""
_w = '.'
def __init__(self, screenName=None, baseName=None, className='Tk',
useTk=1, sync=0, use=None):
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 3326adc..17ed230 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -163,7 +163,7 @@ class tixCommand:
extensions) exist, then the image type is chosen according to the
depth of the X display: xbm images are chosen on monochrome
displays and color images are chosen on color displays. By using
- tix_ getimage, you can advoid hard coding the pathnames of the
+ tix_ getimage, you can avoid hard coding the pathnames of the
image files in your application. When successful, this command
returns the name of the newly created image, which can be used to
configure the -image option of the Tk and Tix widgets.
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index e10c668..0d048bb 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -993,7 +993,7 @@ class Panedwindow(Widget, tkinter.PanedWindow):
pane is either an integer index or the name of a managed subwindow.
If kw is not given, returns a dict of the pane option values. If
option is specified then the value for that option is returned.
- Otherwise, sets the options to the correspoding values."""
+ Otherwise, sets the options to the corresponding values."""
if option is not None:
kw[option] = None
return _val_or_dict(kw, self.tk.call, self._w, "pane", pane)