Changeset 14440 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include/QIMessageBox.h

Timestamp:

Nov 21, 2008 12:37:09 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: QIMessageBox: Don't accept dialog closure when no Escape button is set (bad practice but necessary for spotting itself).

File:

• trunk/src/VBox/Frontends/VirtualBox4/include/QIMessageBox.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QIMessageBox.h

@@ -35 +35 @@
 class QPushButton;
 class QSpacerItem;
+class QCloseEvent;
 
 class QIDialogButtonBox;
@@ -90 +91 @@
     QPushButton *createButton (int aButton);
 
+    void closeEvent (QCloseEvent *e);
+
 private slots:
 
-    void done0() { done (mButton0 & ButtonMask); }
-    void done1() { done (mButton1 & ButtonMask); }
-    void done2() { done (mButton2 & ButtonMask); }
+    void done0() { mWasDone = true; done (mButton0 & ButtonMask); }
+    void done1() { mWasDone = true; done (mButton1 & ButtonMask); }
+    void done2() { mWasDone = true; done (mButton2 & ButtonMask); }
 
-    void reject() {
-        QDialog::reject();
-        if (mButtonEsc)
-            setResult (mButtonEsc & ButtonMask);
-    }
+    void reject();
 
 private:
@@ -113 +112 @@
     QSpacerItem *mSpacer;
     QIDialogButtonBox *mButtonBox;
+    bool mWasDone : 1;
 };