[GRASS-SVN] r57244 - in grass/trunk/gui/wxpython: mapdisp mapswipe vdigit

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2013-07-22 05:07:59 -0700 (Mon, 22 Jul 2013)
New Revision: 57244

Modified:
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/mapdisp/mapwindow.py
   grass/trunk/gui/wxpython/mapswipe/mapwindow.py
   grass/trunk/gui/wxpython/vdigit/mapwindow.py
Log:
wxGUI/mapwindow: removing unused tree variables from BufferedWindow

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2013-07-22 06:48:57 UTC (rev 57243)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2013-07-22 12:07:59 UTC (rev 57244)
@@ -148,8 +148,8 @@
         # Init map display (buffered DC & set default cursor)
         #
         self.MapWindow2D = BufferedWindow(self, giface = self._giface, id = wx.ID_ANY,
-                                          Map = self.Map, frame = self, tree = self.tree,
-                                          lmgr = self._layerManager, overlays = self.decorations)
+                                          Map=self.Map, frame=self,
+                                          overlays=self.decorations)
         self.MapWindow2D.mapQueried.connect(self.Query)
         # enable or disable zoom history tool
         self.MapWindow2D.zoomHistoryAvailable.connect(

Modified: grass/trunk/gui/wxpython/mapdisp/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/mapwindow.py	2013-07-22 06:48:57 UTC (rev 57243)
+++ grass/trunk/gui/wxpython/mapdisp/mapwindow.py	2013-07-22 12:07:59 UTC (rev 57244)
@@ -56,13 +56,21 @@
     SaveToFile() method.
     """
     def __init__(self, parent, giface, Map, frame,
-                 id = wx.ID_ANY, tree = None, lmgr = None, overlays = None,
+                 id=wx.ID_ANY, overlays=None,
                  style = wx.NO_FULL_REPAINT_ON_RESIZE, **kwargs):
+        """!
+        @param parent parent window
+        @param giface grass interface instance
+        @param Map map instance
+        @param frame map frame instance (to be removed)
+        @param id wx window id
+        @param style wx window style
+        @param kwargs keyword arguments passed to MapWindow and wx.Window
+        """
         MapWindow.__init__(self, parent = parent, giface = giface, Map = Map,
                            frame = frame, **kwargs)
         wx.Window.__init__(self, parent = parent, id = id, style = style, **kwargs)
-        
-        self.tree = tree
+
         # flags
         self.resize = False # indicates whether or not a resize event has taken place
         self.dragimg = None # initialize variable for map panning

Modified: grass/trunk/gui/wxpython/mapswipe/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/mapswipe/mapwindow.py	2013-07-22 06:48:57 UTC (rev 57243)
+++ grass/trunk/gui/wxpython/mapswipe/mapwindow.py	2013-07-22 12:07:59 UTC (rev 57244)
@@ -36,10 +36,9 @@
     Enables to draw the image translated.
     Special mouse events with changed coordinates are used.
     """
-    def __init__(self, parent, giface, Map, frame,
-                 tree = None, **kwargs):
+    def __init__(self, parent, giface, Map, frame, **kwargs):
         BufferedWindow.__init__(self, parent = parent, giface = giface,
-                                Map = Map, frame = frame, tree = tree, **kwargs)
+                                Map=Map, frame=frame, **kwargs)
         Debug.msg(2, "SwipeBufferedWindow.__init__()")
 
         self.specialSize = super(SwipeBufferedWindow, self).GetClientSize()

Modified: grass/trunk/gui/wxpython/vdigit/mapwindow.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/mapwindow.py	2013-07-22 06:48:57 UTC (rev 57243)
+++ grass/trunk/gui/wxpython/vdigit/mapwindow.py	2013-07-22 12:07:59 UTC (rev 57244)
@@ -31,10 +31,10 @@
     """!A Buffered window extended for vector digitizer.
     """
     def __init__(self, parent, giface, Map, frame,
-                 id = wx.ID_ANY, tree = None, lmgr = None,
+                 id=wx.ID_ANY, lmgr=None,
                  style = wx.NO_FULL_REPAINT_ON_RESIZE, **kwargs):
         BufferedWindow.__init__(self, parent = parent, giface = giface, id = id, Map = Map,
-                                frame = frame, tree = tree, style = style, **kwargs)
+                                frame=frame, style=style, **kwargs)
         self.lmgr = lmgr
         self.pdcVector = wx.PseudoDC()
         self.toolbar   = self.parent.GetToolbar('vdigit')