diff options
Diffstat (limited to 'TurtleArt/tacanvas.py')
| -rw-r--r-- | TurtleArt/tacanvas.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/TurtleArt/tacanvas.py b/TurtleArt/tacanvas.py index 59fcb1c..a5bbbb8 100644 --- a/TurtleArt/tacanvas.py +++ b/TurtleArt/tacanvas.py @@ -20,9 +20,8 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -import gtk +from util.gtkcompat import Gtk, Gdk, Pango, Rectangle from math import sin, cos, pi -import pango import cairo import base64 from gettext import gettext as _ @@ -123,7 +122,7 @@ class TurtleGraphics: self.height = height if self.tw.interactive_mode: self.canvas = Sprite(tw.sprite_list, 0, 0, - gtk.gdk.Pixmap(self.tw.area, self.width * 2, + Gdk.Pixmap(self.tw.area, self.width * 2, self.height * 2, -1)) else: self.canvas = Sprite(None, 0, 0, self.tw.window) @@ -202,7 +201,7 @@ class TurtleGraphics: def clearscreen(self, share=True): """Clear the canvas and reset most graphics attributes to defaults.""" - rect = gtk.gdk.Rectangle(0, 0, self.width * 2, self.height * 2) + rect = Rectangle(0, 0, self.width * 2, self.height * 2) self.gc.set_foreground(self.bgcolor) self.canvas.images[0].draw_rectangle(self.gc, True, *rect) self.invalt(0, 0, self.width, self.height) @@ -399,7 +398,7 @@ class TurtleGraphics: return self.tw.active_turtle.set_pen_size(ps) self.gc.set_line_attributes(int(self.pensize * self.tw.coord_scale), - gtk.gdk.LINE_SOLID, gtk.gdk.CAP_ROUND, gtk.gdk.JOIN_MITER) + Gdk.LINE_SOLID, Gdk.CAP_ROUND, Gdk.JOIN_MITER) self.svg.set_stroke_width(self.pensize) if self.tw.sharing() and share: event = "w|%s" % (data_to_string([self._get_my_nick(), @@ -472,7 +471,7 @@ class TurtleGraphics: oldc, olds = self.color, self.shade self.setcolor(c, False) self.setshade(s, False) - rect = gtk.gdk.Rectangle(0, 0, self.width * 2, self.height * 2) + rect = Rectangle(0, 0, self.width * 2, self.height * 2) self.gc.set_foreground(self.fgcolor) self.bgrgb = self.fgrgb[:] self.canvas.images[0].draw_rectangle(self.gc, True, *rect) @@ -562,9 +561,9 @@ class TurtleGraphics: """ Draw text """ w *= self.tw.coord_scale self.gc.set_foreground(self.fgcolor) - fd = pango.FontDescription('Sans') + fd = Pango.FontDescription('Sans') try: - fd.set_size(int(size * self.tw.coord_scale) * pango.SCALE) + fd.set_size(int(size * self.tw.coord_scale) * Pango.SCALE) except TypeError, ValueError: debug_output("bad value sent to %s" % (__name__), self.tw.running_sugar) @@ -578,7 +577,7 @@ class TurtleGraphics: else: pl = self.tw.window.create_pango_layout(str(label)) pl.set_font_description(fd) - pl.set_width(int(w) * pango.SCALE) + pl.set_width(int(w) * Pango.SCALE) self.canvas.images[0].draw_layout(self.gc, int(x), int(y), pl) w, h = pl.get_pixel_size() self.invalt(x, y, w, h) @@ -658,7 +657,7 @@ class TurtleGraphics: """ Mark a region for refresh """ if self.tw.interactive_mode: self.tw.area.invalidate_rect( - gtk.gdk.Rectangle(int(x + self.cx), int(y + self.cy), + Rectangle(int(x + self.cx), int(y + self.cy), int(w), int(h)), False) def get_color_index(self, r, g, b, a=0): |