mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

more changes copied from Grail

Browse source
This commit is contained in:
Guido van Rossum 1996-05-21 20:30:07 +00:00
parent 4122216739
commit 422cc7ffec
2 changed files with 98 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Lib/lib-tk/Tkinter.py
View file

@ -723,7 +723,7 @@ class Place:
place_slaves = slaves place_slaves = slaves
class Grid: class Grid:
# Thanks to Masa Yoshikawa (yosikawa@isi.edu) # Thanks to Masazumi Yoshikawa (yosikawa@isi.edu)
def config(self, cnf={}, **kw): def config(self, cnf={}, **kw):
apply(self.tk.call, apply(self.tk.call,
('grid', 'configure', self._w) ('grid', 'configure', self._w)
@ -736,14 +736,18 @@ class Grid:
self.tk.call( self.tk.call(
'grid', 'bbox', self._w, column, row)) or None 'grid', 'bbox', self._w, column, row)) or None
grid_bbox = bbox grid_bbox = bbox
def columnconfigure(self, index, *args): def columnconfigure(self, index, cnf={}, **kw):
if type(cnf) is not DictionaryType and not kw:
options = self._options({cnf: None})
else:
options = self._options(cnf, kw)
res = apply(self.tk.call, res = apply(self.tk.call,
('grid', 'columnconfigure', self._w) ('grid', 'columnconfigure', self._w, index)
+ args) + options)
if args == ['minsize']: if options == ('-minsize', None):
return self._getint(res) or None return self.tk.getint(res) or None
elif args == ['wieght']: elif options == ('-weight', None):
return self._getdouble(res) or None return self.tk.getdouble(res) or None
def forget(self): def forget(self):
self.tk.call('grid', 'forget', self._w) self.tk.call('grid', 'forget', self._w)
grid_forget = forget grid_forget = forget
@ -771,14 +775,18 @@ class Grid:
else: else:
self.tk.call('grid', 'propagate', self._w, flag) self.tk.call('grid', 'propagate', self._w, flag)
grid_propagate = propagate grid_propagate = propagate
def rowconfigure(self, index, *args): def rowconfigure(self, index, cnf={}, **kw):
if type(cnf) is not DictionaryType and not kw:
options = self._options({cnf: None})
else:
options = self._options(cnf, kw)
res = apply(self.tk.call, res = apply(self.tk.call,
('grid', 'rowconfigure', self._w) ('grid', 'rowconfigure', self._w, index)
+ args) + options)
if args == ['minsize']: if options == ('-minsize', None):
return self._getint(res) or None return self.tk.getint(res) or None
elif args == ['wieght']: elif options == ('-weight', None):
return self._getdouble(res) or None return self.tk.getdouble(res) or None
def size(self): def size(self):
return self._getints( return self._getints(
self.tk.call('grid', 'size', self._w)) or None self.tk.call('grid', 'size', self._w)) or None
@ -844,8 +852,9 @@ class Widget(Misc, Pack, Place, Grid):
apply(self.tk.call, (self._w, 'configure') apply(self.tk.call, (self._w, 'configure')
+ self._options(cnf)) + self._options(cnf))
configure = config configure = config
def __getitem__(self, key): def cget(self, key):
return self.tk.call(self._w, 'cget', '-' + key) return self.tk.call(self._w, 'cget', '-' + key)
__getitem__ = cget
def __setitem__(self, key, value): def __setitem__(self, key, value):
Widget.config(self, {key: value}) Widget.config(self, {key: value})
def keys(self): def keys(self):
@ -1097,21 +1106,31 @@ class Entry(Widget):
self.tk.call(self._w, 'scan', 'mark', x) self.tk.call(self._w, 'scan', 'mark', x)
def scan_dragto(self, x): def scan_dragto(self, x):
self.tk.call(self._w, 'scan', 'dragto', x) self.tk.call(self._w, 'scan', 'dragto', x)
def select_adjust(self, index): def selection_adjust(self, index):
self.tk.call(self._w, 'select', 'adjust', index) self.tk.call(self._w, 'selection', 'adjust', index)
def select_clear(self): select_adjust = selection_adjust
self.tk.call(self._w, 'select', 'clear') def selection_clear(self):
def select_from(self, index): self.tk.call(self._w, 'selection', 'clear')
self.tk.call(self._w, 'select', 'set', index) select_clear = selection_clear
def select_present(self): def selection_from(self, index):
self.tk.call(self._w, 'selection', 'set', index)
select_from = selection_from
def selection_present(self):
return self.tk.getboolean( return self.tk.getboolean(
self.tk.call(self._w, 'select', 'present')) self.tk.call(self._w, 'selection', 'present'))
def select_range(self, start, end): select_present = selection_present
self.tk.call(self._w, 'select', 'range', start, end) def selection_range(self, start, end):
def select_to(self, index): self.tk.call(self._w, 'selection', 'range', start, end)
self.tk.call(self._w, 'select', 'to', index) select_range = selection_range
def view(self, index): def selection_to(self, index):
self.tk.call(self._w, 'view', index) self.tk.call(self._w, 'selection', 'to', index)
select_to = selection_to
def xview(self, index):
self.tk.call(self._w, 'xview', index)
def xview_moveto(self, fraction):
self.tk.call(self._w, 'xview', 'moveto', fraction)
def xview_scroll(self, number, what):
self.tk.call(self._w, 'xview', 'scroll', number, what)
class Frame(Widget): class Frame(Widget):
def __init__(self, master=None, cnf={}, **kw): def __init__(self, master=None, cnf={}, **kw):

79
Lib/tkinter/Tkinter.py
View file

@ -723,7 +723,7 @@ class Place:
place_slaves = slaves place_slaves = slaves
class Grid: class Grid:
# Thanks to Masa Yoshikawa (yosikawa@isi.edu) # Thanks to Masazumi Yoshikawa (yosikawa@isi.edu)
def config(self, cnf={}, **kw): def config(self, cnf={}, **kw):
apply(self.tk.call, apply(self.tk.call,
('grid', 'configure', self._w) ('grid', 'configure', self._w)
@ -736,14 +736,18 @@ class Grid:
self.tk.call( self.tk.call(
'grid', 'bbox', self._w, column, row)) or None 'grid', 'bbox', self._w, column, row)) or None
grid_bbox = bbox grid_bbox = bbox
def columnconfigure(self, index, *args): def columnconfigure(self, index, cnf={}, **kw):
if type(cnf) is not DictionaryType and not kw:
options = self._options({cnf: None})
else:
options = self._options(cnf, kw)
res = apply(self.tk.call, res = apply(self.tk.call,
('grid', 'columnconfigure', self._w) ('grid', 'columnconfigure', self._w, index)
+ args) + options)
if args == ['minsize']: if options == ('-minsize', None):
return self._getint(res) or None return self.tk.getint(res) or None
elif args == ['wieght']: elif options == ('-weight', None):
return self._getdouble(res) or None return self.tk.getdouble(res) or None
def forget(self): def forget(self):
self.tk.call('grid', 'forget', self._w) self.tk.call('grid', 'forget', self._w)
grid_forget = forget grid_forget = forget
@ -771,14 +775,18 @@ class Grid:
else: else:
self.tk.call('grid', 'propagate', self._w, flag) self.tk.call('grid', 'propagate', self._w, flag)
grid_propagate = propagate grid_propagate = propagate
def rowconfigure(self, index, *args): def rowconfigure(self, index, cnf={}, **kw):
if type(cnf) is not DictionaryType and not kw:
options = self._options({cnf: None})
else:
options = self._options(cnf, kw)
res = apply(self.tk.call, res = apply(self.tk.call,
('grid', 'rowconfigure', self._w) ('grid', 'rowconfigure', self._w, index)
+ args) + options)
if args == ['minsize']: if options == ('-minsize', None):
return self._getint(res) or None return self.tk.getint(res) or None
elif args == ['wieght']: elif options == ('-weight', None):
return self._getdouble(res) or None return self.tk.getdouble(res) or None
def size(self): def size(self):
return self._getints( return self._getints(
self.tk.call('grid', 'size', self._w)) or None self.tk.call('grid', 'size', self._w)) or None
@ -844,8 +852,9 @@ class Widget(Misc, Pack, Place, Grid):
apply(self.tk.call, (self._w, 'configure') apply(self.tk.call, (self._w, 'configure')
+ self._options(cnf)) + self._options(cnf))
configure = config configure = config
def __getitem__(self, key): def cget(self, key):
return self.tk.call(self._w, 'cget', '-' + key) return self.tk.call(self._w, 'cget', '-' + key)
__getitem__ = cget
def __setitem__(self, key, value): def __setitem__(self, key, value):
Widget.config(self, {key: value}) Widget.config(self, {key: value})
def keys(self): def keys(self):
@ -1097,21 +1106,31 @@ class Entry(Widget):
self.tk.call(self._w, 'scan', 'mark', x) self.tk.call(self._w, 'scan', 'mark', x)
def scan_dragto(self, x): def scan_dragto(self, x):
self.tk.call(self._w, 'scan', 'dragto', x) self.tk.call(self._w, 'scan', 'dragto', x)
def select_adjust(self, index): def selection_adjust(self, index):
self.tk.call(self._w, 'select', 'adjust', index) self.tk.call(self._w, 'selection', 'adjust', index)
def select_clear(self): select_adjust = selection_adjust
self.tk.call(self._w, 'select', 'clear') def selection_clear(self):
def select_from(self, index): self.tk.call(self._w, 'selection', 'clear')
self.tk.call(self._w, 'select', 'set', index) select_clear = selection_clear
def select_present(self): def selection_from(self, index):
self.tk.call(self._w, 'selection', 'set', index)
select_from = selection_from
def selection_present(self):
return self.tk.getboolean( return self.tk.getboolean(
self.tk.call(self._w, 'select', 'present')) self.tk.call(self._w, 'selection', 'present'))
def select_range(self, start, end): select_present = selection_present
self.tk.call(self._w, 'select', 'range', start, end) def selection_range(self, start, end):
def select_to(self, index): self.tk.call(self._w, 'selection', 'range', start, end)
self.tk.call(self._w, 'select', 'to', index) select_range = selection_range
def view(self, index): def selection_to(self, index):
self.tk.call(self._w, 'view', index) self.tk.call(self._w, 'selection', 'to', index)
select_to = selection_to
def xview(self, index):
self.tk.call(self._w, 'xview', index)
def xview_moveto(self, fraction):
self.tk.call(self._w, 'xview', 'moveto', fraction)
def xview_scroll(self, number, what):
self.tk.call(self._w, 'xview', 'scroll', number, what)
class Frame(Widget): class Frame(Widget):
def __init__(self, master=None, cnf={}, **kw): def __init__(self, master=None, cnf={}, **kw):