SC 2005/03/12

Steve Chaplin · Steve Chaplin · commit 8e72ee563b76 · 2005-03-12T08:37:55.000Z
svn path=/trunk/matplotlib/; revision=1072
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -116,9 +116,9 @@ def draw_image(self, x, y, im, origin, bbox):
                             has_alpha=True, bits_per_sample=8,
                             width=cols, height=rows)
         try:
-            pa = pb.get_pixels_array()
+            pa = pb.get_pixels_array() # new in 2.2
         except AttributeError:
-            pa = pb.pixel_array   # deprecated
+            pa = pb.pixel_array        # deprecated in 2.2
         except RuntimeError, exc: #  pygtk was not compiled with Numeric Python support
             warnings.warn('draw_image not supported: %s' % exc)
             return        
@@ -130,13 +130,13 @@ def draw_image(self, x, y, im, origin, bbox):
         if flipud:
             y = self.height-y-rows
 
-        try: # requires GTK+ 2.2
+        try: # new in 2.2
             # can use None instead of gc.gdkGC, if don't need clipping
             self.gdkDrawable.draw_pixbuf (gc.gdkGC, pb, 0, 0,
                                           int(x), int(y), cols, rows,
                                           gdk.RGB_DITHER_NONE, 0, 0)
         except AttributeError:
-            # is deprecated
+            # deprecated in 2.2
             pb.render_to_drawable(self.gdkDrawable, gc.gdkGC, 0, 0,
                                   int(x), int(y), cols, rows,
                                   gdk.RGB_DITHER_NONE, 0, 0)
@@ -233,9 +233,9 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
                             bits_per_sample=8, width=imw, height=imh)
 
         try:
-            pa = pb.get_pixels_array()
+            pa = pb.get_pixels_array() # new in 2.2
         except AttributeError:
-            pa = pb.pixel_array
+            pa = pb.pixel_array        # deprecated in 2.2
         except RuntimeError, exc: #  'pygtk was not compiled with Numeric Python support'
             warnings.warn('mathtext not supported: %s' % exc)
             return        
@@ -246,12 +246,13 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
         pa[:,:,2]=int(rgb[2]*255)
         pa[:,:,3]=Xs
 
-        try: # requires GTK+ 2.2
+        try: # new in 2.2
             # can use None instead of gc.gdkGC, if don't need clipping
             self.gdkDrawable.draw_pixbuf (gc.gdkGC, pb, 0, 0,
                                           int(x), int(y), imw, imh,
                                           gdk.RGB_DITHER_NONE, 0, 0)
         except AttributeError:
+            # deprecated in 2.2
             pb.render_to_drawable(self.gdkDrawable, gc.gdkGC, 0, 0,
                                   int(x), int(y), imw, imh,
                                   gdk.RGB_DITHER_NONE, 0, 0)
