Fixed the Qt backend "underlying C/C++ object deleted" bug.

James Evans · James Evans · commit 9d085c4584c0 · 2006-03-31T19:20:30.000Z
(Bug #1359249)

svn path=/trunk/matplotlib/; revision=2246
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,6 @@
-2006-03-31 Applied Vasily Sulatskov's Qt Navigation Toolbar enhancement. -JRE
+2006-03-31 Fixed the Qt "Underlying C/C++ object deleted" bug. - JRE
+
+2006-03-31 Applied Vasily Sulatskov's Qt Navigation Toolbar enhancement. - JRE
 
 2006-03-31 Ported Norbert's rewriting of Halldor's stineman_interp
            algorithm to make it numerix compatible and added code to
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -152,6 +152,7 @@ def __init__( self, canvas, num ):
         FigureManagerBase.__init__( self, canvas, num )
         self.canvas = canvas
         self.window = qt.QMainWindow( None, None, qt.Qt.WDestructiveClose )
+        self.window.closeEvent = self._widgetCloseEvent
 
         centralWidget = qt.QWidget( self.window )
         self.canvas.reparent( centralWidget, qt.QPoint( 0, 0 ) )
@@ -161,8 +162,6 @@ def __init__( self, canvas, num ):
         self.canvas.setFocus()
         self.window.setCaption( "Figure %d" % num )
 
-        qt.QObject.connect( self.window, qt.SIGNAL( 'destroyed()' ),
-                            self._widgetclosed )
         self.window._destroying = False
 
         if matplotlib.rcParams['toolbar'] == 'classic':
@@ -209,6 +208,10 @@ def _widgetclosed( self ):
         self.window._destroying = True
         Gcf.destroy(self.num)
 
+    def _widgetCloseEvent( self, event ):
+        self._widgetclosed()
+        qt.QWidget.closeEvent( self.window, event )
+
     def destroy( self, *args ):
         if self.window._destroying: return
         self.window._destroying = True
@@ -232,6 +235,7 @@ class NavigationToolbar2QT( NavigationToolbar2, qt.QWidget ):
     def __init__( self, parent, canvas ):
         self.canvas = canvas
         self.buttons = {}
+
         qt.QWidget.__init__( self, parent )
 
         # Layout toolbar buttons horizontally.
