[GRASS-SVN] r56370 - in grass/branches/develbranch_6/gui/wxpython: gui_core psmap

[svn_grass at osgeo.org]

Author: annakrat
Date: 2013-05-23 00:35:35 -0700 (Thu, 23 May 2013)
New Revision: 56370

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py
   grass/branches/develbranch_6/gui/wxpython/psmap/dialogs.py
Log:
wxGUI/composer: fix Windows issues (symbol dialog, font ), merge from trunk, r56360, r56362

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py	2013-05-23 07:31:52 UTC (rev 56369)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/widgets.py	2013-05-23 07:35:35 UTC (rev 56370)
@@ -496,6 +496,7 @@
         """!Panel selected, background changes"""
         self.selected = True
         self.SetBackgroundColour(self.selectColor)
+        self.Refresh()
         event.Skip()
         
         event = wxSymbolSelectionChanged(name = self.GetName(), doubleClick = False)
@@ -509,9 +510,11 @@
         """!Panel deselected, background changes back to default"""
         self.selected = False
         self.SetBackgroundColour(self.deselectColor)
+        self.Refresh()
         
     def Select(self):
         """!Select panel, no event emitted"""
         self.selected = True
         self.SetBackgroundColour(self.selectColor)
+        self.Refresh()
         

Modified: grass/branches/develbranch_6/gui/wxpython/psmap/dialogs.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/psmap/dialogs.py	2013-05-23 07:31:52 UTC (rev 56369)
+++ grass/branches/develbranch_6/gui/wxpython/psmap/dialogs.py	2013-05-23 07:35:35 UTC (rev 56370)
@@ -3116,9 +3116,8 @@
                 self.vLegendDict['font'] = self.panelVector.font['fontCtrl'].GetStringSelection()
                 self.vLegendDict['fontsize'] = self.panelVector.font['fontSizeCtrl'].GetValue()
                 dc = wx.ClientDC(self)
-                font = dc.GetFont()
-                dc.SetFont(wx.Font(pointSize = self.vLegendDict['fontsize'], family = font.GetFamily(),
-                                   style = font.GetStyle(), weight = wx.FONTWEIGHT_NORMAL))
+                dc.SetFont(wx.Font(pointSize = self.vLegendDict['fontsize'], family = wx.FONTFAMILY_DEFAULT,
+                                   style = wx.FONTSTYLE_NORMAL, weight = wx.FONTWEIGHT_NORMAL))
                 #size
                 width = self.unitConv.convert(value = float(self.panelVector.widthCtrl.GetValue()),
                                               fromUnit = currUnit, toUnit = 'inch')