[gnue] r7592 - in trunk/gnue-designer/src: . base uidrivers/wx

[btami]

Author: btami
Date: 2005-06-12 17:16:09 -0500 (Sun, 12 Jun 2005)
New Revision: 7592

Modified:
   trunk/gnue-designer/src/Designer.py
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/uidrivers/wx/Base.py
Log:
fixing quitting issues

Modified: trunk/gnue-designer/src/Designer.py
===================================================================
--- trunk/gnue-designer/src/Designer.py 2005-06-12 18:08:28 UTC (rev 7591)
+++ trunk/gnue-designer/src/Designer.py 2005-06-12 22:16:09 UTC (rev 7592)
@@ -304,7 +304,7 @@
     param event: The event request
     """
     for instance in self._instances[:]:
-      instance.Close()
+      instance.OnClose(event)
       #
       # If this Close() causes issues you can replace
       # with the following.

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2005-06-12 18:08:28 UTC (rev 
7591)
+++ trunk/gnue-designer/src/base/Instance.py    2005-06-12 22:16:09 UTC (rev 
7592)
@@ -133,7 +133,6 @@
     self._isNew = True
 
     self._app = self.base = app
-    self.uiinstance = app.ui.createInstance(self)
     self.connections = app.connections
     self.nameMappings = {}
     self.usedNames = []

Modified: trunk/gnue-designer/src/uidrivers/wx/Base.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/Base.py        2005-06-12 18:08:28 UTC 
(rev 7591)
+++ trunk/gnue-designer/src/uidrivers/wx/Base.py        2005-06-12 22:16:09 UTC 
(rev 7592)
@@ -179,10 +179,13 @@
                            wildcard = wcstring,
                            style=wxOPEN)
     if dlg.ShowModal() != wxID_OK:
-      return None
+      ret = None
     else:
-      return dlg.GetPath()
+      ret = dlg.GetPath()
 
+    dlg.Destroy()
+    return ret
+
   def dialogSaveFile(self,title, wildcards, parentWindow=None):
     """
     Prompts the user for a file name to save as.