[GRASS-SVN] r62607 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Nov 4 19:00:31 PST 2014


Author: annakrat
Date: 2014-11-04 19:00:30 -0800 (Tue, 04 Nov 2014)
New Revision: 62607

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py
Log:
wxGUI: fix vdigit toolbar (selection arrow button) with wxPython 3 (merge from trunk, r62606)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603
   + /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py	2014-11-05 02:58:41 UTC (rev 62606)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py	2014-11-05 03:00:30 UTC (rev 62607)
@@ -262,8 +262,8 @@
             bitmap = wx.Bitmap(name = arrowPath)
         else:
             bitmap = wx.ArtProvider.GetBitmap(id = wx.ART_MISSING_IMAGE, client = wx.ART_TOOLBAR)
-        button =  wx.BitmapButton(parent = self, id = wx.ID_ANY, size = ((-1, self.GetSize()[1])),
-                                  bitmap = bitmap, style = wx.NO_BORDER)
+        button =  wx.BitmapButton(parent=self, id=wx.ID_ANY, size=((-1, self.GetToolSize()[1])),
+                                  bitmap=bitmap, style=wx.NO_BORDER)
         button.SetToolTipString(tooltip)
 
         return button



More information about the grass-commit mailing list