From ddfb6cdc2b1cc30bc3d530c5c1d8926d016081ef Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Mon, 28 Sep 2009 18:29:28 +0000
Subject: Applying patches backported from 3.1, by Gregor Lingl.
---
Demo/turtle/turtleDemo.py | 1 +
Lib/lib-tk/turtle.py | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Demo/turtle/turtleDemo.py b/Demo/turtle/turtleDemo.py
index 5e744ef..38a44e0 100644
--- a/Demo/turtle/turtleDemo.py
+++ b/Demo/turtle/turtleDemo.py
@@ -98,6 +98,7 @@ class DemoWindow(object):
turtle._Screen._canvas = turtle.ScrolledCanvas(g_frame, 800, 600, 1000, 800)
#xturtle.Screen._canvas.pack(expand=1, fill="both")
self.screen = _s_ = turtle.Screen()
+ turtle.TurtleScreen.__init__(_s_, _s_._canvas)
self.scanvas = _s_._canvas
#xturtle.RawTurtle.canvases = [self.scanvas]
turtle.RawTurtle.screens = [_s_]
diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py
index a3dc852..625b31b 100644
--- a/Lib/lib-tk/turtle.py
+++ b/Lib/lib-tk/turtle.py
@@ -1,8 +1,8 @@
#
# turtle.py: a Tkinter based turtle graphics module for Python
-# Version 1.0b1 - 31. 5. 2008
+# Version 1.0.1 - 24. 9. 2009
#
-# Copyright (C) 2006 - 2008 Gregor Lingl
+# Copyright (C) 2006 - 2009 Gregor Lingl
# email: glingl@aon.at
#
# This software is provided 'as-is', without any express or implied
@@ -1244,9 +1244,12 @@ class TurtleScreen(TurtleScreenBase):
def update(self):
"""Perform a TurtleScreen update.
"""
+ tracing = self._tracing
+ self._tracing = True
for t in self.turtles():
t._update_data()
t._drawturtle()
+ self._tracing = tracing
self._update()
def window_width(self):
@@ -1337,7 +1340,8 @@ class TurtleScreen(TurtleScreenBase):
### consequently drawing a hexagon
"""
if fun == None:
- self._keys.remove(key)
+ if key in self._keys:
+ self._keys.remove(key)
elif key not in self._keys:
self._keys.append(key)
self._onkey(fun, key)
@@ -3574,8 +3578,8 @@ class _Screen(TurtleScreen):
topbottom = _CFG["topbottom"]
self._root.setupcanvas(width, height, canvwidth, canvheight)
_Screen._canvas = self._root._getcanvas()
+ TurtleScreen.__init__(self, _Screen._canvas)
self.setup(width, height, leftright, topbottom)
- TurtleScreen.__init__(self, _Screen._canvas)
def setup(self, width=_CFG["width"], height=_CFG["height"],
startx=_CFG["leftright"], starty=_CFG["topbottom"]):
@@ -3615,6 +3619,7 @@ class _Screen(TurtleScreen):
if starty is None:
starty = (sh - height) / 2
self._root.set_geometry(width, height, startx, starty)
+ self.update()
def title(self, titlestring):
"""Set title of turtle-window
--
cgit v0.12