[GRASS-SVN] r35743 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-02-03 06:00:20 -0500 (Tue, 03 Feb 2009)
New Revision: 35743

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxgui_utils.py
Log:
g.mlist is broken on Windows (OSGeo4W)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-02-02 21:31:17 UTC (rev 35742)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/gselect.py	2009-02-03 11:00:20 UTC (rev 35743)
@@ -22,6 +22,7 @@
 
 import os
 import sys
+import platform
 
 import wx
 import wx.combo
@@ -216,10 +217,15 @@
                 mapsets[i] = mapsets[0]
                 mapsets[0] = curr_mapset
         
-        if globalvar.have_mlist:
+        ### g.mlist is broken in OSGEO4W installation
+        #        if globalvar.have_mlist:
+        #            filesdict = grass.mlist_grouped(elementdict[element])
+        #        else:
+        #            filesdict = grass.list_grouped(elementdict[element])
+        if platform.system() == 'Windows':
+            filesdict = grass.list_grouped(elementdict[element])
+        else:
             filesdict = grass.mlist_grouped(elementdict[element])
-        else:
-            filesdict = grass.list_grouped(elementdict[element])
         
         for dir in mapsets:
             dir_node = self.AddItem('Mapset: '+dir)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxgui_utils.py	2009-02-02 21:31:17 UTC (rev 35742)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxgui_utils.py	2009-02-03 11:00:20 UTC (rev 35743)
@@ -121,7 +121,7 @@
         self.items = []
 
         #create image list to use with layer tree
-        il = wx.ImageList(16, 16, mask=False)
+        il = wx.ImageList(16, 16, mask = True)
 
         trart = wx.ArtProvider.GetBitmap(wx.ART_FOLDER_OPEN, wx.ART_OTHER, (16, 16))
         self.folder_open = il.Add(trart)