From 4fededf1be849b0026f8d864a1d4fa071597e01e Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Fri, 21 Jun 2013 13:21:56 +0000
Subject: parent is not activity (marion zepf)

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 759f661..731260f 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,11 @@ class TurtleArtWindow():
             self.interactive_mode = False
             self.window = canvas_window
             self.running_sugar = False
-        self.activity = parent
+
+        if activity is not None:
+            self.activity = activity
+        else:
+            self.activity = parent
 
         self.path = path
         self.load_save_folder = os.path.join(path, 'samples')
--
cgit v0.9.1