[gnue] r8891 - trunk/gnue-forms/src/uidrivers/gtk2/widgets/form

[reinhard]

Author: reinhard
Date: 2006-10-21 08:40:45 -0500 (Sat, 21 Oct 2006)
New Revision: 8891

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
Log:
Fixed gtk2 window-close handling for the case where the window may not be
closed.


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-21 
12:59:07 UTC (rev 8890)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-21 
13:40:45 UTC (rev 8891)
@@ -24,6 +24,7 @@
 import gtk
 import string
 import wrappers
+import sys
 import types
 
 from gnue.common import events
@@ -248,11 +249,19 @@
 
   # ---------------------------------------------------------------------------
 
-  def __on_delete_event(self, widget, event):
+  def __on_delete_event(self, window, event):
 
         # catch the form close event
-        self._uiDriver.dispatchEvent('requestEXIT', _form = self._form)
-        return True
+        try:
+            # this raises an exception if the user may not yet close the
+            # window!
+            self._form.close()
+            return True
+        except:
+            # we must return True so the event isn't processed further, so we
+            # display the exception manually here
+            sys.excepthook(*sys.exc_info())
+            return True
 
 
   # ---------------------------------------------------------------------------