Fix show_error inheritance issue

This commit is contained in:
Neil Booth 2016-01-03 11:18:20 +09:00
parent e6afaf173c
commit 40ae744c1e
2 changed files with 3 additions and 3 deletions

View File

@ -54,8 +54,8 @@ class CosignWidget(QWidget):
qp.end()
# WizardBase must come first as we override show_error
class InstallWizard(WizardBase, WindowModalDialog):
# WindowModalDialog must come first as it overrides show_error
class InstallWizard(WindowModalDialog, WizardBase):
def __init__(self, config, app, plugins):
title = 'Electrum - ' + _('Install Wizard')

View File

@ -155,7 +155,7 @@ class CancelButton(QPushButton):
QPushButton.__init__(self, label or _("Cancel"))
self.clicked.connect(dialog.reject)
class MessageBoxMixin:
class MessageBoxMixin(object):
def question(self, msg, parent=None, title=None, icon=None):
Yes, No = QMessageBox.Yes, QMessageBox.No
return self.msg_box(icon or QMessageBox.Question,