Merge branch 'v1.0.x-maint'

ddale · ddale · commit 112aeb525f81 · 2011-06-16T11:11:44.000-04:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -167,7 +167,7 @@ def set_clip_path(self, clippath, transform=None):
     set_clip_path.__doc__ = artist.Artist.set_clip_path.__doc__
 
     def get_pad_pixels(self):
-        return self.figure.dpi * self._pad / 72.0
+        return self.figure.dpi * self._base_pad / 72.0
 
     def contains(self, mouseevent):
         """
@@ -185,11 +185,11 @@ def set_pad(self, val):
 
         ACCEPTS: float
         """
-        self._pad = val
+        self._apply_params(pad=val)
 
     def get_pad(self):
         'Get the value of the tick label pad in points'
-        return self._pad
+        return self._base_pad
 
     def _get_text1(self):
         'Get the default Text 1 instance'
