[GRASS-SVN] r42670 -
grass/branches/develbranch_6/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Jun 27 17:46:11 EDT 2010
Author: martinl
Date: 2010-06-27 21:46:11 +0000 (Sun, 27 Jun 2010)
New Revision: 42670
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py
Log:
wxGUI: fix agwStyle issue
(merge r42669 from trunk)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py 2010-06-27 21:41:08 UTC (rev 42669)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/ghelp.py 2010-06-27 21:46:11 UTC (rev 42670)
@@ -345,10 +345,10 @@
def __init__(self, parent, id = wx.ID_ANY,
ctstyle = CT.TR_HIDE_ROOT | CT.TR_FULL_ROW_HIGHLIGHT | CT.TR_HAS_BUTTONS |
CT.TR_LINES_AT_ROOT | CT.TR_SINGLE, **kwargs):
- if 'style' in kwargs:
- ctstyle |= kwargs['style']
- del kwargs['style']
- super(ItemTree, self).__init__(parent, id, style = ctstyle, **kwargs)
+ if globalvar.hasAgw:
+ super(ItemTree, self).__init__(parent, id, agwStyle = ctstyle, **kwargs)
+ else:
+ super(ItemTree, self).__init__(parent, id, style = ctstyle, **kwargs)
self.root = self.AddRoot(_("Menu tree"))
self.itemsMarked = [] # list of marked items
More information about the grass-commit
mailing list