Merge pull request #2629 from efiring/qt4agg_remove_unneeded

efiring · efiring · commit f226149b77f0 · 2013-11-30T10:29:53.000-08:00
backend_qt4agg: remove redundant classes. Closes #1151.
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -683,9 +683,6 @@ def configure_subplots(self):
         dia.setWindowIcon(QtGui.QIcon(image))
         dia.exec_()
 
-    def _get_canvas(self, fig):
-        return FigureCanvasQT(fig)
-
     def save_figure(self, *args):
         filetypes = self.canvas.get_supported_filetypes_grouped()
         sorted_filetypes = list(six.iteritems(filetypes))
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py
@@ -51,22 +51,6 @@ def new_figure_manager_given_figure(num, figure):
     return FigureManagerQT(canvas, num)
 
 
-class NavigationToolbar2QTAgg(NavigationToolbar2QT):
-    def _get_canvas(self, fig):
-        return FigureCanvasQTAgg(fig)
-
-
-class FigureManagerQTAgg(FigureManagerQT):
-    def _get_toolbar(self, canvas, parent):
-        # must be inited after the window, drawingArea and figure
-        # attrs are set
-        if matplotlib.rcParams['toolbar'] == 'toolbar2':
-            toolbar = NavigationToolbar2QTAgg(canvas, parent)
-        else:
-            toolbar = None
-        return toolbar
-
-
 class FigureCanvasQTAgg(FigureCanvasQT, FigureCanvasAgg):
     """
     The canvas the figure renders into.  Calls the draw and print fig
@@ -183,5 +167,6 @@ def print_figure(self, *args, **kwargs):
         FigureCanvasAgg.print_figure(self, *args, **kwargs)
         self.draw()
 
+
 FigureCanvas = FigureCanvasQTAgg
-FigureManager = FigureManagerQTAgg
+FigureManager = FigureManagerQT
