[GRASS-SVN] r52068 - grass/branches/releasebranch_6_4/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-06-14 07:01:34 -0700 (Thu, 14 Jun 2012)
New Revision: 52068

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
Log:
wxGUI: fixed aborting command by Ctrl+S (merged from trunk, r52066)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py	2012-06-14 14:00:48 UTC (rev 52067)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py	2012-06-14 14:01:34 UTC (rev 52068)
@@ -665,7 +665,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/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-06-14 14:00:48 UTC (rev 52067)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-06-14 14:01:34 UTC (rev 52068)
@@ -278,7 +278,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()