[GRASS-SVN] r67733 - in grass/trunk/gui/wxpython: core lmgr

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-06 03:55:51 -0800 (Sat, 06 Feb 2016)
New Revision: 67733

Modified:
   grass/trunk/gui/wxpython/core/workspace.py
   grass/trunk/gui/wxpython/lmgr/frame.py
Log:
wxGUI: remove non-needed wxPython3 mapdislay size hacks

Modified: grass/trunk/gui/wxpython/core/workspace.py
===================================================================
--- grass/trunk/gui/wxpython/core/workspace.py	2016-02-06 11:07:49 UTC (rev 67732)
+++ grass/trunk/gui/wxpython/core/workspace.py	2016-02-06 11:55:51 UTC (rev 67733)
@@ -8,7 +8,7 @@
  - workspace::WriteWorkspaceFile
  - workspace::ProcessGrcFile
 
-(C) 2007-2011 by the GRASS Development Team
+(C) 2007-2016 by the GRASS Development Team
 
 This program is free software under the GNU General Public License
 (>=v2). Read the file COPYING that comes with GRASS for details.
@@ -20,7 +20,6 @@
 
 import wx
 
-from core.globalvar import wxPython3
 from core.utils     import normalize_whitespace, _
 from core.settings  import UserSettings
 from core.gcmd      import EncodeString, GetDefaultEncoding
@@ -745,8 +744,6 @@
             
             displayPos = mapdisp.GetPosition()
             displaySize = mapdisp.GetSize()
-            if wxPython3:
-                displaySize[1] -= 32 # see related hack on line lmgr.frame.LoadWorkspaceFile()
             if mapdisp.toolbars['map'].combo.GetSelection() == 1:
                 viewmode = '3d'
             else:

Modified: grass/trunk/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/frame.py	2016-02-06 11:07:49 UTC (rev 67732)
+++ grass/trunk/gui/wxpython/lmgr/frame.py	2016-02-06 11:55:51 UTC (rev 67733)
@@ -1288,11 +1288,6 @@
                 if display['pos']:
                     mapdisp.SetPosition(display['pos'])
                 if display['size']:
-                    if globalvar.wxPython3:
-                        # Incorrect height
-                        # TODO: fix it in better way !!!
-                        # Then also remove hack in core.workspace.WriteWorkspaceFile() ...
-                        display['size'] = (display['size'][0], display['size'][1] + 32)
                     mapdisp.SetSize(display['size'])
             
             # set extent if defined