Index: Lib/lib-tk/Tkinter.py =================================================================== --- Lib/lib-tk/Tkinter.py (revision 73085) +++ Lib/lib-tk/Tkinter.py (working copy) @@ -3567,11 +3567,11 @@ """Identify the panedwindow component at point x, y If the point is over a sash or a sash handle, the result - is a two element list containing the index of the sash or + is a two element tuple containing the index of the sash or handle, and a word indicating whether it is over a sash - or a handle, such as {0 sash} or {2 handle}. If the point + or a handle, such as (0, 'sash') or (2, 'handle'). If the point is over any other part of the panedwindow, the result is - an empty list. + an empty string. """ return self.tk.call(self._w, 'identify', x, y) @@ -3586,14 +3586,12 @@ return self.proxy("coord") def proxy_forget(self): - """Remove the proxy from the display. - """ - return self.proxy("forget") + """Remove the proxy from the display.""" + self.proxy("forget") def proxy_place(self, x, y): - """Place the proxy at the given x and y coordinates. - """ - return self.proxy("place", x, y) + """Place the proxy at the given x and y coordinates.""" + self.proxy("place", x, y) def sash(self, *args): """Internal function.""" @@ -3634,30 +3632,30 @@ return self.tk.call( (self._w, 'panecget') + (child, '-'+option)) - def paneconfigure(self, tagOrId, cnf=None, **kw): + def paneconfigure(self, window, cnf=None, **kw): """Query or modify the management options for window. - If no option is specified, returns a list describing all - of the available options for pathName. If option is - specified with no value, then the command returns a list - describing the one named option (this list will be identical - to the corresponding sublist of the value returned if no - option is specified). If one or more option-value pairs are - specified, then the command modifies the given widget - option(s) to have the given value(s); in this case the - command returns an empty string. The following options - are supported: + If no option is specified, a dict describing all options and + the respective values for the window is returned. If cnf is + specified as a string, then a tuple describing this one named + option is returned (this tuple will be identical to the + corresponding value in the dict returned when no option is + specified). If one or more option-value pairs are specified, + then the specified options will have their values updated. + The following options-values are supported: after window Insert the window after the window specified. window - should be the name of a window already managed by pathName. + should be the name of a window already managed by this + PanedWindow. before window Insert the window before the window specified. window - should be the name of a window already managed by pathName. + should be the name of a window already managed by this + PanedWindow. height size Specify a height for the window. The height will be the outer dimension of the window including its border, if - any. If size is an empty string, or if -height is not + any. If size is an empty string, or if this option is not specified, then the height requested internally by the window will be used initially; the height may later be adjusted by the movement of sashes in the panedwindow. @@ -3705,15 +3703,14 @@ if cnf is None and not kw: cnf = {} for x in self.tk.split( - self.tk.call(self._w, - 'paneconfigure', tagOrId)): + self.tk.call(self._w, 'paneconfigure', window)): cnf[x[0][1:]] = (x[0][1:],) + x[1:] return cnf if type(cnf) == StringType and not kw: x = self.tk.split(self.tk.call( - self._w, 'paneconfigure', tagOrId, '-'+cnf)) + self._w, 'paneconfigure', window, '-'+cnf)) return (x[0][1:],) + x[1:] - self.tk.call((self._w, 'paneconfigure', tagOrId) + + self.tk.call((self._w, 'paneconfigure', window) + self._options(cnf, kw)) paneconfig = paneconfigure