[GRASS-SVN] r44695 -
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 23 17:46:26 EST 2010
Author: martinl
Date: 2010-12-23 14:46:26 -0800 (Thu, 23 Dec 2010)
New Revision: 44695
Modified:
grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: don't crash when manual page is not available
(merge r44693 from devbr6)
Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py 2010-12-23 22:45:10 UTC (rev 44694)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/menuform.py 2010-12-23 22:46:26 UTC (rev 44695)
@@ -731,8 +731,6 @@
self.btn_cancel.SetToolTipString(_("Close this window without executing the command (Ctrl+Q)"))
btnsizer.Add(item = self.btn_cancel, proportion = 0, flag = wx.ALL | wx.ALIGN_CENTER, border = 10)
self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnCancel)
- if not hasattr(self.notebookpanel, "manual_tab_id"):
- self.btn_help.Hide()
if self.get_dcmd is not None: # A callback has been set up
btn_apply = wx.Button(parent = self.panel, id = wx.ID_APPLY)
btn_ok = wx.Button(parent = self.panel, id = wx.ID_OK)
@@ -770,7 +768,9 @@
self.btn_help = wx.Button(parent = self.panel, id = wx.ID_HELP)
self.btn_help.SetToolTipString(_("Show manual page of the command (Ctrl+H)"))
self.btn_help.Bind(wx.EVT_BUTTON, self.OnHelp)
-
+ if not hasattr(self.notebookpanel, "manual_tab_id"):
+ self.btn_help.Hide()
+
# add help button
btnsizer.Add(item = self.btn_help, proportion = 0, flag = wx.ALL | wx.ALIGN_CENTER, border = 10)
More information about the grass-commit
mailing list