From 10a365a9f3842c8d60438d18fd100c194e0a75dd Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Fri, 21 Jun 2013 00:09:05 +0000
Subject: Merge branch 'tawindow-parent-activity'

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 79c0522..cbf5c24 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')
diff --git a/turtleblocks.py b/turtleblocks.py
index baf264d..5d5808f 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -217,7 +217,7 @@ return %s(self)" % (p, P, P)
             max(768, gtk.gdk.screen_height() * 2))
         self.tw = TurtleArtWindow(self.canvas, self._execdirname,
                                   turtle_canvas=self.turtle_canvas,
-                                  parent=self, running_sugar=False)
+                                  activity=self, running_sugar=False)
         self.tw.save_folder = self._abspath  # os.path.expanduser('~')
         if self.client.get_int(self._HOVER_HELP) == 1:
             self.hover.set_active(False)
--
cgit v0.9.1