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

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-09 12:48:28 -0400 (Sun, 09 May 2010)
New Revision: 42190

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
Log:
wxGUI/mapcalc: overwrite is not woking in g6


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-05-09 16:43:30 UTC (rev 42189)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mcalc_builder.py	2010-05-09 16:48:28 UTC (rev 42190)
@@ -197,10 +197,6 @@
                                     style = wx.CB_DROPDOWN |
                                     wx.CB_READONLY | wx.TE_PROCESS_ENTER)
         
-        self.overwrite = wx.CheckBox(parent = self, id = wx.ID_ANY,
-                                     label=_("Allow output files to overwrite existing files"))
-        self.overwrite.SetValue(UserSettings.Get(group='cmd', key='overwrite', subkey='enabled'))
-        
         #
         # Bindings
         #
@@ -298,8 +294,6 @@
                       border = 5)        
         sizer.Add(item = expressSizer, flag = wx.EXPAND | wx.LEFT | wx.RIGHT,
                       border = 5)
-        sizer.Add(item = self.overwrite, flag = wx.EXPAND | wx.LEFT | wx.RIGHT,
-                      border = 5)
         sizer.Add(item = buttonSizer4, proportion = 0,
                       flag = wx.ALIGN_RIGHT | wx.ALL, border = 1)
         
@@ -397,18 +391,11 @@
 
         if self.log:
             cmd = [prg, str('%s = %s' % (name, mctxt))]
-            if self.overwrite.IsChecked():
-                cmd.append('--overwrite')
             self.log.RunCmd(cmd)
             self.parent.Raise()
         else:
-            if self.overwrite.IsChecked():
-                overwrite = True
-            else:
-                overwrite = False
             gcmd.RunCommand(prg,
-                            "%s=%s" % (name, mctxt),
-                            overwrite = overwrite)
+                            "%s=%s" % (name, mctxt))
         
     def OnClear(self, event):
         """!Clears text area