[gnue] r8893 - in trunk/gnue-forms/src/uidrivers: win32/widgets wx/widgets/form wx26/widgets

[reinhard]

Author: reinhard
Date: 2006-10-21 08:49:14 -0500 (Sat, 21 Oct 2006)
New Revision: 8893

Modified:
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Replaced requestEXIT event with GFForm.close()


Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-10-21 
13:41:44 UTC (rev 8892)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-10-21 
13:49:14 UTC (rev 8893)
@@ -444,7 +444,7 @@
     win32gui.SendMessage(self._statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0, 
msg)
 
   def OnWMClose(self, hwnd, msg, wParam, lParam):
-    self._uiDriver.dispatchEvent('requestEXIT', _form=self._uiDriver._form)
+    self._uiDriver._form.close()
 
   def OnWMSize(self, hwnd, msg, wParam, lParam):
     for child in self._children:

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-10-21 
13:41:44 UTC (rev 8892)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-10-21 
13:49:14 UTC (rev 8893)
@@ -174,14 +174,10 @@
     Intercept application closure request and so allow the form to control
     (approve/disallow) closure.
     """
-    form = self._form
-
     if event.CanVeto():
-      self._uiDriver.dispatchEvent('requestEXIT', _form=self._form)
+      self._form.close()
     else:
-      object = _eventObjTowxWindow(event)
-      object.Destroy()
-      # wxExit() TODO: Try and work this into navigator or here if it still 
hangs
+      _eventObjTowxWindow(event).Destroy()
 
 
   # --------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-10-21 13:41:44 UTC 
(rev 8892)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-10-21 13:49:14 UTC 
(rev 8893)
@@ -277,7 +277,7 @@
 
     def __on_close(self, event):
         if event.CanVeto():
-            self._request('EXIT')
+            self._form.close()
             event.Veto()
         else:
             self.sizing_enabled = False