Changeset 4170

Timestamp:

06/20/08 09:42:56 (4 months ago)

Author:

ed

Message:

Fixed the behavior of CancelOnEscape?. Now if this is set to False at any time, the Escape key will be ignored.

Files:

• trunk/dabo/ui/uiwx/dDialog.py (modified) (4 diffs)

trunk/dabo/ui/uiwx/dDialog.py

@@ -208 +208 @@
-        self._no = self._extractKey((properties, kwargs), "No")
-        self._help = self._extractKey((properties, kwargs), "Help")
+        # Check for both OK and Yes. This simply does not work, at least with wxPython.
+        if self._ok and self._yes:
+            raise ValueError, _("Dialogs cannot have both 'OK' and 'Yes' buttons.")
-        self._cancelOnEscape = True
-        super(dStandardButtonDialog, self).__init__(parent=parent, properties=properties, *args, **kwargs)
@@ -256 +259 @@
-        for btn in btns:
-            id_ = btn.GetId()
-
-
+
+
+
+
+
+
+
+
-                mthd = self._onOK
-            elif id_ == wx.ID_CANCEL:
-btn
+newbtn = dabo.ui.dButton(btn.Parent)
-                mthd = self._onCancel
-            elif id_ == wx.ID_YES:
-                self.btnYes = btn
-                mthd = self._onYes
-            elif id_ == wx.ID_NO:
-                self.btnNo = btn
-                mthd = self._onNo
-            elif id_ == wx.ID_HELP:
-                self.btnHelp = btn
+                newbtn = None
-                mthd = self._onHelp
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-        # Wx rearranges the order of the buttons per platform conventions, but
@@ -282 +299 @@
-        for pos, btn in enumerate(buttons[1:]):
-            btn.MoveAfterInTabOrder(buttons[pos-1])
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        # Let the user add their controls
@@ -309 +315 @@
-            sz.append(bs, "x")
-        self.layout()
+
+
+    def _onEscapePressed(self, evt):
+        if self.CancelOnEscape:
+            if self.CancelButton:
+                self._onCancel(evt)
+            elif self.NoButton:
+                self._onNo(evt)
+            elif self.OKButton:
+                self._onOK(evt)
+            elif self.YesButton:
+                self._onYes(evt)
+
-
-    ################################################