[GRASS-SVN] r52225 - in grass/branches/develbranch_6/gui/wxpython: gui_core modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-06-26 00:15:33 -0700 (Tue, 26 Jun 2012)
New Revision: 52225

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/prompt.py
   grass/branches/develbranch_6/gui/wxpython/modules/histogram.py
Log:
wxGUI: #1679 fixed (merge from trunk, r52223)

Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/prompt.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/prompt.py	2012-06-26 07:10:11 UTC (rev 52224)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/prompt.py	2012-06-26 07:15:33 UTC (rev 52225)
@@ -604,8 +604,8 @@
         if not cmdString or self.standAlone:
             return
         
-        if cmdString[:2] == 'd.' and not self.parent.curr_page:
-            self.parent.NewDisplay(show = True)
+        if cmdString[:2] == 'd.' and not self.parent.parent.curr_page:
+            self.parent.parent.NewDisplay(show = True)
                 
         self.commands.append(cmdString) # trace commands
 

Modified: grass/branches/develbranch_6/gui/wxpython/modules/histogram.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/modules/histogram.py	2012-06-26 07:10:11 UTC (rev 52224)
+++ grass/branches/develbranch_6/gui/wxpython/modules/histogram.py	2012-06-26 07:15:33 UTC (rev 52225)
@@ -284,7 +284,7 @@
 
         # find selected map
         self.mapname = None
-        if not parent.IsStandalone():
+        if parent.GetName() == "MapWindow" and not parent.IsStandalone():
             tree = parent.GetLayerManager().GetLayerTree()
 
             if tree.layer_selected and tree.GetPyData(tree.layer_selected)[0]['type'] == 'raster':