[GRASS-SVN] r47288 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-07-27 13:51:22 -0700 (Wed, 27 Jul 2011)
New Revision: 47288

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
Log:
wxGUI: try to fix #1412 (not opening north arrow dialog) - merge from trunk, r47283

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2011-07-27 20:46:03 UTC (rev 47287)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2011-07-27 20:51:22 UTC (rev 47288)
@@ -504,21 +504,17 @@
 
         # create overlay if doesn't exist
         self._CreateOverlay()
-
+        
         if len(self.parent.MapWindow.overlays[self.ovlId]['cmd']) > 1:
-            mapName, found = utils.GetLayerNameFromCmd(self.parent.MapWindow.overlays[self.ovlId]['cmd'])
-            if self.parent.MapWindow.overlays[self.ovlId]['propwin'] is None and mapName:
-                # build properties dialog
-                menuform.GUI(parent = self.parent, show = False).ParseCommand(cmd=self.cmd,
-                                                                              completed=(self.GetOptData, self.name, ''))
-                
-            if found:
-                # enable 'OK' button
-                self.btnOK.Enable()
-                if name == 'legend':
+            if name == 'legend':
+                mapName, found = utils.GetLayerNameFromCmd(self.parent.MapWindow.overlays[self.ovlId]['cmd'])
+                if found:
+                    # enable 'OK' button
+                    self.btnOK.Enable()
                     # set title
                     self.SetTitle(_('Legend of raster map <%s>') % \
                                       mapName)
+            
         
     def _CreateOverlay(self):
         if not self.parent.Map.GetOverlay(self.ovlId):