changeset: 92247:b671092e08fa branch: 3.4 parent: 92245:7fbb912c0789 user: Terry Jan Reedy date: Wed Aug 27 01:43:50 2014 -0400 files: Lib/turtledemo/__main__.py Lib/turtledemo/nim.py description: Issue #22065: Menus, unlike Menubottons, do not have a state option. Since a new demo can now be loaded while one is running, adjust loadfile to do the same cleanup as stopIt. diff -r 7fbb912c0789 -r b671092e08fa Lib/turtledemo/__main__.py --- a/Lib/turtledemo/__main__.py Tue Aug 26 21:31:47 2014 +0200 +++ b/Lib/turtledemo/__main__.py Wed Aug 27 01:43:50 2014 -0400 @@ -260,12 +260,13 @@ return menu def refreshCanvas(self): - if not self.dirty: return - self.screen.clear() - self.dirty=False + if self.dirty: + self.screen.clear() + self.dirty=False def loadfile(self, filename): - self.refreshCanvas() + self.clearCanvas() + turtle.TurtleScreen._RUNNING = False modname = 'turtledemo.' + filename __import__(modname) self.module = sys.modules[modname] @@ -318,9 +319,7 @@ self.exitflag = False self.configGUI(NORMAL, NORMAL, DISABLED, DISABLED, "STOPPED!", "red") - turtle.TurtleScreen._RUNNING = False - else: - turtle.TurtleScreen._RUNNING = False + turtle.TurtleScreen._RUNNING = False def _destroy(self): self.root.destroy() diff -r 7fbb912c0789 -r b671092e08fa Lib/turtledemo/nim.py --- a/Lib/turtledemo/nim.py Tue Aug 26 21:31:47 2014 +0200 +++ b/Lib/turtledemo/nim.py Wed Aug 27 01:43:50 2014 -0400 @@ -219,7 +219,7 @@ mainscreen.mode("standard") mainscreen.setup(SCREENWIDTH, SCREENHEIGHT) nim = Nim(mainscreen) - return "EVENTLOOP!" + return "EVENTLOOP" if __name__ == "__main__": main()