[GRASS-SVN] r59515 - grass/branches/releasebranch_7_0/gui/wxpython/modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-03-29 14:59:02 -0700 (Sat, 29 Mar 2014)
New Revision: 59515

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
Log:
wxGUI/mapcalc: fix map name and function insertion event handling for wxPython 3 (merged from trunk, r59514)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py	2014-03-29 21:55:49 UTC (rev 59514)
+++ grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py	2014-03-29 21:59:02 UTC (rev 59515)
@@ -422,7 +422,7 @@
         """!Checks if user is typing or the event was emited by map selection.
         Prevents from changing focus.
         """
-        item = event.GetString()
+        item = self.mapselect.GetValue().strip()
         if not (abs(len(item) - len(self.lastMapName)) == 1  and \
             self.lastMapName in item or item in self.lastMapName):
             self.OnSelect(event)
@@ -435,7 +435,7 @@
         Checks for characters which can be in raster map name but 
         the raster map name must be then quoted.
         """
-        item = event.GetString().strip()
+        item = self.FindWindowById(event.GetId()).GetValue().strip()
         if any((char in item) for char in self.charactersToQuote):
             item = '"' + item + '"'
         self._addSomething(item)