From 0150810a02f562d12c2f1d2897fe83f764157a12 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 03 Nov 2011 17:26:33 +0000
Subject: remove vestigaes of canvas as sprite

---
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py
index 96f77dd..1cf0ce6 100644
--- a/TurtleArt/tacanvas.py
+++ b/TurtleArt/tacanvas.py
@@ -32,7 +32,7 @@ from sprites import Sprite
 from tasprite_factory import SVG
 from tautils import image_to_base64, get_path, data_to_string, round_int, \
     debug_output
-from taconstants import CANVAS_LAYER, BLACK, WHITE
+from taconstants import BLACK, WHITE
 
 
 def wrap100(n):
@@ -755,4 +755,4 @@ class TurtleGraphics:
 
     def inval(self):
         ''' Invalidate a region for gtk '''
-        self.tw.window.queue_draw_area(0, 0, self.width, self.height)
+        self.tw.inval_all()
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 2bb9049..5a1b06a 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -25,8 +25,6 @@ from gettext import gettext as _
 # Sprite layers
 #
 
-HIDE_LAYER = 100
-CANVAS_LAYER = 500
 OVERLAY_LAYER = 525
 TURTLE_LAYER = 550
 BLOCK_LAYER = 600
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 93886be..2d1ac5f 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -40,8 +40,8 @@ except (ImportError, AttributeError):
         OLD_SUGAR_SYSTEM = True
 from StringIO import StringIO
 
-from taconstants import HIDE_LAYER, COLLAPSIBLE, BLOCK_LAYER, HIT_HIDE, \
-    HIT_SHOW, XO1, XO15, XO175, UNKNOWN
+from taconstants import COLLAPSIBLE, HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, \
+    UNKNOWN
 
 import logging
 _logger = logging.getLogger('turtleart-activity')
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index a8eebe7..395837e 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -571,9 +571,10 @@ class TurtleArtWindow():
             self.hide = False
             if self.running_sugar:
                 self.activity.recenter()
-        self._inval_all()
+        self.inval_all()
 
-    def _inval_all(self):
+    def inval_all(self):
+        """ Force a refresh """
         self.window.queue_draw_area(0, 0, self.width, self.height)
 
     def hideshow_palette(self, state):
@@ -1074,10 +1075,7 @@ class TurtleArtWindow():
 
         # Finally, check for anything else
         if hasattr(spr, 'type'):
-            if spr.type == "canvas":
-                pass
-                # spr.set_layer(CANVAS_LAYER)
-            elif spr.type == 'selector':
+            if spr.type == 'selector':
                 self._select_category(spr)
             elif spr.type == 'category':
                 if hide_button_hit(spr, x, y):
--
cgit v0.9.1