Merge branch 'rf/gtk3' into 'master'

Rf/gtk3

See merge request fsl/fsleyes/props!36

CHANGELOG.rst

@@ -2,6 +2,17 @@ This document contains the ``fsleyes-props`` release history in reverse
 chronological order.
 
 
+1.6.7 (Friday October 4th 2019)
+-------------------------------
+
+
+Changed
+^^^^^^^
+
+
+* Minor GTK3 compatibility fixes.
+
+
 1.6.6 (Wednesday September 18th 2019)
 -------------------------------------
 

fsleyes_props/properties_types.py

@@ -33,7 +33,7 @@ added as attributes of a :class:`.HasProperties` class definition.
 
 import os.path as op
 
-import collections
+from collections import abc
 
 import six
 
@@ -798,7 +798,7 @@ class Colour(props.PropertyBase):
         """
         props.PropertyBase.validate(self, instance, attributes, value)
 
-        if (not isinstance(value, collections.Sequence)) or \
+        if (not isinstance(value, abc.Sequence)) or \
            (len(value) not in (3, 4)):
             raise ValueError('Colour must be a sequence of three/four values')
 

fsleyes_props/properties_value.py

@@ -1178,7 +1178,7 @@ class PropertyValueList(PropertyValue):
 
 
     def move(self, from_, to):
-        """Move the item from 'from\_' to 'to'."""
+        """Move the item from ``from_`` to ``to``."""
 
         propVals = self.getPropertyValueList()
         propVals.insert(to, propVals.pop(from_))

fsleyes_props/widgets.py

@@ -98,7 +98,7 @@ import sys
 import os
 import os.path as op
 
-from collections import Iterable
+from collections.abc import Iterable
 
 import six
 

fsleyes_props/widgets_boolean.py

@@ -85,7 +85,7 @@ def _booleanCheckBox(parent):
     """Create a ``wx.CheckBox`` to link to the :class:`.Boolean` property. """
     widget = wx.CheckBox(parent)
     event  = wx.EVT_CHECKBOX
-
+    widget.SetMinSize(widget.GetBestSize())
     return widget, event, None, None
 
 
@@ -106,6 +106,7 @@ def _booleanToggle(parent, icons):
         falseBmp=falseBmp,
         style=style)
     event  = bmptoggle.EVT_BITMAP_TOGGLE
+    widget.SetMinSize(widget.GetBestSize())
 
     return widget, event, None, None
 
@@ -117,6 +118,7 @@ def _booleanRadio(parent, icons, style):
 
     widget = bmpradio.BitmapRadioBox(parent, style)
     event  = bmpradio.EVT_BITMAP_RADIO_EVENT
+    widget.SetMinSize(widget.GetBestSize())
 
     if len(icons) == 2:
         icons = [icons[0], None, icons[1], None]

fsleyes_props/widgets_choice.py

@@ -222,6 +222,7 @@ def _Choice(parent,
     # Initialise the widget
     choicesChanged(None, 'choices')
     widgetSet(propVal.get())
+    widget.SetMinSize(widget.GetBestSize())
 
     def onDestroy(ev):
         log.debug('Removing attribute listener {}'.format(listenerName))

tests/__init__.py

@@ -102,7 +102,7 @@ def simclick(sim, target, btn=wx.MOUSE_BTN_LEFT, pos=None, stype=0):
     x += w * pos[0]
     y += h * pos[1]
 
-    sim.MouseMove(x, y)
+    sim.MouseMove(int(x), int(y))
     wx.Yield()
     if   stype == 0: sim.MouseClick(btn)
     elif stype == 1: sim.MouseDblClick(btn)