Merge branch 'klickverbot-export-close-border' into develop

This commit is contained in:
Luke Campagnola 2015-05-18 23:08:18 -04:00
commit b549b93ade
2 changed files with 4 additions and 2 deletions

View File

@ -7,6 +7,7 @@ pyqtgraph-0.9.11 [unreleased]
- DockArea:
- Fixed adding Docks to DockArea after all Docks have been removed
- Fixed DockArea save/restoreState when area is empty
- Properly remove select box when export dialog is closed using window decorations
New Features:
- Preliminary PyQt5 support

View File

@ -139,5 +139,6 @@ class ExportDialog(QtGui.QWidget):
self.selectBox.setVisible(False)
self.setVisible(False)
def closeEvent(self, event):
self.close()
QtGui.QWidget.closeEvent(self, event)