[GRASS-SVN] r42249 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-13 17:25:59 -0400 (Thu, 13 May 2010)
New Revision: 42249

Modified:
   grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py
Log:
wxGUI/mcalc: recycle **kwargs


Modified: grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py	2010-05-13 13:20:30 UTC (rev 42248)
+++ grass/trunk/gui/wxpython/gui_modules/mcalc_builder.py	2010-05-13 21:25:59 UTC (rev 42249)
@@ -37,7 +37,7 @@
     """!Mapcalc Frame class. Calculator-style window to create and run
     r(3).mapcalc statements
     """
-    def __init__(self, parent, id = wx.ID_ANY, title = _('Map calculator'), 
+    def __init__(self, parent, cmd, id = wx.ID_ANY, title = _('Map calculator'), 
                  style = wx.DEFAULT_FRAME_STYLE | wx.RESIZE_BORDER, **kwargs):
         self.parent = parent
         if self.parent:
@@ -46,14 +46,14 @@
             self.log = None
         
         # grass command
-        self.cmd = kwargs['cmd']
+        self.cmd = cmd
 
         if self.cmd == 'r.mapcalc':
             self.rast3d = False
         if self.cmd == 'r3.mapcalc':
             self.rast3d = True
 
-        wx.Frame.__init__(self, parent, id = id, title = title)
+        wx.Frame.__init__(self, parent, id = id, title = title, **kwargs)
         self.SetIcon(wx.Icon(os.path.join(globalvar.ETCICONDIR, 'grass.ico'), wx.BITMAP_TYPE_ICO))
         
         self.panel = wx.Panel(parent = self, id = wx.ID_ANY)