Change the names of all methods in the Wm class: they are now

wm_title(), etc.  The old names (title() etc.) are still defined as
aliases.

This brings all methods up to use the same naming convention: whether
the Tcl syntax is

   .window.path.name command subcommand [options]

or

   command subcommand .window.path.name [optins]

the Python equivalent is always

   windowobject.command_subcommand(options)
This commit is contained in:
Guido van Rossum 1998-05-01 19:48:20 +00:00
parent a5e54d02a0
commit e365a590d4
1 changed files with 56 additions and 27 deletions

View File

@ -753,80 +753,109 @@ class CallWrapper:
except: except:
self.widget._report_exception() self.widget._report_exception()
class Wm: class Wm:
def aspect(self, def wm_aspect(self,
minNumer=None, minDenom=None, minNumer=None, minDenom=None,
maxNumer=None, maxDenom=None): maxNumer=None, maxDenom=None):
return self._getints( return self._getints(
self.tk.call('wm', 'aspect', self._w, self.tk.call('wm', 'aspect', self._w,
minNumer, minDenom, minNumer, minDenom,
maxNumer, maxDenom)) maxNumer, maxDenom))
def client(self, name=None): aspect = wm_aspect
def wm_client(self, name=None):
return self.tk.call('wm', 'client', self._w, name) return self.tk.call('wm', 'client', self._w, name)
def colormapwindows(self, *wlist): client = wm_client
def wm_colormapwindows(self, *wlist):
args = ('wm', 'colormapwindows', self._w) + _flatten(wlist) args = ('wm', 'colormapwindows', self._w) + _flatten(wlist)
return map(self._nametowidget, self.tk.call(args)) return map(self._nametowidget, self.tk.call(args))
def command(self, value=None): colormapwindows = wm_colormapwindows
def wm_command(self, value=None):
return self.tk.call('wm', 'command', self._w, value) return self.tk.call('wm', 'command', self._w, value)
def deiconify(self): command = wm_command
def wm_deiconify(self):
return self.tk.call('wm', 'deiconify', self._w) return self.tk.call('wm', 'deiconify', self._w)
def focusmodel(self, model=None): deiconify = wm_deiconify
def wm_focusmodel(self, model=None):
return self.tk.call('wm', 'focusmodel', self._w, model) return self.tk.call('wm', 'focusmodel', self._w, model)
def frame(self): focusmodel = wm_focusmodel
def wm_frame(self):
return self.tk.call('wm', 'frame', self._w) return self.tk.call('wm', 'frame', self._w)
def geometry(self, newGeometry=None): frame = wm_frame
def wm_geometry(self, newGeometry=None):
return self.tk.call('wm', 'geometry', self._w, newGeometry) return self.tk.call('wm', 'geometry', self._w, newGeometry)
def grid(self, geometry = wm_geometry
def wm_grid(self,
baseWidth=None, baseHeight=None, baseWidth=None, baseHeight=None,
widthInc=None, heightInc=None): widthInc=None, heightInc=None):
return self._getints(self.tk.call( return self._getints(self.tk.call(
'wm', 'grid', self._w, 'wm', 'grid', self._w,
baseWidth, baseHeight, widthInc, heightInc)) baseWidth, baseHeight, widthInc, heightInc))
def group(self, pathName=None): grid = wm_grid
def wm_group(self, pathName=None):
return self.tk.call('wm', 'group', self._w, pathName) return self.tk.call('wm', 'group', self._w, pathName)
def iconbitmap(self, bitmap=None): group = wm_group
def wm_iconbitmap(self, bitmap=None):
return self.tk.call('wm', 'iconbitmap', self._w, bitmap) return self.tk.call('wm', 'iconbitmap', self._w, bitmap)
def iconify(self): iconbitmap = wm_iconbitmap
def wm_iconify(self):
return self.tk.call('wm', 'iconify', self._w) return self.tk.call('wm', 'iconify', self._w)
def iconmask(self, bitmap=None): iconify = wm_iconify
def wm_iconmask(self, bitmap=None):
return self.tk.call('wm', 'iconmask', self._w, bitmap) return self.tk.call('wm', 'iconmask', self._w, bitmap)
def iconname(self, newName=None): iconmask = wm_iconmask
def wm_iconname(self, newName=None):
return self.tk.call('wm', 'iconname', self._w, newName) return self.tk.call('wm', 'iconname', self._w, newName)
def iconposition(self, x=None, y=None): iconname = wm_iconname
def wm_iconposition(self, x=None, y=None):
return self._getints(self.tk.call( return self._getints(self.tk.call(
'wm', 'iconposition', self._w, x, y)) 'wm', 'iconposition', self._w, x, y))
def iconwindow(self, pathName=None): iconposition = wm_iconposition
def wm_iconwindow(self, pathName=None):
return self.tk.call('wm', 'iconwindow', self._w, pathName) return self.tk.call('wm', 'iconwindow', self._w, pathName)
def maxsize(self, width=None, height=None): iconwindow = wm_iconwindow
def wm_maxsize(self, width=None, height=None):
return self._getints(self.tk.call( return self._getints(self.tk.call(
'wm', 'maxsize', self._w, width, height)) 'wm', 'maxsize', self._w, width, height))
def minsize(self, width=None, height=None): maxsize = wm_maxsize
def wm_minsize(self, width=None, height=None):
return self._getints(self.tk.call( return self._getints(self.tk.call(
'wm', 'minsize', self._w, width, height)) 'wm', 'minsize', self._w, width, height))
def overrideredirect(self, boolean=None): minsize = wm_minsize
def wm_overrideredirect(self, boolean=None):
return self._getboolean(self.tk.call( return self._getboolean(self.tk.call(
'wm', 'overrideredirect', self._w, boolean)) 'wm', 'overrideredirect', self._w, boolean))
def positionfrom(self, who=None): overrideredirect = wm_overrideredirect
def wm_positionfrom(self, who=None):
return self.tk.call('wm', 'positionfrom', self._w, who) return self.tk.call('wm', 'positionfrom', self._w, who)
def protocol(self, name=None, func=None): positionfrom = wm_positionfrom
def wm_protocol(self, name=None, func=None):
if callable(func): if callable(func):
command = self._register(func) command = self._register(func)
else: else:
command = func command = func
return self.tk.call( return self.tk.call(
'wm', 'protocol', self._w, name, command) 'wm', 'protocol', self._w, name, command)
def resizable(self, width=None, height=None): protocol = wm_protocol
def wm_resizable(self, width=None, height=None):
return self.tk.call('wm', 'resizable', self._w, width, height) return self.tk.call('wm', 'resizable', self._w, width, height)
def sizefrom(self, who=None): resizable = wm_resizable
def wm_sizefrom(self, who=None):
return self.tk.call('wm', 'sizefrom', self._w, who) return self.tk.call('wm', 'sizefrom', self._w, who)
def state(self): sizefrom = wm_sizefrom
def wm_state(self):
return self.tk.call('wm', 'state', self._w) return self.tk.call('wm', 'state', self._w)
def title(self, string=None): state = wm_state
def wm_title(self, string=None):
return self.tk.call('wm', 'title', self._w, string) return self.tk.call('wm', 'title', self._w, string)
def transient(self, master=None): title = wm_title
def wm_transient(self, master=None):
return self.tk.call('wm', 'transient', self._w, master) return self.tk.call('wm', 'transient', self._w, master)
def withdraw(self): transient = wm_transient
def wm_withdraw(self):
return self.tk.call('wm', 'withdraw', self._w) return self.tk.call('wm', 'withdraw', self._w)
withdraw = wm_withdraw
class Tk(Misc, Wm): class Tk(Misc, Wm):
_w = '.' _w = '.'