[GRASS-SVN] r53246 - in grass/trunk/gui/wxpython: lmgr nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-09-20 08:29:13 -0700 (Thu, 20 Sep 2012)
New Revision: 53246

Modified:
   grass/trunk/gui/wxpython/lmgr/frame.py
   grass/trunk/gui/wxpython/nviz/tools.py
Log:
wxNviz: attempt to fix crash on Windows when closing gui

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2012-09-20 10:28:58 UTC (rev 53245)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2012-09-20 15:29:13 UTC (rev 53246)
@@ -305,8 +305,7 @@
         """!Remove nviz notebook page"""
         # if more mapwindow3D were possible, check here if nb page should be removed
         self.notebook.SetSelectionByName('layers')
-        self.notebook.RemovePage('nviz')
-        del self.nviz
+        self.notebook.DeletePage('nviz')
 
         # hide toolbar
         self._auimgr.GetPane('toolbarNviz').Hide()

Modified: grass/trunk/gui/wxpython/nviz/tools.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/tools.py	2012-09-20 10:28:58 UTC (rev 53245)
+++ grass/trunk/gui/wxpython/nviz/tools.py	2012-09-20 15:29:13 UTC (rev 53246)
@@ -537,10 +537,10 @@
 
 
         
-        # surface page
-        self.surfacePanel = self.foldpanelData.AddFoldPanel(_("Surface"), collapsed = False)
-        self.foldpanelData.AddFoldPanelWindow(self.surfacePanel, 
-            window = self._createSurfacePage(parent = self.surfacePanel), flags = fpb.FPB_ALIGN_WIDTH)
+        # # surface page
+        surfacePanel = self.foldpanelData.AddFoldPanel(_("Surface"), collapsed = False)
+        self.foldpanelData.AddFoldPanelWindow(surfacePanel, 
+            window = self._createSurfacePage(parent = surfacePanel), flags = fpb.FPB_ALIGN_WIDTH)
         self.EnablePage("surface", enabled = False)
         
         # constant page
@@ -885,8 +885,6 @@
         
         boxSizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.ALL | wx.EXPAND, border = 3)
-        box.SetSizer(boxSizer)
-        box.Layout()
         
         pageSizer.Add(item = boxSizer, proportion = 1,
                       flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM,