Changeset 4317

Timestamp:

07/24/08 14:04:54 (1 month ago)

Author:

paul

Message:

Fixed dDialog.CancelOnEscape? on Windows. Will test Mac and Windows next.

Files:

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

trunk/dabo/ui/uiwx/dDialog.py

@@ -51 +51 @@
-        self.Sizer = dabo.ui.dSizer("V")
-        super(dDialog, self)._afterInit()
-        self.bindKey("esc", self._onEscape)
-
-
@@ -99 +98 @@
-        return retVals.get(ret)
-        
-
-    def _onEscape(self, evt):
-        evt.stop()
-        self.hide()
-
-
@@ -235 +230 @@
-
-    def _addControls(self):
+        # Tell wx not to intercept the esc key.
+        self.SetEscapeId(wx.ID_NONE)
+
-        # Set some default Sizer properties (user can easily override):
-        sz = self.Sizer
@@ -281 +279 @@
-            elif id_ == wx.ID_NO:
-                self.btnNo = newbtn = dabo.ui.dButton(btn.Parent)
+                self.setEscapeButton(newbtn)
-                mthd = self._onNo
-            elif id_ == wx.ID_OK:
@@ -288 +287 @@
-                self.btnCancel = newbtn = dabo.ui.dButton(btn.Parent)
-                mthd = self._onCancel
+                self.setEscapeButton(newbtn)
-            elif id_ == wx.ID_HELP:
-                self.btnHelp = btn
@@ -316 +316 @@
-        for pos, btn in enumerate(buttons[1:]):
-            btn.MoveAfterInTabOrder(buttons[pos-1])
-        self.SetEscapeId(wx.ID_NONE)
-        self.bindKey("esc", self._onEscapePressed)
-
-        # Let the user add their controls
@@ -334 +332 @@
-
-
-_onEscapePressed(self, evt
-if self.CancelOnEscape:
-
-       self._onCancel(evt)
-   elif self.NoButton:
-       self._onNo(evt)
-elif self.OKButton:
-       self._onOK(evt)
-elif self.YesButton:
-
+setEscapeButton(self, btn=None
+"""Set which button gets hit when Esc pressed.
+
+CancelOnEscape must be True for this to work.
+"""
+if not self.CancelOnEscape or not btn:
+self.SetEscapeId(wx.ID_NONE)
+else:
+self.SetEscapeId(btn.GetId())
+
-
-
@@ -367 +365 @@
-        if self.runOK() is not False:
-            self.EndModal(kons.DLG_OK)
+
-    def _onCancel(self, evt):
-        self.Accepted = False
@@ -381 +380 @@
-        if self.runCancel() is not False:
-            self.EndModal(kons.DLG_CANCEL)
+        else:
+            evt.stop()
-    def _onYes(self, evt):
-        self.Accepted = True
-        if self.runYes() is not False:
-            self.EndModal(kons.DLG_YES)
+
-    def _onNo(self, evt):
-        self.Accepted = False
-        if self.runNo() is not False:
-            self.EndModal(kons.DLG_NO)
+        else:
+            evt.stop()
+
-    def _onHelp(self, evt):
-        self.runHelp()
@@ -461 +466 @@
-        if self._constructed():
-            self._cancelOnEscape = val
+            self.setEscapeButton(None)
+            if val:
+                for trial in (self.btnCancel, self.btnNo):
+                    if trial is not None:
+                        self.setEscapeButton(trial)
+                        break
-        else:
-            self._properties["CancelOnEscape"] = val