[GRASS-SVN] r53254 - in grass/branches/develbranch_6/gui/wxpython: lmgr nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-09-20 23:08:28 -0700 (Thu, 20 Sep 2012)
New Revision: 53254

Modified:
   grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
   grass/branches/develbranch_6/gui/wxpython/nviz/tools.py
Log:
wxNviz: attempt to fix crash on Windows when closing gui (merge from trunk, r53246)

Modified: grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py	2012-09-21 06:07:10 UTC (rev 53253)
+++ grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py	2012-09-21 06:08:28 UTC (rev 53254)
@@ -306,8 +306,8 @@
         """!Remove nviz notebook page"""
         # if more mapwindow3D were possible, check here if nb page should be removed
         self.notebook.SetSelectionByName('layers')
-        self.notebook.RemovePage(self.notebook.GetPageIndexByName('nviz'))
-        del self.nviz
+        self.notebook.DeletePage(self.notebook.GetPageIndexByName('nviz'))
+
         # hide toolbar
         self._auimgr.GetPane('toolbarNviz').Hide()
         for pos, toolbar in enumerate(('toolbarVector', 'toolbarTools', 'toolbarMisc')):

Modified: grass/branches/develbranch_6/gui/wxpython/nviz/tools.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/nviz/tools.py	2012-09-21 06:07:10 UTC (rev 53253)
+++ grass/branches/develbranch_6/gui/wxpython/nviz/tools.py	2012-09-21 06:08:28 UTC (rev 53254)
@@ -539,9 +539,9 @@
 
         
         # 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)
+        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
@@ -886,8 +886,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,