浏览代码

fix wxGUI, see https://trac.osgeo.org/grass/changeset/37347

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37348 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 年之前
父节点
当前提交
35e4d930fc

+ 1 - 1
gui/wxpython/gui_modules/colorrules.py

@@ -24,7 +24,7 @@ import wx
 import wx.lib.colourselect as csel
 import wx.lib.scrolledpanel as scrolled
 
-import grass
+from grass.script import core as grass
 
 import dbm
 import gcmd

+ 1 - 1
gui/wxpython/gui_modules/gcmd.py

@@ -56,7 +56,7 @@ from threading import Thread
 import globalvar
 grassPath = os.path.join(globalvar.ETCDIR, "python")
 sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
 
 import utils
 from debug import Debug as Debug

+ 1 - 1
gui/wxpython/gui_modules/gdialogs.py

@@ -31,7 +31,7 @@ import wx
 import wx.lib.filebrowsebutton as filebrowse
 import wx.lib.mixins.listctrl as listmix
 
-import grass
+from grass.script import core as grass
 
 import gcmd
 import globalvar

+ 1 - 1
gui/wxpython/gui_modules/georect.py

@@ -35,7 +35,7 @@ from wx.lib.mixins.listctrl import CheckListCtrlMixin, ListCtrlAutoWidthMixin, T
 import wx.lib.colourselect as  csel
 import wx.wizard as wiz
 
-import grass
+from grass.script import core as grass
 
 import globalvar
 import mapdisp

+ 1 - 1
gui/wxpython/gui_modules/gselect.py

@@ -26,7 +26,7 @@ import sys
 import wx
 import wx.combo
 
-import grass
+from grass.script import core as grass
 
 import globalvar
 import gcmd

+ 1 - 1
gui/wxpython/gui_modules/location_wizard.py

@@ -46,7 +46,7 @@ import wx.wizard as wiz
 import gcmd
 import globalvar
 import utils
-import grass
+from grass.script import core as grass
 try:
     import subprocess
 except:

+ 1 - 1
gui/wxpython/gui_modules/mapdisp.py

@@ -63,7 +63,7 @@ import profile
 import globalvar
 import utils
 import gdialogs
-import grass
+from grass.script import core as grass
 from debug import Debug
 from icon  import Icons
 from preferences import globalSettings as UserSettings

+ 1 - 1
gui/wxpython/gui_modules/menuform.py

@@ -93,7 +93,7 @@ sys.path.append( wxbase)
 imagepath = os.path.join(wxbase, "images")
 sys.path.append(imagepath)
 
-import grass
+from grass.script import core as grass
 
 import gselect
 import gcmd

+ 1 - 1
gui/wxpython/gui_modules/preferences.py

@@ -35,7 +35,7 @@ import wx.lib.colourselect as csel
 import wx.lib.mixins.listctrl as listmix
 from wx.lib.wordwrap import wordwrap
 
-import grass
+from grass.script import core as grass
 import gcmd
 import utils
 import globalvar

+ 1 - 1
gui/wxpython/gui_modules/profile.py

@@ -56,7 +56,7 @@ import toolbars
 from debug import Debug as Debug
 from icon import Icons as Icons
 from preferences import globalSettings as UserSettings
-import grass
+from grass.script import core as grass
 
 class ProfileFrame(wx.Frame):
     """

+ 1 - 1
gui/wxpython/gui_modules/render.py

@@ -37,7 +37,7 @@ import tempfile
 import wx
 from wx.lib.newevent import NewEvent
 
-import grass
+from grass.script import core as grass
 
 import globalvar
 import utils

+ 1 - 1
gui/wxpython/gui_modules/sqlbuilder.py

@@ -24,7 +24,7 @@ import wx
 import os,sys
 import time
 
-import grass
+from grass.script import core as grass
 
 import gcmd
 import globalvar

+ 1 - 1
gui/wxpython/gui_modules/toolbars.py

@@ -25,7 +25,7 @@ import wx
 import os, sys
 import platform
 
-import grass
+from grass.script import core as grass
 
 import globalvar
 import gcmd

+ 1 - 1
gui/wxpython/gui_modules/utils.py

@@ -21,7 +21,7 @@ import platform
 import globalvar
 grassPath = os.path.join(globalvar.ETCDIR, "python")
 sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
 
 import gcmd
 try:

+ 1 - 1
gui/wxpython/gui_modules/wxgui_utils.py

@@ -30,7 +30,7 @@ import wx.combo
 import wx.lib.newevent
 import wx.lib.buttons  as  buttons
 
-import grass
+from grass.script import core as grass
 
 import gdialogs
 import globalvar

+ 1 - 1
gui/wxpython/wxgui.py

@@ -66,7 +66,7 @@ from wx.lib.wordwrap import wordwrap
 
 grassPath = os.path.join(globalvar.ETCDIR, "python")
 sys.path.append(grassPath)
-import grass
+from grass.script import core as grass
 
 import gui_modules.utils as utils
 import gui_modules.preferences as preferences