[GRASS-SVN] r41218 - in grass/trunk/gui/wxpython: . gui_modules

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Feb 28 07:42:44 EST 2010


Author: martinl
Date: 2010-02-28 07:42:44 -0500 (Sun, 28 Feb 2010)
New Revision: 41218

Modified:
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
try to import wx.lib.agw.customtreectrl first


Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-28 12:33:41 UTC (rev 41217)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-28 12:42:44 UTC (rev 41218)
@@ -23,7 +23,10 @@
 import string
 
 import wx
-import wx.lib.agw.customtreectrl as CT
+try:
+    import wx.lib.agw.customtreectrl as CT
+except ImportError:
+    import wx.lib.customtreectrl as CT
 import wx.combo
 import wx.lib.newevent
 import wx.lib.buttons  as  buttons

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2010-02-28 12:33:41 UTC (rev 41217)
+++ grass/trunk/gui/wxpython/wxgui.py	2010-02-28 12:42:44 UTC (rev 41218)
@@ -60,7 +60,10 @@
 import wx.combo
 import wx.html
 import wx.stc
-import wx.lib.agw.customtreectrl as CT
+try:
+    import wx.lib.agw.customtreectrl as CT
+except ImportError:
+    import wx.lib.customtreectrl as CT
 import wx.lib.flatnotebook as FN
 
 grassPath = os.path.join(globalvar.ETCDIR, "python")



More information about the grass-commit mailing list