diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 08:06:26 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 08:06:26 (GMT) |
| commit | f10644983e88c73437703a863151593cc37a657f (patch) | |
| tree | b3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Lib/tkinter | |
| parent | 318909b297241f9c46f25815e12d05136da57fa9 (diff) | |
| parent | e130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff) | |
| download | cpython-f10644983e88c73437703a863151593cc37a657f.zip cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Lib/tkinter')
| -rw-r--r-- | Lib/tkinter/tix.py | 10 | ||||
| -rw-r--r-- | Lib/tkinter/ttk.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py index be44a09..4884e22 100644 --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1554,8 +1554,8 @@ class Tree(TixWidget): '''This command is used to indicate whether the entry given by entryPath has children entries and whether the children are visible. mode must be one of open, close or none. If mode is set to open, a (+) - indicator is drawn next the the entry. If mode is set to close, a (-) - indicator is drawn next the the entry. If mode is set to none, no + indicator is drawn next the entry. If mode is set to close, a (-) + indicator is drawn next the entry. If mode is set to none, no indicators will be drawn for this entry. The default mode is none. The open mode indicates the entry has hidden children and this entry can be opened by the user. The close mode indicates that all the children of the @@ -1873,13 +1873,13 @@ class Grid(TixWidget, XView, YView): return self.tk.call(self, 'info', 'bbox', x, y) def move_column(self, from_, to, offset): - """Moves the the range of columns from position FROM through TO by + """Moves the range of columns from position FROM through TO by the distance indicated by OFFSET. For example, move_column(2, 4, 1) moves the columns 2,3,4 to columns 3,4,5.""" self.tk.call(self, 'move', 'column', from_, to, offset) def move_row(self, from_, to, offset): - """Moves the the range of rows from position FROM through TO by + """Moves the range of rows from position FROM through TO by the distance indicated by OFFSET. For example, move_row(2, 4, 1) moves the rows 2,3,4 to rows 3,4,5.""" self.tk.call(self, 'move', 'row', from_, to, offset) @@ -1938,7 +1938,7 @@ class Grid(TixWidget, XView, YView): pad0 pixels Specifies the paddings to the top of a row. pad1 pixels - Specifies the paddings to the the bottom of a row. + Specifies the paddings to the bottom of a row. size val Specifies the height of a row. Val may be: "auto" -- the height of the row is set the diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index 1a6a9f4..928e1de 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -37,7 +37,7 @@ def _load_tile(master): import os tilelib = os.environ.get('TILE_LIBRARY') if tilelib: - # append custom tile path to the the list of directories that + # append custom tile path to the list of directories that # Tcl uses when attempting to resolve packages with the package # command master.tk.eval( |