[GRASS-SVN] r43197 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-08-22 03:54:57 +0000 (Sun, 22 Aug 2010)
New Revision: 43197

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
Log:
expand conditional, helping whitespace (merge from trunk)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-08-22 03:47:31 UTC (rev 43196)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-08-22 03:54:57 UTC (rev 43197)
@@ -184,7 +184,7 @@
         self.btn['or'].SetToolTipString(_('logical OR'))
         self.btn['ornull'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "|||")
         self.btn['ornull'].SetToolTipString(_('logical OR (ignores NULLs)'))
-        self.btn['cond'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "?:") 
+        self.btn['cond'] = wx.Button(parent = self.panel, id = wx.ID_ANY, label = "a ? b : c") 
         self.btn['cond'].SetToolTipString(_('conditional'))
         
         #
@@ -350,8 +350,8 @@
         elif event.GetId() == self.btn['ornull'].GetId(): mark = "|||"
         elif event.GetId() == self.btn['and'].GetId(): mark = "&&"
         elif event.GetId() == self.btn['andnull'].GetId(): mark = "&&&"
-        elif event.GetId() == self.btn['cond'].GetId(): mark = "?:"
-        elif event.GetId() == self.btn['paren'].GetId(): mark = "()"        
+        elif event.GetId() == self.btn['cond'].GetId(): mark = " ? : "
+        elif event.GetId() == self.btn['paren'].GetId(): mark = "( )"        
         self._addSomething(mark)
         
     def OnSelect(self, event):