[GRASS-SVN] r51412 - in grass/branches/develbranch_6: . gui/wxpython/gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Apr 13 09:15:51 EDT 2012


Author: annakrat
Date: 2012-04-13 06:15:51 -0700 (Fri, 13 Apr 2012)
New Revision: 51412

Modified:
   grass/branches/develbranch_6/
   grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py
Log:
wxGUI: quick fix for PyAssertionError in SymbolButton on windows


Property changes on: grass/branches/develbranch_6
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/branches/releasebranch_6_4:51410

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py	2012-04-13 13:15:13 UTC (rev 51411)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py	2012-04-13 13:15:51 UTC (rev 51412)
@@ -26,6 +26,7 @@
 """
 
 import os
+import sys
 import string
 
 import wx
@@ -194,7 +195,8 @@
         elif usage == 'pause':
             self.DrawPause(dc, size)
 
-        buffer.SetMaskColour(maskColor)
+        if sys.platform != "win32":
+            buffer.SetMaskColour(maskColor)
         self.SetBitmapLabel(buffer)
         dc.SelectObject(wx.NullBitmap)
         



More information about the grass-commit mailing list