SC

Steve Chaplin · Steve Chaplin · commit 6c7fcb601bf6 · 2005-06-16T14:48:47.000Z
svn path=/trunk/matplotlib/; revision=1476
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -103,7 +103,7 @@ def set_ctx_from_pixmap (self, pixmap):
         # not used by image backend (backend_cairo),
         # uses _set_ctx_from_surface() instead
         # used by GUI backend (backend_gtk)
-        self.ctx = cairo.gdk_cairo_create (pixmap)
+        self.ctx = cairo.gtk.gdk_cairo_create (pixmap)
         
     set_pixmap = set_ctx_from_pixmap
     
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -86,10 +86,10 @@ def __init__(self, gtkDA, dpi):
         self.dpi   = dpi
         self._cmap = gtkDA.get_colormap()
         
-    def _set_pixmap (self, pixmap):
+    def set_pixmap (self, pixmap):
         self.gdkDrawable = pixmap
 
-    def _set_width_height (self, width, height):
+    def set_width_height (self, width, height):
         """w,h is the figure w,h not the pixmap w,h
         """
         self.width, self.height = width, height
@@ -499,9 +499,9 @@ def _render_figure(self, width, height):
             self._pixmap = gtk.gdk.Pixmap (None, self._pixmap_width,
                                            self._pixmap_height, depth=24)
             # gtk backend must use self.window
-            self._renderer._set_pixmap (self._pixmap)
+            self._renderer.set_pixmap (self._pixmap)
 
-        self._renderer._set_width_height (width, height)
+        self._renderer.set_width_height (width, height)
         self.figure.draw (self._renderer)
 
 
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -224,8 +224,8 @@ def idle_draw(*args):
     def _renderer_init(self):
         """Override by GTK backends to select a different renderer
         Renderer should provide the methods:
-            _set_pixmap ()
-            _set_width_height ()
+            set_pixmap ()
+            set_width_height ()
         that are used by
             _render_figure()        
         """
@@ -257,9 +257,9 @@ def _render_figure(self, width, height):
             if DEBUG: print 'FigureCanvasGTK.%s new pixmap' % fn_name()
             self._pixmap = gtk.gdk.Pixmap (self.window, self._pixmap_width,
                                            self._pixmap_height)
-            self._renderer._set_pixmap (self._pixmap)
+            self._renderer.set_pixmap (self._pixmap)
 
-        self._renderer._set_width_height (width, height)
+        self._renderer.set_width_height (width, height)
         self.figure.draw (self._renderer)
 
 
