[GRASS-SVN] r41220 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-02-28 07:47:10 -0500 (Sun, 28 Feb 2010)
New Revision: 41220

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
try to import wx.lib.agw.customtreectrl first
(merge r41218 & r41219 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py	2010-02-28 12:46:41 UTC (rev 41219)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/help.py	2010-02-28 12:47:10 UTC (rev 41220)
@@ -22,7 +22,10 @@
 import os
 
 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.lib.flatnotebook as FN
 import  wx.lib.scrolledpanel as scrolled
 from wx.lib.wordwrap import wordwrap

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-28 12:46:41 UTC (rev 41219)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/wxgui_utils.py	2010-02-28 12:47:10 UTC (rev 41220)
@@ -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/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-02-28 12:46:41 UTC (rev 41219)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2010-02-28 12:47:10 UTC (rev 41220)
@@ -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")