Commit c8b4791d authored by Guido van Rossum's avatar Guido van Rossum

Two independent changes:

- accept empty string from focus_get
- map coords() return value through getdouble and splitlist
parent 8d12a1bc
...@@ -167,7 +167,7 @@ class Misc: ...@@ -167,7 +167,7 @@ class Misc:
self.tk.call('focus', 'none') self.tk.call('focus', 'none')
def focus_get(self): def focus_get(self):
name = self.tk.call('focus') name = self.tk.call('focus')
if name == 'none': return None if name == 'none' or not Name: return None
return self._nametowidget(name) return self._nametowidget(name)
def tk_focusNext(self): def tk_focusNext(self):
name = self.tk.call('tk_focusNext', self._w) name = self.tk.call('tk_focusNext', self._w)
...@@ -963,7 +963,8 @@ class Canvas(Widget): ...@@ -963,7 +963,8 @@ class Canvas(Widget):
return self.tk.getdouble(self.tk.call( return self.tk.getdouble(self.tk.call(
self._w, 'canvasy', screeny, gridspacing)) self._w, 'canvasy', screeny, gridspacing))
def coords(self, *args): def coords(self, *args):
return self._do('coords', args) return map(self.tk.getdouble,
self.tk.splitlist(self._do('coords', args))
def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={}) def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={})
args = _flatten(args) args = _flatten(args)
cnf = args[-1] cnf = args[-1]
......
...@@ -167,7 +167,7 @@ class Misc: ...@@ -167,7 +167,7 @@ class Misc:
self.tk.call('focus', 'none') self.tk.call('focus', 'none')
def focus_get(self): def focus_get(self):
name = self.tk.call('focus') name = self.tk.call('focus')
if name == 'none': return None if name == 'none' or not Name: return None
return self._nametowidget(name) return self._nametowidget(name)
def tk_focusNext(self): def tk_focusNext(self):
name = self.tk.call('tk_focusNext', self._w) name = self.tk.call('tk_focusNext', self._w)
...@@ -963,7 +963,8 @@ class Canvas(Widget): ...@@ -963,7 +963,8 @@ class Canvas(Widget):
return self.tk.getdouble(self.tk.call( return self.tk.getdouble(self.tk.call(
self._w, 'canvasy', screeny, gridspacing)) self._w, 'canvasy', screeny, gridspacing))
def coords(self, *args): def coords(self, *args):
return self._do('coords', args) return map(self.tk.getdouble,
self.tk.splitlist(self._do('coords', args))
def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={}) def _create(self, itemType, args, kw): # Args: (val, val, ..., cnf={})
args = _flatten(args) args = _flatten(args)
cnf = args[-1] cnf = args[-1]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment