[GRASS-SVN] r64168 - grass/branches/releasebranch_7_0/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-14 03:41:16 -0800 (Wed, 14 Jan 2015)
New Revision: 64168

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
Log:
wxGUI: force height for colour widget (wxPython 3 fix)
       (merge r64167 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2015-01-14 11:39:45 UTC (rev 64167)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/forms.py	2015-01-14 11:41:16 UTC (rev 64168)
@@ -1479,7 +1479,7 @@
 
                     btn_colour = csel.ColourSelect(parent = which_panel, id = wx.ID_ANY,
                                                    label = label_color, colour = default_color,
-                                                   pos = wx.DefaultPosition, size = (colorSize,-1))
+                                                   pos = wx.DefaultPosition, size = (colorSize, 32))
                     this_sizer.Add(item = btn_colour, proportion = 0,
                                    flag = wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT, border = 5)
                     btn_colour.Bind(csel.EVT_COLOURSELECT,  self.OnColorChange)