Parcourir la source

wxGUI: fixed aborting command by Ctrl+S

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52066 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová il y a 13 ans
Parent
commit
28848ff669
2 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 2 1
      gui/wxpython/gui_core/forms.py
  2. 1 1
      gui/wxpython/gui_core/goutput.py

+ 2 - 1
gui/wxpython/gui_core/forms.py

@@ -714,7 +714,8 @@ class TaskFrame(wx.Frame):
         
     def OnAbort(self, event):
         """!Abort running command"""
-        event = goutput.wxCmdAbort(aborted = True)
+        from gui_core.goutput import wxCmdAbort
+        event = wxCmdAbort(aborted = True)
         wx.PostEvent(self.goutput, event)
 
     def OnCopy(self, event):

+ 1 - 1
gui/wxpython/gui_core/goutput.py

@@ -279,7 +279,7 @@ class GMConsole(wx.SplitterWindow):
         self.btnOutputClear.Bind(wx.EVT_BUTTON,  self.OnOutputClear)
         self.btnOutputSave.Bind(wx.EVT_BUTTON,   self.OnOutputSave)
         self.btnCmdAbort.Bind(wx.EVT_BUTTON,     self.OnCmdAbort)
-        self.btnCmdAbort.Bind(EVT_CMD_ABORT,     self.OnCmdAbort)
+        self.Bind(EVT_CMD_ABORT,                 self.OnCmdAbort)
         self.btnCmdProtocol.Bind(wx.EVT_TOGGLEBUTTON, self.OnCmdProtocol)
         
         self._layout()