[GRASS-SVN] r53450 - grass/branches/develbranch_6/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-17 12:28:09 -0700 (Wed, 17 Oct 2012)
New Revision: 53450

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: Select - mapset is not selectable (don't dismiss)
       (merge r53449 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/gselect.py	2012-10-17 19:26:44 UTC (rev 53449)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/gselect.py	2012-10-17 19:28:09 UTC (rev 53450)
@@ -506,19 +506,21 @@
             
             if self.seltree.GetRootItem() == self.seltree.GetItemParent(item):
                 self.value = [] # cannot select mapset item
+                evt.Skip()
+                return
+            
+            mapsetItem = self.seltree.GetItemParent(item)
+            fullName = self.seltree.GetItemText(item)
+            if self.fullyQualified:
+                fullName += '@' + self.seltree.GetItemText(mapsetItem).split(':', -1)[1].strip()
+            
+            if self.multiple is True:
+                # text item should be unique
+                self.value.append(fullName)
             else:
-                mapsetItem = self.seltree.GetItemParent(item)
-                fullName = self.seltree.GetItemText(item)
-                if self.fullyQualified:
-                    fullName += '@' + self.seltree.GetItemText(mapsetItem).split(':', -1)[1].strip()
-                
-                if self.multiple is True:
-                    # text item should be unique
-                    self.value.append(fullName)
-                else:
-                    self.value = [fullName]
+                self.value = [fullName]
             
-            self.Dismiss()
+        self.Dismiss()
         
         evt.Skip()