[GRASS-SVN] r42214 - grass/branches/develbranch_6/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-10 10:01:29 -0400 (Mon, 10 May 2010)
New Revision: 42214

Modified:
   grass/branches/develbranch_6/gui/wxpython/gis_set.py
Log:
fix gis_set.py to reflect changes in ghelp
(merge r42213 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py	2010-05-10 13:58:30 UTC (rev 42213)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py	2010-05-10 14:01:29 UTC (rev 42214)
@@ -34,7 +34,8 @@
 if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()
 
-from gui_modules import help
+import gui_modules.goutput
+from gui_modules.ghelp import HelpWindow
 
 import wx
 import wx.html
@@ -746,10 +747,10 @@
         # help text in lib/init/helptext.html
         file=os.path.join(self.gisbase, "docs", "html", "helptext.html")
 
-        helpFrame = help.HelpWindow(parent=self, id=wx.ID_ANY,
-                                    title=_("GRASS Quickstart"),
-                                    size=(640, 480),
-                                    file=file)
+        helpFrame = HelpWindow(parent=self, id=wx.ID_ANY,
+                               title=_("GRASS Quickstart"),
+                               size=(640, 480),
+                               file=file)
         helpFrame.Show(True)
 
         event.Skip()