[GRASS-SVN] r60994 - in grass/branches/releasebranch_7_0/gui/wxpython: modules psmap

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-06-26 13:30:33 -0700 (Thu, 26 Jun 2014)
New Revision: 60994

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
   grass/branches/releasebranch_7_0/gui/wxpython/psmap/frame.py
Log:
wxGUI: fix windows size for wxPython3 on Mac (merge from trunk, r60991)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py	2014-06-26 20:30:21 UTC (rev 60993)
+++ grass/branches/releasebranch_7_0/gui/wxpython/modules/mcalc_builder.py	2014-06-26 20:30:33 UTC (rev 60994)
@@ -258,7 +258,9 @@
         self._layout()
 
         self.SetMinSize(self.GetBestSize())
-    
+        # workaround for http://trac.wxwidgets.org/ticket/13628
+        self.SetSize(self.GetBestSize())
+
     def _return_funct(self,event):
         i = event.GetString()
         self._addSomething(self.funct_dict[i])

Modified: grass/branches/releasebranch_7_0/gui/wxpython/psmap/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/psmap/frame.py	2014-06-26 20:30:21 UTC (rev 60993)
+++ grass/branches/releasebranch_7_0/gui/wxpython/psmap/frame.py	2014-06-26 20:30:33 UTC (rev 60994)
@@ -166,7 +166,9 @@
         
         self._layout()
         self.SetMinSize(wx.Size(775, 600))
-        
+        # workaround for http://trac.wxwidgets.org/ticket/13628
+        self.SetSize(self.GetBestSize())
+
         self.Bind(fnb.EVT_FLATNOTEBOOK_PAGE_CHANGING, self.OnPageChanging)
         self.Bind(fnb.EVT_FLATNOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)