[GRASS-SVN] r46664 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-06-11 10:49:07 -0700 (Sat, 11 Jun 2011)
New Revision: 46664

Modified:
   grass/branches/releasebranch_6_4/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/releasebranch_6_4/gui/wxpython/gui_modules/menu.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menu.py	2011-06-11 17:46:57 UTC (rev 46663)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menu.py	2011-06-11 17:49:07 UTC (rev 46664)
@@ -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