@@ -3,7 +3,7 @@
 Rotating a 3D plot
 ==================
 
-A very simple animation of a rotating 3D plot.
+A very simple animation of a rotating 3D plot about all 3 axes.
 
 See wire3d_animation_demo for another simple example of animating a 3D plot.
 
@@ -17,12 +17,34 @@
 fig = plt.figure()
 ax = fig.add_subplot(projection='3d')
 
-# load some test data for demonstration and plot a wireframe
-X, Y, Z = axes3d.get_test_data(0.1)
-ax.plot_wireframe(X, Y, Z, rstride=5, cstride=5)
+# Grab some example data and plot a basic wireframe.
+X, Y, Z = axes3d.get_test_data(0.05)
+ax.plot_wireframe(X, Y, Z, rstride=10, cstride=10)
+
+# Set the axis labels
+ax.set_xlabel('x')
+ax.set_ylabel('y')
+ax.set_zlabel('z')
+
+# Rotate the axes and update
+for angle in range(0, 360*4 + 1):
+    # Normalize the angle to the range [-180, 180] for display
+    angle_norm = (angle + 180) % 360 - 180
+
+    # Cycle through a full rotation of elevation, then azimuth, roll, and all
+    elev = azim = roll = 0
+    if angle <= 360:
+        elev = angle_norm
+    elif angle <= 360*2:
+        azim = angle_norm
+    elif angle <= 360*3:
+        roll = angle_norm
+    else:
+        elev = azim = roll = angle_norm
+
+    # Update the axis view and title
+    ax.view_init(elev, azim, roll)
+    plt.title('Elevation: %d°, Azimuth: %d°, Roll: %d°' % (elev, azim, roll))
 
-# rotate the axes and update
-for angle in range(0, 360):
-    ax.view_init(30, angle, 0)
     plt.draw()
     plt.pause(.001)
@@ -1,7 +1,7 @@
 """
-==========================
-Rotating 3D wireframe plot
-==========================
+=============================
+Animating a 3D wireframe plot
+=============================
 
 A very simple 'animation' of a 3D plot.  See also rotate_axes3d_demo.
 
 
@@ -109,17 +109,14 @@ def zoom_effect02(ax1, ax2, **kwargs):
     return c1, c2, bbox_patch1, bbox_patch2, p
 
 
-plt.figure(figsize=(5, 5))
-ax1 = plt.subplot(221)
-ax2 = plt.subplot(212)
-ax2.set_xlim(0, 1)
-ax2.set_xlim(0, 5)
-zoom_effect01(ax1, ax2, 0.2, 0.8)
-
-
-ax1 = plt.subplot(222)
-ax1.set_xlim(2, 3)
-ax2.set_xlim(0, 5)
-zoom_effect02(ax1, ax2)
+axs = plt.figure().subplot_mosaic([
+    ["zoom1", "zoom2"],
+    ["main", "main"],
+])
+
+axs["main"].set(xlim=(0, 5))
+zoom_effect01(axs["zoom1"], axs["main"], 0.2, 0.8)
+axs["zoom2"].set(xlim=(2, 3))
+zoom_effect02(axs["zoom2"], axs["main"])
 
 plt.show()
@@ -838,17 +838,10 @@ class FigureCanvasPS(FigureCanvasBase):
     def get_default_filetype(self):
         return 'ps'
 
-    @_api.delete_parameter("3.5", "args")
-    def print_ps(self, outfile, *args, **kwargs):
-        return self._print_ps(outfile, 'ps', **kwargs)
-
-    @_api.delete_parameter("3.5", "args")
-    def print_eps(self, outfile, *args, **kwargs):
-        return self._print_ps(outfile, 'eps', **kwargs)
-
     @_api.delete_parameter("3.4", "dpi")
+    @_api.delete_parameter("3.5", "args")
     def _print_ps(
-            self, outfile, format, *,
+            self, fmt, outfile, *args,
             dpi=None, metadata=None, papertype=None, orientation='portrait',
             **kwargs):
 
@@ -885,12 +878,12 @@ def _print_ps(
         printer = (self._print_figure_tex
                    if mpl.rcParams['text.usetex'] else
                    self._print_figure)
-        printer(outfile, format, dpi=dpi, dsc_comments=dsc_comments,
+        printer(fmt, outfile, dpi=dpi, dsc_comments=dsc_comments,
                 orientation=orientation, papertype=papertype, **kwargs)
 
     @_check_savefig_extra_args
     def _print_figure(
-            self, outfile, format, *,
+            self, fmt, outfile, *,
             dpi, dsc_comments, orientation, papertype,
             bbox_inches_restore=None):
         """
@@ -900,7 +893,7 @@ def _print_figure(
         all string containing Document Structuring Convention comments,
         generated from the *metadata* parameter to `.print_figure`.
         """
-        is_eps = format == 'eps'
+        is_eps = fmt == 'eps'
         if not (isinstance(outfile, (str, os.PathLike))
                 or is_writable_file_like(outfile)):
             raise ValueError("outfile must be a path or a file-like object")
@@ -1028,7 +1021,7 @@ def print_figure_impl(fh):
 
     @_check_savefig_extra_args
     def _print_figure_tex(
-            self, outfile, format, *,
+            self, fmt, outfile, *,
             dpi, dsc_comments, orientation, papertype,
             bbox_inches_restore=None):
         """
@@ -1038,7 +1031,7 @@ def _print_figure_tex(
 
         The rest of the behavior is as for `._print_figure`.
         """
-        is_eps = format == 'eps'
+        is_eps = fmt == 'eps'
 
         width, height = self.figure.get_size_inches()
         xo = 0
@@ -1121,6 +1114,9 @@ def _print_figure_tex(
 
             _move_path_to_path_or_stream(tmpfile, outfile)
 
+    print_ps = functools.partialmethod(_print_ps, "ps")
+    print_eps = functools.partialmethod(_print_ps, "eps")
+
     def draw(self):
         self.figure.draw_without_rendering()
         return super().draw()
 
@@ -332,8 +332,7 @@ def __init__(self, bitmap, renderer):
 
         dc, gfx_ctx = self._cache.get(bitmap, (None, None))
         if dc is None:
-            dc = wx.MemoryDC()
-            dc.SelectObject(bitmap)
+            dc = wx.MemoryDC(bitmap)
             gfx_ctx = wx.GraphicsContext.Create(dc)
             gfx_ctx._lastcliprect = None
             self._cache[bitmap] = dc, gfx_ctx
 
@@ -27,63 +27,30 @@ def draw(self, drawDC=None):
         Render the figure using agg.
         """
         FigureCanvasAgg.draw(self)
-
-        self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
+        self.bitmap = _rgba_to_wx_bitmap(self.get_renderer().buffer_rgba())
         self._isDrawn = True
         self.gui_repaint(drawDC=drawDC)
 
     def blit(self, bbox=None):
         # docstring inherited
+        bitmap = _rgba_to_wx_bitmap(self.get_renderer().buffer_rgba())
         if bbox is None:
-            self.bitmap = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
-            self.gui_repaint()
-            return
-
-        srcBmp = _convert_agg_to_wx_bitmap(self.get_renderer(), None)
-        srcDC = wx.MemoryDC()
-        srcDC.SelectObject(srcBmp)
-
-        destDC = wx.MemoryDC()
-        destDC.SelectObject(self.bitmap)
-
-        x = int(bbox.x0)
-        y = int(self.bitmap.GetHeight() - bbox.y1)
-        destDC.Blit(x, y, int(bbox.width), int(bbox.height), srcDC, x, y)
-
-        destDC.SelectObject(wx.NullBitmap)
-        srcDC.SelectObject(wx.NullBitmap)
+            self.bitmap = bitmap
+        else:
+            srcDC = wx.MemoryDC(bitmap)
+            destDC = wx.MemoryDC(self.bitmap)
+            x = int(bbox.x0)
+            y = int(self.bitmap.GetHeight() - bbox.y1)
+            destDC.Blit(x, y, int(bbox.width), int(bbox.height), srcDC, x, y)
+            destDC.SelectObject(wx.NullBitmap)
+            srcDC.SelectObject(wx.NullBitmap)
         self.gui_repaint()
 
 
-def _convert_agg_to_wx_bitmap(agg, bbox):
-    """
-    Convert the region of the agg buffer bounded by bbox to a wx.Bitmap.  If
-    bbox is None, the entire buffer is converted.
-    Note: agg must be a backend_agg.RendererAgg instance.
-    """
-    if bbox is None:
-        # agg => rgba buffer -> bitmap
-        return wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
-                                        agg.buffer_rgba())
-    else:
-        # agg => rgba buffer -> bitmap => clipped bitmap
-        srcBmp = wx.Bitmap.FromBufferRGBA(int(agg.width), int(agg.height),
-                                          agg.buffer_rgba())
-        srcDC = wx.MemoryDC()
-        srcDC.SelectObject(srcBmp)
-
-        destBmp = wx.Bitmap(int(bbox.width), int(bbox.height))
-        destDC = wx.MemoryDC()
-        destDC.SelectObject(destBmp)
-
-        x = int(bbox.x0)
-        y = int(int(agg.height) - bbox.y1)
-        destDC.Blit(0, 0, int(bbox.width), int(bbox.height), srcDC, x, y)
-
-        srcDC.SelectObject(wx.NullBitmap)
-        destDC.SelectObject(wx.NullBitmap)
-
-        return destBmp
+def _rgba_to_wx_bitmap(rgba):
+    """Convert an RGBA buffer to a wx.Bitmap."""
+    h, w, _ = rgba.shape
+    return wx.Bitmap.FromBufferRGBA(w, h, rgba)
 
 
 @_BackendWx.export
 
@@ -168,24 +168,8 @@ class BboxConnector(Patch):
     @staticmethod
     def get_bbox_edge_pos(bbox, loc):
         """
-        Helper function to obtain the location of a corner of a bbox
-
-        Parameters
-        ----------
-        bbox : `matplotlib.transforms.Bbox`
-
-        loc : {1, 2, 3, 4}
-            Corner of *bbox*. Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        Returns
-        -------
-        x, y : float
-            Coordinates of the corner specified by *loc*.
+        Return the ``(x, y)`` coordinates of corner *loc* of *bbox*; parameters
+        behave as documented for the `.BboxConnector` constructor.
         """
         x0, y0, x1, y1 = bbox.extents
         if loc == 1:
@@ -200,35 +184,9 @@ def get_bbox_edge_pos(bbox, loc):
     @staticmethod
     def connect_bbox(bbox1, bbox2, loc1, loc2=None):
         """
-        Helper function to obtain a Path from one bbox to another.
-
-        Parameters
-        ----------
-        bbox1, bbox2 : `matplotlib.transforms.Bbox`
-            Bounding boxes to connect.
-
-        loc1 : {1, 2, 3, 4}
-            Corner of *bbox1* to use. Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        loc2 : {1, 2, 3, 4}, optional
-            Corner of *bbox2* to use. If None, defaults to *loc1*.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        Returns
-        -------
-        path : `matplotlib.path.Path`
-            A line segment from the *loc1* corner of *bbox1* to the *loc2*
-            corner of *bbox2*.
+        Construct a `.Path` connecting corner *loc1* of *bbox1* to corner
+        *loc2* of *bbox2*, where parameters behave as documented as for the
+        `.BboxConnector` constructor.
         """
         if isinstance(bbox1, Rectangle):
             bbox1 = TransformedBbox(Bbox.unit(), bbox1.get_transform())
@@ -250,22 +208,15 @@ def __init__(self, bbox1, bbox2, loc1, loc2=None, **kwargs):
         bbox1, bbox2 : `matplotlib.transforms.Bbox`
             Bounding boxes to connect.
 
-        loc1 : {1, 2, 3, 4}
-            Corner of *bbox1* to draw the line. Valid values are::
+        loc1, loc2 : {1, 2, 3, 4}
+            Corner of *bbox1* and *bbox2* to draw the line. Valid values are::
 
                 'upper right'  : 1,
                 'upper left'   : 2,
                 'lower left'   : 3,
                 'lower right'  : 4
 
-        loc2 : {1, 2, 3, 4}, optional
-            Corner of *bbox2* to draw the line. If None, defaults to *loc1*.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
+            *loc2* is optional and defaults to *loc1*.
 
         **kwargs
             Patch properties for the line drawn. Valid arguments include:
@@ -308,18 +259,10 @@ def __init__(self, bbox1, bbox2, loc1a, loc2a, loc1b, loc2b, **kwargs):
         bbox1, bbox2 : `matplotlib.transforms.Bbox`
             Bounding boxes to connect.
 
-        loc1a, loc2a : {1, 2, 3, 4}
-            Corners of *bbox1* and *bbox2* to draw the first line.
-            Valid values are::
-
-                'upper right'  : 1,
-                'upper left'   : 2,
-                'lower left'   : 3,
-                'lower right'  : 4
-
-        loc1b, loc2b : {1, 2, 3, 4}
-            Corners of *bbox1* and *bbox2* to draw the second line.
-            Valid values are::
+        loc1a, loc2a, loc1b, loc2b : {1, 2, 3, 4}
+            The first line connects corners *loc1a* of *bbox1* and *loc2a* of
+            *bbox2*; the second line connects corners *loc1b* of *bbox1* and
+            *loc2b* of *bbox2*.  Valid values are::
 
                 'upper right'  : 1,
                 'upper left'   : 2,