From 7f450a7dfe7a93dc0060ef35beb27632d5b4a872 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 31 Oct 2011 22:35:00 +0000
Subject: removed unnecessary passing of cr to window

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index c8955b2..251a176 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -80,11 +80,10 @@ class TurtleArtWindow():
     _PLUGIN_SUBPATH = 'plugins'
 
     def __init__(self, canvas_window, path, parent=None,
-                 mycolors=None, mynick=None, turtle_canvas=None, cr=None):
+                 mycolors=None, mynick=None, turtle_canvas=None):
         self._loaded_project = ''
         self._sharing = False
         self.parent = parent
-        self.cr = cr
         self.turtle_canvas = turtle_canvas
         self.send_event = None  # method to send events over the network
         self.gst_available = GST_AVAILABLE
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 2b62c35..d28b691 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -730,8 +730,8 @@ class TurtleArtActivity(activity.Activity):
     def _setup_canvas(self, canvas_window):
         ''' Initialize the turtle art canvas. '''
         win = self._canvas.get_window()
-        self.cr = win.cairo_create()
-        surface = self.cr.get_target()
+        cr = win.cairo_create()
+        surface = cr.get_target()
         self.turtle_canvas = surface.create_similar(
             cairo.CONTENT_COLOR, gtk.gdk.screen_width() * 2,
             gtk.gdk.screen_height() * 2)
@@ -739,8 +739,7 @@ class TurtleArtActivity(activity.Activity):
         self.tw = TurtleArtWindow(canvas_window, bundle_path, self,
                                   mycolors=profile.get_color().to_string(),
                                   mynick=profile.get_nick_name(),
-                                  turtle_canvas=self.turtle_canvas,
-                                  cr=self.cr)
+                                  turtle_canvas=self.turtle_canvas)
         self.tw.window.grab_focus()
         path = os.path.join(os.environ['SUGAR_ACTIVITY_ROOT'], 'data')
         self.tw.save_folder = path
diff --git a/turtleart.py b/turtleart.py
index f1a4ec2..ab5e7b7 100755
--- a/turtleart.py
+++ b/turtleart.py
@@ -180,14 +180,13 @@ class TurtleMain():
     def _build_window(self):
         ''' Initialize the TurtleWindow instance. '''
         win = self.canvas.get_window()
-        self.cr = win.cairo_create()
-        surface = self.cr.get_target()
+        cr = win.cairo_create()
+        surface = cr.get_target()
         self.turtle_canvas = surface.create_similar(
             cairo.CONTENT_COLOR, gtk.gdk.screen_width() * 2,
             gtk.gdk.screen_height() * 2)
         self.tw = TurtleArtWindow(self.canvas, self._dirname,
-                                  turtle_canvas=self.turtle_canvas,
-                                  cr=self.cr)
+                                  turtle_canvas=self.turtle_canvas)
         self.tw.save_folder = os.path.expanduser('~')
 
     def _init_vars(self):
--
cgit v0.9.1