Minor fixes.

Author: tfpf

ScrollableContainers/Tk.py

@@ -6,6 +6,8 @@
 
 __all__ = ['ScrollableFrameTk']
 
+_system = platform.system()
+
 ###############################################################################
 
 class ScrollableFrameTk(ttk.Frame):
@@ -43,8 +45,8 @@ def __init__(self, *args, **kwargs):
         # Initially, the vertical scrollbar is a hair below its topmost
         # position. Move it to said position. No harm in doing the equivalent
         # for the horizontal scrollbar.
-        self._canvas.xview_moveto(0)
-        self._canvas.yview_moveto(0)
+        self._canvas.xview_moveto(0.0)
+        self._canvas.yview_moveto(0.0)
 
     ###########################################################################
 
@@ -165,9 +167,9 @@ def _on_leave(self, event=None):
     def _on_mouse_scroll(self, event):
         '''
 Called when the mouse wheel is scrolled or a two-finger swipe gesture is
-performed on the touchpad. Ask to scroll the view horizontally if Shift is held
-down (equivalent to a horizontal two-finger swipe) and vertically otherwise
-(equivalent to a vertical two-finger swipe).
+performed on the touchpad. Ask to scroll the view horizontally if the mouse
+wheel is scrolled with Shift held down (equivalent to a horizontal two-finger
+swipe) and vertically otherwise (equivalent to a vertical two-finger swipe).
 
 :param event: Scroll event.
         '''
@@ -179,13 +181,12 @@ def _on_mouse_scroll(self, event):
         else:
             callee = self._yview
 
-        system = platform.system()
-        if system == 'Linux':
+        if _system == 'Linux':
             if event.num == 4:
                 callee(tk.SCROLL, -1, tk.UNITS)
             elif event.num == 5:
                 callee(tk.SCROLL, 1, tk.UNITS)
-        elif system == 'Darwin':
+        elif _system == 'Darwin':
             callee(tk.SCROLL, -event.delta, tk.UNITS)
-        elif system == 'Windows':
+        elif _system == 'Windows':
             callee(tk.SCROLL, -event.delta // 120, tk.UNITS)

ScrollableContainers/Wx.py

@@ -1,13 +1,13 @@
 #! /usr/bin/python3 -B
 
 import wx
-import wx.lib.scrolledpanel as scrolled
+import wx.lib.scrolledpanel as scrolledpanel
 
 __all__ = ['ScrollablePanelWx']
 
 ###############################################################################
 
-class ScrollablePanelWx(scrolled.ScrolledPanel):
+class ScrollablePanelWx(scrolledpanel.ScrolledPanel):
     '''
 Container with horizontal and vertical scrolling capabilities. Widgets must be
 added to its `panel` attribute.