[GRASS-SVN] r72218 - grass/branches/releasebranch_7_4/gui/wxpython/gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Feb 9 07:03:42 PST 2018


Author: annakrat
Date: 2018-02-09 07:03:42 -0800 (Fri, 09 Feb 2018)
New Revision: 72218

Modified:
   grass/branches/releasebranch_7_4/gui/wxpython/gui_core/wrap.py
Log:
wxGUI: fix Phoenix compatibility (merge from trunk, r72217)

Modified: grass/branches/releasebranch_7_4/gui/wxpython/gui_core/wrap.py
===================================================================
--- grass/branches/releasebranch_7_4/gui/wxpython/gui_core/wrap.py	2018-02-09 15:02:28 UTC (rev 72217)
+++ grass/branches/releasebranch_7_4/gui/wxpython/gui_core/wrap.py	2018-02-09 15:03:42 UTC (rev 72218)
@@ -225,7 +225,7 @@
                      shortHelpString='', longHelpString='', clientData=None):
         if wxPythonPhoenix:
             return wx.ToolBar.AddTool(self, toolId=toolId, label=label, bitmap=bitmap, bmpDisabled=bmpDisabled,
-                                      kind=kind, shortHelpString=shortHelpString, longHelpString=longHelpString,
+                                      kind=kind, shortHelp=shortHelpString, longHelp=longHelpString,
                                       clientData=clientData)
         else:
             return wx.ToolBar.AddLabelTool(self, toolId, label, bitmap, bmpDisabled, kind,



More information about the grass-commit mailing list