[GRASS-SVN] r34630 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-11-30 10:16:57 -0500 (Sun, 30 Nov 2008)
New Revision: 34630

Modified:
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: fix dialog with more 'layer' options
       (merge from devbr6, r34629)


Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-11-30 15:12:42 UTC (rev 34629)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-11-30 15:16:57 UTC (rev 34630)
@@ -1308,6 +1308,7 @@
         #
         pMap = None
         pLayer = None
+        pLayerList = []
         pDriver = None
         pDatabase = None
         pTable = None
@@ -1323,7 +1324,9 @@
                 if name in ('map', 'input'):
                     pMap = p
             elif prompt == 'layer':
-                pLayer = p
+                pLayerList.append(p['wxId'])
+                if not pLayer: # TODO: check all 'layer' options
+                    pLayer = p
             elif prompt == 'dbcolumn':
                 pColumn.append(p['wxId'])
             elif prompt == 'dbdriver':
@@ -1336,10 +1339,10 @@
         if pMap:
             pMap['wxId-bind'] = copy.copy(pColumn)
             if pLayer:
-                pMap['wxId-bind'].append(pLayer['wxId'])
+                pMap['wxId-bind'] += pLayerList
         
         if pLayer:
-            pLayer['wxId-bind'] = pColumn
+            p['wxId-bind'] = pColumn
 
         if pDriver and pTable:
             pDriver['wxId-bind'] = [pTable['wxId'], ]