MouseWheel stuff

Added wxToggleButton
other odds and ends


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/Main.py

@@ -23,7 +23,7 @@ import images
 
 _treeList = [
     ('New since last release', ['ColourSelect', 'ImageBrowser', 'infoframe',
-                                'ColourDB',
+                                'ColourDB', 'wxToggleButton',
                                 ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
@@ -43,7 +43,7 @@ _treeList = [
                   'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
                   'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
                   'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
-                  'wxCalendarCtrl',
+                  'wxCalendarCtrl', 'wxToggleButton',
                   ]),
 
     ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]),

wxPython/demo/wxScrolledWindow.py

@@ -127,6 +127,27 @@ class MyCanvas(wxScrolledWindow):
             self.curLine = []
             self.ReleaseMouse()
 
+
+## This is an example of what to do for the EVT_MOUSEWHEEL event,
+## but since wxScrolledWindow does this already it's not
+## necessary to do it ourselves.
+
+##     wheelScroll = 0
+##     def OnWheel(self, evt):
+##         delta = evt.GetWheelDelta()
+##         rot = evt.GetWheelRotation()
+##         linesPer = evt.GetLinesPerAction()
+##         ws = self.wheelScroll
+##         ws = ws + rot
+##         lines = ws / delta
+##         ws = ws - lines * delta
+##         self.wheelScroll = ws
+##         if lines != 0:
+##             lines = lines * linesPer
+##             vsx, vsy = self.GetViewStart()
+##             scrollTo = vsy - lines
+##             self.Scroll(-1, scrollTo)
+
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

wxPython/demo/wxToggleButton.py

@@ -0,0 +1,36 @@
+
+from wxPython.wx import *
+
+#----------------------------------------------------------------------
+
+class TestPanel(wxPanel):
+    def __init__(self, parent, log):
+        wxPanel.__init__(self, parent, -1)
+        self.log = log
+        panel = wxPanel(self, -1)
+        buttons = wxBoxSizer(wxHORIZONTAL)
+        for word in string.split("These are toggle buttons"):
+            b = wxToggleButton(panel, -1, word)
+            EVT_TOGGLEBUTTON(self, b.GetId(), self.OnToggle)
+            buttons.Add(b, flag=wxALL, border=5)
+
+        panel.SetAutoLayout(true)
+        panel.SetSizer(buttons)
+        buttons.Fit(panel)
+        panel.Move((50,50))
+
+    def OnToggle(self, evt):
+        self.log.write("Button %d toggled\n" % evt.GetId())
+
+#----------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+
+
+#----------------------------------------------------------------------
+
+
+overview = """\
+"""