From fc3ed649f1f5d822f1d728d30959e6a71f85f772 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Wed, 18 Aug 2010 21:15:49 +0000 Subject: [PATCH] better fix for #4166, #3955 svn: r15770 --- src/ExportAssistant.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/ExportAssistant.py b/src/ExportAssistant.py index 374a5d072..ab112a8d4 100644 --- a/src/ExportAssistant.py +++ b/src/ExportAssistant.py @@ -3,6 +3,7 @@ # # Copyright (C) 2004-2007 Donald N. Allingham # Copyright (C) 2008 Brian G. Matherly +# Copyright (C) 2008 Benny Malengier # Contribution 2009 by Brad Crittenden # # This program is free software; you can redistribute it and/or modify @@ -115,13 +116,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) : self.forward_button = None gtk.Assistant.forall(self, self.get_forward_button) ## end - ##workaround for bug with cancel/close button clicked - ##see bug http://www.gramps-project.org/bugs/view.php?id=4166 - self.cancel_button = None - gtk.Assistant.forall(self, self.get_cancel_button) - self.close_button = None - gtk.Assistant.forall(self, self.get_close_button) - ## end #set up ManagedWindow self.top_title = _("Export Assistant") @@ -406,7 +400,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) : self.set_page_complete(page, False) self.set_page_type(page, gtk.ASSISTANT_PAGE_SUMMARY) - def do_apply(self): pass @@ -414,10 +407,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) : if self.writestarted : pass else : - ## avoid bug http://www.gramps-project.org/bugs/view.php?id=4166 - self.cancel_button.hide() - self.close_button.hide() - ## end self.close() def do_cancel(self): @@ -561,7 +550,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) : def close(self, *obj) : #clean up ManagedWindow menu, then destroy window, bring forward parent - + gtk.Assistant.destroy(self) ManagedWindow.ManagedWindow.close(self,*obj) def get_intro_text(self):