SC

Steve Chaplin · Steve Chaplin · commit 0d16c5c71a60 · 2005-07-04T10:36:58.000Z
svn path=/trunk/matplotlib/; revision=1531
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 New entries should be added at the top
 
-2005-09-30 setupext.py: added numarray_inc_dirs for building against
+2005-07-04 backend_gtk.py: require PyGTK version 2.0.0 or higher - SC
+
+2005-06-30 setupext.py: added numarray_inc_dirs for building against
            numarray when not installed in standard location - ADS
 
 2005-06-27 backend_svg.py: write figure width, height as int, not float.
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -18,18 +18,21 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib.font_manager import fontManager
 from matplotlib.mathtext import math_parse_s_ft2font
 
-pygtk_version_required = (1,99,16)
+pygtk_version_required = (2,0,0)
 try:
     import pygtk
     if not matplotlib.FROZEN:
         pygtk.require('2.0')
 except:
     print >> sys.stderr, sys.exc_info()[1]
-    raise SystemExit('PyGTK version %d.%d.%d or greater is required to run the GTK Matplotlib backends'
+    raise SystemExit('PyGTK version %d.%d.%d or greater is required to run '
+                     'the GTK Matplotlib backends'
                      % pygtk_version_required)
 
-import gtk, pango
-from gtk import gdk
+import gobject
+import gtk; gdk = gtk.gdk
+import pango
+
 if gtk.pygtk_version < pygtk_version_required:
     raise SystemExit ("PyGTK %d.%d.%d is installed\n"
                       "PyGTK %d.%d.%d or later is required"
@@ -149,7 +152,7 @@ def draw_line(self, gc, x1, y1, x2, y2):
                                    int(x2), self.height-int(y2))
 
 
-    def draw_lines(self, gc, x, y):
+    def draw_lines(self, gc, x, y, transform=None):
         x = x.astype(nx.Int16)
         y = self.height - y.astype(nx.Int16)  
         self.gdkDrawable.draw_lines(gc.gdkGC, zip(x,y))
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -20,7 +20,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 
 from backend_gdk import RendererGDK
 
-pygtk_version_required = (1,99,16)
+pygtk_version_required = (2,0,0)
 try:
     import pygtk
     if not matplotlib.FROZEN:
@@ -31,8 +31,9 @@ def fn_name(): return sys._getframe(1).f_code.co_name
                      'the GTK Matplotlib backends'
                      % pygtk_version_required)
 
-import gtk, gobject, pango
-from gtk import gdk
+import gobject
+import gtk; gdk = gtk.gdk
+import pango
 
 if gtk.pygtk_version < pygtk_version_required:
     raise SystemExit ("PyGTK %d.%d.%d is installed\n"
@@ -285,14 +286,14 @@ def expose_event(self, widget, event):
             return False
 
         if self._draw_pixmap:
-            width, height = self.allocation.width, self.allocation.height
-            self._render_figure(width, height)
+            x, y, w, h = self.allocation
+            self._render_figure(w, h)
             self.window.set_back_pixmap (self._pixmap, False)
             self.window.clear()  # draw pixmap as the gdk.Window's bg
             self._draw_pixmap = False
         else: # workaround pygtk 2.6 problem - bg not being redrawn
-            self.window.clear_area (event.area.x, event.area.y,
-                                    event.area.width, event.area.height)
+            x, y, w, h = event.area
+            self.window.clear_area (x, y, w, h)
             
         return False # allow signal to propagate further
 
