[GRASS-SVN] r33028 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-23 10:03:22 -0400 (Sat, 23 Aug 2008)
New Revision: 33028

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxGUI: fix loading workspace from running session


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2008-08-23 13:49:07 UTC (rev 33027)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2008-08-23 14:03:22 UTC (rev 33028)
@@ -3208,8 +3208,8 @@
                 self.layerbook.DeletePage(pgnum)
         
         #self.Destroy()
-
-        event.Skip()
+        if event:
+            event.Skip()
         
     def GetRender(self):
         """

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2008-08-23 13:49:07 UTC (rev 33027)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2008-08-23 14:03:22 UTC (rev 33028)
@@ -555,7 +555,7 @@
 
         # delete current layer tree content
         self.OnWorkspaceClose()
-
+        
         self.LoadWorkspaceFile(filename)
 
         self.workspaceFile = filename
@@ -863,10 +863,10 @@
         displays = []
         for page in range(0, self.gm_cb.GetPageCount()):
             displays.append(self.gm_cb.GetPage(page).maptree.mapdisplay)
-            
+        
         for display in displays:
-            display.Close()
-
+            display.OnCloseWindow(event)
+        
         self.disp_idx = 0
         self.curr_page = None