Selaa lähdekoodia

wxGUI: OnQuit() method removed (not really working)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43887 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 vuotta sitten
vanhempi
commit
c03af07106
2 muutettua tiedostoa jossa 1 lisäystä ja 22 poistoa
  1. 1 16
      gui/wxpython/wxgui.py
  2. 0 6
      gui/wxpython/xml/menudata.xml

+ 1 - 16
gui/wxpython/wxgui.py

@@ -1435,23 +1435,8 @@ class GMFrame(wx.Frame):
         
         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, unknown 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()

+ 0 - 6
gui/wxpython/xml/menudata.xml

@@ -678,12 +678,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>