Browse Source

wxGUI: workaround for not visible toolbars on Mac with wxPython 3

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60999 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 years ago
parent
commit
64bd584236

+ 3 - 1
gui/wxpython/gmodeler/frame.py

@@ -89,7 +89,9 @@ class ModelFrame(wx.Frame):
         self.SetMenuBar(self.menubar)
         
         self.toolbar = ModelerToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
         
         self.statusbar = self.CreateStatusBar(number = 1)
         

+ 5 - 1
gui/wxpython/gmodeler/toolbars.py

@@ -30,7 +30,11 @@ class ModelerToolbar(BaseToolbar):
     """
     def __init__(self, parent):
         BaseToolbar.__init__(self, parent)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         
         # realize the toolbar

+ 9 - 2
gui/wxpython/modules/histogram.py

@@ -18,6 +18,7 @@ This program is free software under the GNU General Public License
 """
 
 import os
+import sys
 
 import wx
 
@@ -284,7 +285,9 @@ class HistogramFrame(wx.Frame):
         self.encoding = 'ISO-8859-1' # default encoding for display fonts
         
         self.toolbar = HistogramToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
 
         # find selected map
         # might by moved outside this class
@@ -482,7 +485,11 @@ class HistogramToolbar(BaseToolbar):
     """
     def __init__(self, parent):
         BaseToolbar.__init__(self, parent)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         
         # realize the toolbar

+ 3 - 1
gui/wxpython/psmap/frame.py

@@ -68,7 +68,9 @@ class PsMapFrame(wx.Frame):
 
         self._toolSwitcher = ToolSwitcher()
         self.toolbar = PsMapToolbar(parent=self, toolSwitcher=self._toolSwitcher)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
         
         self.iconsize = (16, 16)
         #satusbar

+ 5 - 1
gui/wxpython/psmap/toolbars.py

@@ -30,7 +30,11 @@ class PsMapToolbar(BaseToolbar):
         :param parent: parent window
         """
         BaseToolbar.__init__(self, parent, toolSwitcher)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         self._default = self.pointer
         

+ 8 - 2
gui/wxpython/wxplot/histogram.py

@@ -39,7 +39,9 @@ class HistogramPlotFrame(BasePlotFrame):
         BasePlotFrame.__init__(self, parent, size = size, **kwargs)
         
         self.toolbar = HistogramPlotToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
         self.SetTitle(_("GRASS GIS Histogramming Tool"))
         
         #
@@ -243,7 +245,11 @@ class HistogramPlotToolbar(BaseToolbar):
     """
     def __init__(self, parent):
         BaseToolbar.__init__(self, parent)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         
         # realize the toolbar

+ 8 - 2
gui/wxpython/wxplot/profile.py

@@ -54,7 +54,9 @@ class ProfileFrame(BasePlotFrame):
         self.controller.transectChanged.connect(self.SetTransect)
         self.transect = []
         self.toolbar = ProfileToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
         self.SetTitle(_("GRASS Profile Analysis Tool"))
         self._units = units
 
@@ -422,7 +424,11 @@ class ProfileToolbar(BaseToolbar):
     """
     def __init__(self, parent):
         BaseToolbar.__init__(self, parent)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         
         # realize the toolbar

+ 8 - 2
gui/wxpython/wxplot/scatter.py

@@ -40,7 +40,9 @@ class ScatterFrame(BasePlotFrame):
         BasePlotFrame.__init__(self, parent, size = size, **kwargs)
         
         self.toolbar = ScatterToolbar(parent = self)
-        self.SetToolBar(self.toolbar)
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform != 'darwin':
+            self.SetToolBar(self.toolbar)
         self.SetTitle(_("GRASS Bivariate Scatterplot Tool"))
 
         #
@@ -267,7 +269,11 @@ class ScatterToolbar(BaseToolbar):
     """
     def __init__(self, parent):
         BaseToolbar.__init__(self, parent)
-        
+
+        # workaround for http://trac.wxwidgets.org/ticket/13888
+        if sys.platform == 'darwin':
+            parent.SetToolBar(self)
+
         self.InitToolbar(self._toolbarData())
         
         # realize the toolbar