[GRASS-SVN] r67822 - in grass/branches/releasebranch_7_0/gui/wxpython: lmgr mapdisp

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2016-02-13 15:36:22 -0800 (Sat, 13 Feb 2016)
New Revision: 67822

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/lmgr/toolbars.py
   grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/toolbars.py
Log:
wxGUI: remove separators in toolbar (backport r67699 and r67700, #2799)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/lmgr/toolbars.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/lmgr/toolbars.py	2016-02-13 15:23:47 UTC (rev 67821)
+++ grass/branches/releasebranch_7_0/gui/wxpython/lmgr/toolbars.py	2016-02-13 23:36:22 UTC (rev 67822)
@@ -53,7 +53,6 @@
             }
         return self._getToolbarData((('newdisplay', icons["newdisplay"],
                                       self.parent.OnNewDisplay),
-                                     (None, ),
                                      ('workspaceNew', icons["workspaceNew"],
                                       self.parent.OnWorkspaceNew),
                                      ('workspaceOpen', icons["workspaceOpen"],
@@ -112,7 +111,6 @@
                                      (None, ),
                                      ('addgrp',  icons["addGroup"],
                                       self.parent.OnAddGroup),
-                                     (None, ),
                                      ('delcmd',  icons["delCmd"],
                                       self.parent.OnDeleteLayer),
                                      ))

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/toolbars.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/toolbars.py	2016-02-13 15:23:47 UTC (rev 67821)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/toolbars.py	2016-02-13 23:36:22 UTC (rev 67822)
@@ -6,7 +6,7 @@
 Classes:
  - toolbars::MapToolbar
 
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2015 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -143,7 +143,6 @@
                                       self.parent.OnRender),
                                      ('erase', BaseIcons['erase'],
                                       self.parent.OnErase),
-                                     (None, ),
                                      ('pointer', BaseIcons['pointer'],
                                       self.parent.OnPointer,
                                       wx.ITEM_CHECK),
@@ -167,19 +166,15 @@
                                       self.parent.OnZoomBack),
                                      ('zoomMenu', BaseIcons['zoomMenu'],
                                       self.parent.OnZoomMenu),
-                                     (None, ),
                                      ('analyze', MapIcons['analyze'],
                                       self.OnAnalyze),
-                                     (None, ),
                                      ('overlay', BaseIcons['overlay'],
                                       self.OnDecoration),
-                                     (None, ),
                                      ('saveFile', BaseIcons['saveFile'],
                                       self.parent.SaveToFile),
                                      ('printMap', BaseIcons['print'],
                                       self.parent.PrintMenu),
-                                     (None, ))
-                                    )
+                                    ))
     def InsertTool(self, data):
         """Insert tool to toolbar