[GRASS-SVN] r32024 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-06 07:43:26 -0400 (Sun, 06 Jul 2008)
New Revision: 32024

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: destroy/hide dialog on wx.EVT_CLOSE (merged from trunk, r32022)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2008-07-06 11:42:47 UTC (rev 32023)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2008-07-06 11:43:26 UTC (rev 32024)
@@ -711,7 +711,7 @@
                          flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM,
                          border=5)
 
-        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
+        self.Bind(wx.EVT_CLOSE, self.OnCancel)
 
         #constrained_size = self.notebookpanel.GetSize()
         # 80 takes the tabbar into account
@@ -840,11 +840,6 @@
             
         event.Skip()
 
-    def OnCloseWindow(self, event):
-        """Close the main window"""
-        self.MakeModal(False)
-        self.Destroy()
-
     def OnAbout(self, event):
         """General 'about' information"""
         dlg = wx.MessageDialog(self, _("This is a sample program for\n"