Author: martinl
Date: 2011-06-11 10:46:57 -0700 (Sat, 11 Jun 2011)
New Revision: 46663
Modified:
grass/branches/develbranch_6/gui/wxpython/gui_modules/menu.py
Log:
#1387 (wingrass65 - wxgui compiling error and not starting) - patch by Vaclav Petras
(merge from r46662 from trunk)
Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menu.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menu.py 2011-06-11 17:42:05 UTC (rev 46662)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menu.py 2011-06-11 17:46:57 UTC (rev 46663)
@@ -49,14 +49,14 @@
subMenu = self._createMenu(eachItem[1])
menu.AppendMenu(wx.ID_ANY, label, subMenu)
else:
- self._createMenuItem(menu, *eachItem, menustyle = self.menustyle)
+ self._createMenuItem(menu, self.menustyle, *eachItem)
self.parent.Bind(wx.EVT_MENU_HIGHLIGHT_ALL, self.OnMenuHighlight)
return menu
- def _createMenuItem(self, menu, label, help, handler, gcmd, keywords,
- shortcut = '', kind = wx.ITEM_NORMAL, menustyle = 0):
+ def _createMenuItem(self, menu, menustyle, label, help, handler, gcmd, keywords,
+ shortcut = '', kind = wx.ITEM_NORMAL):
"""!Creates menu items
There are three menu styles (menu item text styles).
1 -- label only, 2 -- label and cmd name, 3 -- cmd name only