[GRASS-SVN] r63938 - in grass/branches/releasebranch_7_0/gui/wxpython: core gui_core iscatt

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-01-02 20:41:43 -0800 (Fri, 02 Jan 2015)
New Revision: 63938

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/goutput.py
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py
   grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py
Log:
wxGUI: sync various small differences in trunk and release branch

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py	2015-01-03 03:33:24 UTC (rev 63937)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py	2015-01-03 04:41:43 UTC (rev 63938)
@@ -1063,13 +1063,8 @@
 
 def GuiModuleMain(mainfn):
     """Main function for g.gui.* modules
-    
-    Note: os.fork() is supported only on Unix platforms
-    
-    .. todo::
-        Replace os.fork() by multiprocessing (?)
-    
-    :param mainfn: main function
+
+    os.fork removed in r62649 as fragile
     """
     mainfn()
 

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/goutput.py	2015-01-03 03:33:24 UTC (rev 63937)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/goutput.py	2015-01-03 04:41:43 UTC (rev 63938)
@@ -226,7 +226,9 @@
         self.outputSizer.SetSizeHints(self)
         self.panelOutput.SetSizer(self.outputSizer)
         # eliminate gtk_widget_size_allocate() warnings
-        self.outputSizer.SetVirtualSizeHints(self.panelOutput)
+        # avoid to use a deprecated method in wxPython >= 2.9
+        getattr(self.outputSizer, 'FitInside',
+                self.outputSizer.SetVirtualSizeHints)(self.panelOutput)
         
         if self._gcstyle & GC_PROMPT:
             promptSizer.Fit(self)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py	2015-01-03 03:33:24 UTC (rev 63937)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/toolbars.py	2015-01-03 04:41:43 UTC (rev 63938)
@@ -324,6 +324,18 @@
                 del self._groups[group][tb]
                 break
 
+    def IsToolInGroup(self, tool, group):
+        """Checks whether a tool is in a specified group.
+
+        :param tool: tool id
+        :param group: name of group (e.g. 'mouseUse')
+        """
+        for group in self._toolsGroups[tool]:
+            for tb in self._groups[group]:
+                if tb.FindById(tool):
+                    return True
+        return False
+
     def ToolChanged(self, tool):
         """When any tool/button is pressed, other tools from group must be unchecked.
         

Modified: grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py	2015-01-03 03:33:24 UTC (rev 63937)
+++ grass/branches/releasebranch_7_0/gui/wxpython/iscatt/controllers.py	2015-01-03 04:41:43 UTC (rev 63938)
@@ -1109,5 +1109,3 @@
         if res.split('\n')[0]:
             bands = res.split('\n')
             self.scatt_mgr.SetBands(bands)
-
-