[GRASS-SVN] r43888 - in grass/branches/develbranch_6/gui/wxpython: . xml

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-13 11:33:49 -0700 (Wed, 13 Oct 2010)
New Revision: 43888

Modified:
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
   grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
Log:
wxGUI: OnQuit() method removed (not really working)
(merge r43887 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-10-13 18:30:29 UTC (rev 43887)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-10-13 18:33:49 UTC (rev 43888)
@@ -1486,23 +1486,8 @@
         
         event.Skip()
 
-    def OnQuit(self, event):
-        """!Quit GRASS session (wxGUI and shell)"""
-        # quit wxGUI session
-        self.OnCloseWindow(event)
-
-        # quit GRASS shell
-        try:
-            pid = int(os.environ['GIS_LOCK'])
-        except (KeyError, ValueError):
-            sys.stderr.write('\n')
-            sys.stderr.write(_("WARNING: Unable to quit GRASS, uknown GIS_LOCK"))
-            return
-        
-        os.kill(pid, signal.SIGQUIT)
-        
     def OnCloseWindow(self, event):
-        """!Cleanup when wxGUI is quit"""
+        """!Cleanup when wxGUI is quitted"""
         if not self.curr_page:
             self._auimgr.UnInit()
             self.Destroy()

Modified: grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-10-13 18:30:29 UTC (rev 43887)
+++ grass/branches/develbranch_6/gui/wxpython/xml/menudata.xml	2010-10-13 18:33:49 UTC (rev 43888)
@@ -685,12 +685,6 @@
 	  <handler>OnCloseWindow</handler>
 	  <shortcut>Ctrl+W</shortcut>
 	</menuitem>
-	<menuitem>
-	  <label>Quit GRASS GIS</label>
-	  <help>Quit GRASS session including wxGUI</help>
-	  <handler>OnQuit</handler>
-	  <shortcut>Ctrl+Q</shortcut>
-	</menuitem>
       </items>
     </menu>
     <menu>