From 797649f5d5ab5e503ae88eab30a918527cee6d4e Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 22 Feb 2004 05:37:36 +0000 Subject: [PATCH] Updates svn: r2892 --- gramps2/src/AddrEdit.py | 2 ++ gramps2/src/AttrEdit.py | 2 ++ gramps2/src/EditSource.py | 2 ++ gramps2/src/EventEdit.py | 2 ++ gramps2/src/ImageSelect.py | 3 ++- gramps2/src/NameEdit.py | 2 ++ gramps2/src/NoteEdit.py | 2 ++ gramps2/src/Sources.py | 4 ++++ gramps2/src/UrlEdit.py | 2 ++ gramps2/src/Witness.py | 2 ++ 10 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gramps2/src/AddrEdit.py b/gramps2/src/AddrEdit.py index 47c0739d1..24cc8e9aa 100644 --- a/gramps2/src/AddrEdit.py +++ b/gramps2/src/AddrEdit.py @@ -143,10 +143,12 @@ class AddressEditor: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): diff --git a/gramps2/src/AttrEdit.py b/gramps2/src/AttrEdit.py index 1ebfc8e55..6006a9c4d 100644 --- a/gramps2/src/AttrEdit.py +++ b/gramps2/src/AttrEdit.py @@ -140,10 +140,12 @@ class AttributeEditor: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index bc54bdb31..7c5064224 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -129,6 +129,7 @@ class EditSource: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def on_help_clicked(self,obj): """Display the relevant portion of GRAMPS manual""" @@ -138,6 +139,7 @@ class EditSource: self.gallery.close(self.gallery_ok) self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.top.destroy() def close_child_windows(self): diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index f61859de7..3a24c99a8 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -208,10 +208,12 @@ class EventEditor: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 9e7fe72d8..892636265 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -747,12 +747,13 @@ class LocalMediaProperties: def on_delete_event(self,obj,b): self.close_child_windows() - self.parent.parent.child_windows.remove(self) self.remove_itself_from_menu() + self.parent.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): diff --git a/gramps2/src/NameEdit.py b/gramps2/src/NameEdit.py index 6de54d7b5..3bcaa26fe 100644 --- a/gramps2/src/NameEdit.py +++ b/gramps2/src/NameEdit.py @@ -132,10 +132,12 @@ class NameEditor: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): diff --git a/gramps2/src/NoteEdit.py b/gramps2/src/NoteEdit.py index 3d264c74b..500f0b5a1 100644 --- a/gramps2/src/NoteEdit.py +++ b/gramps2/src/NoteEdit.py @@ -90,9 +90,11 @@ class NoteEditor: def on_delete_event(self,obj,b): self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.top.destroy() def add_itself_to_menu(self): diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py index 7546a75e1..805ecd399 100644 --- a/gramps2/src/Sources.py +++ b/gramps2/src/Sources.py @@ -105,10 +105,12 @@ class SourceSelector: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def close_child_windows(self): @@ -332,10 +334,12 @@ class SourceEditor: def on_delete_event(self,obj,b): self.close_child_windows() self.remove_itself_from_menu() + self.win_parent.child_windows.remove(self) def close(self,obj): self.close_child_windows() self.remove_itself_from_menu() + self.win_parent.child_windows.remove(self) self.sourceDisplay.destroy() def close_child_windows(self): diff --git a/gramps2/src/UrlEdit.py b/gramps2/src/UrlEdit.py index 69b592c78..f3a831112 100644 --- a/gramps2/src/UrlEdit.py +++ b/gramps2/src/UrlEdit.py @@ -84,9 +84,11 @@ class UrlEditor: def on_delete_event(self,obj,b): self.remove_itself_from_menu() + self.parent.child_windows.remove(self) def close(self,obj): self.remove_itself_from_menu() + self.parent.child_windows.remove(self) self.window.destroy() def add_itself_to_menu(self): diff --git a/gramps2/src/Witness.py b/gramps2/src/Witness.py index d8cb5265c..6e5bee684 100644 --- a/gramps2/src/Witness.py +++ b/gramps2/src/Witness.py @@ -161,9 +161,11 @@ class WitnessEditor: def on_delete_event(self,obj,b): self.remove_itself_from_menu() + self.parent.parent.child_windows.remove(self) def close(self,obj): self.remove_itself_from_menu() + self.parent.parent.child_windows.remove(self) self.window.destroy() def add_itself_to_menu(self):