From b0bf67f436334b8cba02f8b12b720a177c3a31f1 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Wed, 18 Aug 2010 21:11:09 +0000 Subject: [PATCH] better fix for #4166, #3955 svn: r15768 --- src/ExportAssistant.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/ExportAssistant.py b/src/ExportAssistant.py index dbcd306e3..fe8179180 100644 --- a/src/ExportAssistant.py +++ b/src/ExportAssistant.py @@ -118,12 +118,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) : 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") @@ -408,7 +402,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 @@ -416,10 +409,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): @@ -563,7 +552,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):