[GRASS-SVN] r52066 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-06-14 06:50:56 -0700 (Thu, 14 Jun 2012)
New Revision: 52066

Modified:
   grass/trunk/gui/wxpython/gui_core/forms.py
   grass/trunk/gui/wxpython/gui_core/goutput.py
Log:
wxGUI: fixed aborting command by Ctrl+S

Modified: grass/trunk/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/forms.py	2012-06-14 09:20:10 UTC (rev 52065)
+++ grass/trunk/gui/wxpython/gui_core/forms.py	2012-06-14 13:50:56 UTC (rev 52066)
@@ -714,7 +714,8 @@
         
     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):

Modified: grass/trunk/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/goutput.py	2012-06-14 09:20:10 UTC (rev 52065)
+++ grass/trunk/gui/wxpython/gui_core/goutput.py	2012-06-14 13:50:56 UTC (rev 52066)
@@ -279,7 +279,7 @@
         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()