g.gui.mapswipe: remove draw/erase from toolbar, layout cosmetics

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@68273 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/mapswipe/dialogs.py

@@ -101,9 +101,9 @@ class SwipeMapDialog(wx.Dialog):
         mainSizer.Add(item=self.btnSizer, proportion=0,
                       flag=wx.EXPAND | wx.ALL | wx.ALIGN_CENTER, border=5)
         self.mainSizer = mainSizer
+        self._switchMode(simple=True)
         self.SetSizer(mainSizer)
         mainSizer.Fit(self)
-        self._switchMode(simple=True)
 
     def _createSimplePanel(self):
         panel = wx.Panel(self)

gui/wxpython/mapswipe/frame.py

@@ -102,7 +102,7 @@ class SwipeMapFrame(DoubleMapFrame):
         self.Bind(wx.EVT_IDLE, self.OnIdle)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
 
-        self.SetSize((825, 600))
+        self.SetSize((800, 600))
         
         self._mgr.Update()
 

gui/wxpython/mapswipe/toolbars.py

@@ -56,13 +56,8 @@ class SwipeMapToolbar(BaseToolbar):
         # BaseIcons are a set of often used icons. It is possible
         # to reuse icons in ./trunk/gui/icons/grass or add new ones there.
         icons = BaseIcons
-        return self._getToolbarData((("displaymap", icons["display"],
-                                      self.parent.OnDraw),
-                                     ("rendermap", icons["render"],
+        return self._getToolbarData((("rendermap", icons["render"],
                                       self.parent.OnRender),
-                                     ("erase", icons["erase"],
-                                      self.parent.OnErase),
-                                     (None, ),  # creates separator
                                      ("pointer", icons["pointer"],
                                       self.parent.OnPointer,
                                       wx.ITEM_CHECK),