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

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-02-28 06:52:13 -0500 (Sat, 28 Feb 2009)
New Revision: 36134

Modified:
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
wxGUI: fix columnselect update
       (merge from devbr6, r36133)


Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2009-02-28 11:49:48 UTC (rev 36133)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2009-02-28 11:52:13 UTC (rev 36134)
@@ -1374,8 +1374,8 @@
         if pDatabase and pTable:
             pDatabase['wxId-bind'] = [pTable['wxId'], ]
 
-        if pTable and pColumn:
-            pTable['wxId-bind'] = pColumn
+        if pTable and pColumnIds:
+            pTable['wxId-bind'] = pColumnIds
         
 	#
 	# determine panel size
@@ -1607,7 +1607,10 @@
                         pTable = self.task.get_param('dbtable', element='element', raiseError=False)
                         if pTable and \
                                 pTable.get('value', '') != '':
-                            win.InsertTableColumns(pTable.get('value'), driver, db)
+                            if driver and db:
+                                win.InsertTableColumns(pTable.get('value'), driver, db)
+                            else:
+                                win.InsertTableColumns(pTable.get('value'))
                             columns = win.GetItems()
                 else:
                    win.SetItems(columns)