Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19484
Modified Files:
frame.py
Log Message:
Don't start tearing down if close is cancelled
Index: frame.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/editor/frame.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** frame.py 3 Apr 2000 12:17:19 -0000 1.5
--- frame.py 25 Feb 2008 03:19:12 -0000 1.6
***************
*** 60,66 ****
# XXX - should fix this :-)
return self.GetActiveDocument().GetAllViews()[1]
def OnClose(self):
# Must force the module browser to close itself here (OnDestroy for the view itself is too late!)
self.sub_splitter = None # ensure no circles!
self.GetBrowserView().DestroyBrowser()
! return self._obj_.OnClose()
\ No newline at end of file
--- 60,76 ----
# XXX - should fix this :-)
return self.GetActiveDocument().GetAllViews()[1]
+
def OnClose(self):
+ doc=self.GetActiveDocument()
+ if not doc.SaveModified():
+ ## Cancel button selected from Save dialog, do not actually close
+ ## print 'close cancelled'
+ return 0
+ ## So the 'Save' dialog doesn't come up twice
+ doc._obj_.SetModifiedFlag(False)
+
# Must force the module browser to close itself here (OnDestroy for the view itself is too late!)
self.sub_splitter = None # ensure no circles!
self.GetBrowserView().DestroyBrowser()
! return self._obj_.OnClose()
!
\ No newline at end of file
|
