diff options
author | Marion <marion.zepf@gmail.com> | 2013-06-19 06:56:11 (GMT) |
---|---|---|
committer | Marion <marion.zepf@gmail.com> | 2013-06-19 06:56:11 (GMT) |
commit | e6084819fa1f4b2c909f794fbc3e74b6aca08097 (patch) | |
tree | de1ebf0f75e4fbc29b4dd895769710583daceb57 /TurtleArt/tawindow.py | |
parent | 7a9f3285d5e68cea2727c7e606d549890db5c22d (diff) |
resolve duplicate attribute of TurtleArtWindow: 'parent' and 'activity'
Diffstat (limited to 'TurtleArt/tawindow.py')
-rw-r--r-- | TurtleArt/tawindow.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 6152f20..e0c4030 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -99,9 +99,13 @@ _MACROS_SUBPATH = 'macros' class TurtleArtWindow(): ''' TurtleArt Window class abstraction ''' - def __init__(self, canvas_window, path, parent=None, + def __init__(self, canvas_window, path, parent=None, activity=None, mycolors=None, mynick=None, turtle_canvas=None, running_sugar=True): + """parent -- the GTK Window that TA runs in + activity -- the object that instantiated this TurtleArtWindow (in + GNOME, a TurtleMain instance) + """ self.parent = parent self.turtle_canvas = turtle_canvas self._loaded_project = '' @@ -135,7 +139,7 @@ class TurtleArtWindow(): self.interactive_mode = False self.window = canvas_window self.running_sugar = False - self.activity = parent + self.activity = activity self.path = path self.load_save_folder = os.path.join(path, 'samples') |