浏览代码

[g.gui.image2target] Fix wxPython Phoenix support (#396)

* fix wxpython phoenix support

* remove unused imports
Anna Petrasova 5 年之前
父节点
当前提交
c3a0f9405c
共有 2 个文件被更改,包括 5 次插入9 次删除
  1. 4 2
      gui/wxpython/image2target/ii2t_manager.py
  2. 1 7
      gui/wxpython/photo2image/ip2i_manager.py

+ 4 - 2
gui/wxpython/image2target/ii2t_manager.py

@@ -45,9 +45,11 @@ import wx.lib.colourselect as csel
 
 from core import globalvar
 if globalvar.wxPythonPhoenix:
-    from wx.adv import Wizard as wiz
+    from wx import adv as wiz
+    from wx.adv import Wizard
 else:
-    import wx.wizard as wiz
+    from wx import wizard as wiz
+    from wx.wizard import Wizard
 
 import grass.script as grass
 

+ 1 - 7
gui/wxpython/photo2image/ip2i_manager.py

@@ -36,15 +36,9 @@ import wx
 from wx.lib.mixins.listctrl import CheckListCtrlMixin, ColumnSorterMixin, ListCtrlAutoWidthMixin
 import wx.lib.colourselect as csel
 
-from core import globalvar
-if globalvar.wxPythonPhoenix:
-    from wx.adv import Wizard as wiz
-else:
-    import wx.wizard as wiz
-
 import grass.script as grass
 
-from core import utils
+from core import utils, globalvar
 from core.render import Map
 from gui_core.gselect import Select, LocationSelect, MapsetSelect
 from gui_core.dialogs import GroupDialog